This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 300c68be8328a56fdd258ec606412aa713c4590c
Author:     Romain Beauxis <[email protected]>
AuthorDate: Sat Oct 31 09:55:33 2026 -0500
Commit:     Romain Beauxis <[email protected]>
CommitDate: Fri Nov 13 10:22:29 2026 -0600

    avcodec/vp3: hand new Theora headers on to the next frame thread
    
    Headers from packet side data only reach the frame thread decoding
    that packet.
    
    Keep them as a shared reference and set each following thread up
    again from them, before it takes over the reference frames of the
    thread before it.
    
    Headers that fail to set a thread up are kept as well, so that it
    rejects their link's data packets until a packet of its own brings
    new headers.
---
 libavcodec/vp3.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 70218c1a11..d91cabc26c 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2520,6 +2520,14 @@ static int vp3_update_thread_context(AVCodecContext 
*dst, const AVCodecContext *
     const Vp3DecodeContext *s1 = src->priv_data;
     int qps_changed = 0;
 
+#if CONFIG_THEORA_DECODER
+    /* A thread before this one took up the headers of a new logical stream;
+     * if they fail, data packets are rejected until a packet of this thread
+     * brings new ones. */
+    if (s1->headers && s->headers != s1->headers)
+        theora_reinit(dst, s1->headers, s1->headers_size);
+#endif
+
     // copy previous frame data
     ref_frames(s, s1);
 
@@ -3181,8 +3189,11 @@ static int theora_reinit(AVCodecContext *avctx, uint8_t 
*headers,
     av_refstruct_replace(&s->headers, headers);
     s->headers_size = headers_size;
     ret = theora_init_from_headers(avctx, s->headers, s->headers_size);
-    if (ret < 0)
+    if (ret < 0) {
         vp3_decode_end(avctx);
+        /* Kept, so that the next frame thread rejects this stream too. */
+        av_refstruct_replace(&s->headers, headers);
+    }
 
     return ret;
 }

-- 
To stop receiving notification emails like this one, please contact
[email protected].
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to