From c460243ce2c21cfd89535ec7cd301684e8f3ee18 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Wed, 2 Feb 2022 21:03:24 +0100
Subject: [PATCH] Simplify demuxer

Call the same push_packet_to_sinks() in all cases, and make
sc_demuxer_parse() return void.
---
 app/src/demuxer.c | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/app/src/demuxer.c b/app/src/demuxer.c
index 3dd62491..c683dfe0 100644
--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@@ -69,7 +69,7 @@ push_packet_to_sinks(struct sc_demuxer *demuxer, const AVPacket *packet) {
     return true;
 }
 
-static bool
+static void
 sc_demuxer_parse(struct sc_demuxer *demuxer, AVPacket *packet) {
     uint8_t *in_data = packet->data;
     int in_len = packet->size;
@@ -89,14 +89,6 @@ sc_demuxer_parse(struct sc_demuxer *demuxer, AVPacket *packet) {
     }
 
     packet->dts = packet->pts;
-
-    bool ok = push_packet_to_sinks(demuxer, packet);
-    if (!ok) {
-        LOGE("Could not process packet");
-        return false;
-    }
-
-    return true;
 }
 
 static bool
@@ -138,25 +130,23 @@ sc_demuxer_push_packet(struct sc_demuxer *demuxer, AVPacket *packet) {
         }
     }
 
-    if (is_config) {
-        // config packet
-        bool ok = push_packet_to_sinks(demuxer, packet);
-        if (!ok) {
-            return false;
-        }
-    } else {
+    if (!is_config) {
         // data packet
-        bool ok = sc_demuxer_parse(demuxer, packet);
-
-        if (demuxer->pending) {
-            // the pending packet must be discarded (consumed or error)
-            av_packet_free(&demuxer->pending);
-        }
-
-        if (!ok) {
-            return false;
-        }
+        sc_demuxer_parse(demuxer, packet);
     }
+
+    bool ok = push_packet_to_sinks(demuxer, packet);
+
+    if (!is_config && demuxer->pending) {
+        // the pending packet must be discarded (consumed or error)
+        av_packet_free(&demuxer->pending);
+    }
+
+    if (!ok) {
+        LOGE("Could not process packet");
+        return false;
+    }
+
     return true;
 }