From patchwork Fri Dec 20 17:05:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 16895 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B1DB044A44D for ; Fri, 20 Dec 2019 19:06:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75FF36881ED; Fri, 20 Dec 2019 19:06:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CFDB688110 for ; Fri, 20 Dec 2019 19:06:01 +0200 (EET) Received: by mail-pl1-f194.google.com with SMTP id p9so4345055plk.9 for ; Fri, 20 Dec 2019 09:06:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pTDuHbIRgJW56DlhiYld2TiFE6h2lG/JpR5zm+rJVjA=; b=YU6ABk8FjaiCbcBPqk3n2aN4+MJKNmxYKOxX9ocZv+AJSFYf3RJdFiy8eQ5G73fuu6 +cvNW34yzRqIYowzEDHn4K09DSI3M5BhnMt6bI/JNzut+RwYrJYPy3/SyjFke8D3+HSN K4jk2F+IY9aHTVpY1NXLcW6GADlJuZWYpyd4UMm3P+CGuQ8f/HlfcsVDTfFcWSDtXL+S LjkvlaQsSY0dM7t3cQKWLrlpxLilkYm8k2f3WLsELnTXMeB5/CuxUbahlZ1AqjYv0lP3 EMx0gb4HaJ378yaPtYkFm5x9+dg7JDVh21tglV2YVEYyAa25xKdaYxyNVO7tgEXBP8iv G2bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=pTDuHbIRgJW56DlhiYld2TiFE6h2lG/JpR5zm+rJVjA=; b=WEdEB6ub0HKVuiw+kc4HOrqoFJA6mDIg0p3rWYlDJHVPhEXbodSqL7pdkSrXL7BKH7 3F9P5InSZp5mCr145ybKQ01xgGoghAU3KWdKwoyBUxHrboYWVs/Su4o6R/01nTLrEqM5 Wp98bo6BU+9G1IzSxJeHBIwYeEyp9MBb3x806CBymTgwKXj34h+Okg3FeTmQruTJfDBq 03A4ZU7cPp33dQF0Ek4yst7xElKoBAmOqZEkqgMpsu1wMpXqEgT25LtuMY0fn+uqXNWV tZYOGPHjbQZPU/go+mPANwJUUzPtlnFDqkJxsjW56/TCfRRtNPMigYoTUHswy+b4l6PM +sHg== X-Gm-Message-State: APjAAAWRBFoFUxPjhxVnP5pX3fr0glnI9lj7uE2y3LendWMhU4S6304P l5vQqWBqYf60nFZNUEjVsafG3/FE X-Google-Smtp-Source: APXvYqwW7dikUwpqJZDSgQk+BcHMDAMazIvJl9V8dbI5PMisZF6F6vKQ5KIrfqwkz0uoSdPRi1wzPw== X-Received: by 2002:a17:902:8ec5:: with SMTP id x5mr15940168plo.208.1576861559486; Fri, 20 Dec 2019 09:05:59 -0800 (PST) Received: from localhost.localdomain ([191.83.216.116]) by smtp.gmail.com with ESMTPSA id a13sm13539652pfc.40.2019.12.20.09.05.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2019 09:05:58 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Dec 2019 14:05:42 -0300 Message-Id: <20191220170542.1962-1-jamrial@gmail.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/hevcdec: keep closed captions in sync between multiple thread contexts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Based on h264 code. Signed-off-by: James Almer --- 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); + } + s->sei.frame_packing = s0->sei.frame_packing; s->sei.display_orientation = s0->sei.display_orientation; s->sei.mastering_display = s0->sei.mastering_display;