diff mbox series

[FFmpeg-devel,2/2] avformat/demux: extract extradata from packets when context update is requested

Message ID 20240420234312.36464-2-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel,1/2] avcodec/codec_par: always clear extradata_size in avcodec_parameters_to_context() | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

James Almer April 20, 2024, 11:43 p.m. UTC 
If the demuxer doesn't set extradata in the stream's codecpar, a
need_context_update request will delete the previously extracted extradata in
the stream's internal AVCodecContext.
As we can't ensure the old extradata is valid for the stream in its post
context update request state, try to get extradata from the new packet instead
of preserving the old in some form.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/demux.c | 9 +++++++++
 1 file changed, 9 insertions(+)
diff mbox series

Patch

diff --git a/libavformat/demux.c b/libavformat/demux.c
index abfd5fee7d..253a4783c4 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -1319,6 +1319,8 @@  fail:
     return ret;
 }
 
+static int extract_extradata(FFFormatContext *si, AVStream *st, const AVPacket *pkt);
+
 static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
 {
     FFFormatContext *const si = ffformatcontext(s);
@@ -1373,6 +1375,11 @@  static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
                 return ret;
             }
 
+            if (!sti->avctx->extradata &&
+                (ret = extract_extradata(si, st, pkt)) < 0) {
+                av_packet_unref(pkt);
+                return ret;
+            }
             sti->codec_desc = avcodec_descriptor_get(sti->avctx->codec_id);
 
             sti->need_context_update = 0;
@@ -2470,6 +2477,8 @@  static int extract_extradata(FFFormatContext *si, AVStream *st, const AVPacket *
     if (ret < 0)
         return ret;
 
+    av_bsf_flush(sti->extract_extradata.bsf);
+
     ret = av_bsf_send_packet(sti->extract_extradata.bsf, pkt_ref);
     if (ret < 0) {
         av_packet_unref(pkt_ref);