diff mbox

[FFmpeg-devel] avcodec/hevcdec: keep closed captions in sync between multiple thread contexts

Message ID 20191220170542.1962-1-jamrial@gmail.com
State Accepted
Commit 231ffd7e6301e13431ebb3520827d60ac2a3eb64
Headers show

Commit Message

James Almer Dec. 20, 2019, 5:05 p.m. UTC 
Based on h264 code.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavcodec/hevcdec.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Lance Wang Dec. 21, 2019, 1:59 a.m. UTC | #1 
On Fri, Dec 20, 2019 at 02:05:42PM -0300, James Almer wrote:
> Based on h264 code.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavcodec/hevcdec.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
> index f8270b87c3..19b0cd815d 100644
> --- a/libavcodec/hevcdec.c
> +++ b/libavcodec/hevcdec.c
> @@ -3463,6 +3463,13 @@ static int hevc_update_thread_context(AVCodecContext *dst,
>          s->max_ra = INT_MAX;
>      }
>  
> +    av_buffer_unref(&s->sei.a53_caption.buf_ref);
> +    if (s0->sei.a53_caption.buf_ref) {
> +        s->sei.a53_caption.buf_ref = av_buffer_ref(s0->sei.a53_caption.buf_ref);
> +        if (!s->sei.a53_caption.buf_ref)
> +            return AVERROR(ENOMEM);
> +    }
> +

LGTM

>      s->sei.frame_packing        = s0->sei.frame_packing;
>      s->sei.display_orientation  = s0->sei.display_orientation;
>      s->sei.mastering_display    = s0->sei.mastering_display;
> -- 
> 2.24.1
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
James Almer Dec. 21, 2019, 7:11 p.m. UTC | #2 
On 12/20/2019 10:59 PM, Limin Wang wrote:
> On Fri, Dec 20, 2019 at 02:05:42PM -0300, James Almer wrote:
>> Based on h264 code.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavcodec/hevcdec.c | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
>> index f8270b87c3..19b0cd815d 100644
>> --- a/libavcodec/hevcdec.c
>> +++ b/libavcodec/hevcdec.c
>> @@ -3463,6 +3463,13 @@ static int hevc_update_thread_context(AVCodecContext *dst,
>>          s->max_ra = INT_MAX;
>>      }
>>  
>> +    av_buffer_unref(&s->sei.a53_caption.buf_ref);
>> +    if (s0->sei.a53_caption.buf_ref) {
>> +        s->sei.a53_caption.buf_ref = av_buffer_ref(s0->sei.a53_caption.buf_ref);
>> +        if (!s->sei.a53_caption.buf_ref)
>> +            return AVERROR(ENOMEM);
>> +    }
>> +
> 
> LGTM

Applied, thanks.
diff mbox

Patch

diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c
index f8270b87c3..19b0cd815d 100644
--- a/libavcodec/hevcdec.c
+++ b/libavcodec/hevcdec.c
@@ -3463,6 +3463,13 @@  static int hevc_update_thread_context(AVCodecContext *dst,
         s->max_ra = INT_MAX;
     }
 
+    av_buffer_unref(&s->sei.a53_caption.buf_ref);
+    if (s0->sei.a53_caption.buf_ref) {
+        s->sei.a53_caption.buf_ref = av_buffer_ref(s0->sei.a53_caption.buf_ref);
+        if (!s->sei.a53_caption.buf_ref)
+            return AVERROR(ENOMEM);
+    }
+
     s->sei.frame_packing        = s0->sei.frame_packing;
     s->sei.display_orientation  = s0->sei.display_orientation;
     s->sei.mastering_display    = s0->sei.mastering_display;