From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Fri, 29 Nov 2024 10:28:46 +0000 (+0100)
Subject: demux/mp4: force the packetizer to fill AV1 extradata without optional OBUs
X-Git-Tag: archive/raspbian/3.0.21-6+rpi1^2~15
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c7866c20a9303d278c6747e00133b4536dfb734f;p=vlc.git

demux/mp4: force the packetizer to fill AV1 extradata without optional OBUs

The hardware decoders need it and the packetizer can fill it for us.

(cherry picked from commit fe8b4bf937ad08d17d69de07ae21e9f326e2bd96) (edited)
edited:
- the extradata handling is missing many backports, adapting the to 3.0 code

Gbp-Pq: Name 0110-demux-mp4-force-the-packetizer-to-fill-AV1-extradata.patch
---

diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index 81d65508..5ac7af6b 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -545,6 +545,8 @@ int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
                                 BOXDATA(p_av1C)->i_av1C );
                         p_track->fmt.i_extra = BOXDATA(p_av1C)->i_av1C;
                     }
+                    if (p_track->fmt.i_extra <= 4)
+                        p_track->fmt.b_packetized = false; // force full extradata by the packetizer
                 }
             }
             break;