Skip to content

Display and control your Android device

Do not merge config audio packets

Romain Vimont609b098a9732
diff --git a/app/src/demuxer.c b/app/src/demuxer.c
index c5898060..968e6db0 100644
--- a/app/src/demuxer.c
+++ b/app/src/demuxer.c
@@ -188,8 +188,15 @@ run_demuxer(void *data) {
goto end;
}
+ // Config packets must be merged with the next non-config packet only for
+ // video streams
+ bool must_merge_config_packet = codec->type == AVMEDIA_TYPE_VIDEO;
+
struct sc_packet_merger merger;
- sc_packet_merger_init(&merger);
+
+ if (must_merge_config_packet) {
+ sc_packet_merger_init(&merger);
+ }
AVPacket *packet = av_packet_alloc();
if (!packet) {
@@ -205,11 +212,13 @@ run_demuxer(void *data) {
break;
}
- // Prepend any config packet to the next media packet
- ok = sc_packet_merger_merge(&merger, packet);
- if (!ok) {
- av_packet_unref(packet);
- break;
+ if (must_merge_config_packet) {
+ // Prepend any config packet to the next media packet
+ ok = sc_packet_merger_merge(&merger, packet);
+ if (!ok) {
+ av_packet_unref(packet);
+ break;
+ }
}
ok = sc_demuxer_push_packet(demuxer, packet);
@@ -222,7 +231,9 @@ run_demuxer(void *data) {
LOGD("Demuxer '%s': end of frames", demuxer->name);
- sc_packet_merger_destroy(&merger);
+ if (must_merge_config_packet) {
+ sc_packet_merger_destroy(&merger);
+ }
av_packet_free(&packet);
finally_close_sinks: