From patchwork Thu Sep 17 13:34:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 22458 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 65AF644BA66 for ; Thu, 17 Sep 2020 16:35:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4DC9A68BCA7; Thu, 17 Sep 2020 16:35:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A78CC68B96E for ; Thu, 17 Sep 2020 16:35:39 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id n133so2144429qkn.11 for ; Thu, 17 Sep 2020 06:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=94VZLUEmmbmvsHNAxI05heGxRawyYxTVNBPGKFYb1lM=; b=Tb/ILuRK1OHHspfbKRj5a2Ue6rnxTYsnATdfqKWmg2B7YMSXtto/ngHfUgZJsTw2y/ iSFAZrCTVIoUFnasYAdaVK9fuGn2WJWrpxtVve3HusyWwQjKllvE71YxWMi+weuMjAa6 CoKvOuJj9ekzJs1tfM8WOY3aZVwJQ2rNS4A3P1iXtde228mk2Q7wRR+3SsB07Q+hcSRQ 32bTzNL6sq05HrqnajiOF065RnKd0zmxMLfTIOGHR7pYk3r9sb4Mpe0FYockM3T8M0aD g32HNem5Wn2Nuvm9a5AtPvi4aWs/sPMi/MvJMlEdTzvgTVK/gsUCtsv04moXuU8E5LKn PPhw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=94VZLUEmmbmvsHNAxI05heGxRawyYxTVNBPGKFYb1lM=; b=ie6GAwE/wC5/2yAPRW3RR0H72CZJlzNi2RTtpSlIG+eoj72vy3DkBm/BgEZE80/OET ttgAQMdU7DS+eUcM+LiaAxFS1gZIp0V9CU17GwQdiP18Wi9HVAVJN6fRPtq5dqlve+8c RMJ+TLtro0MWz+uzS3ABACckxCHujC2F+WWZwrLLiyX1rm1gp5eMBoqgR/Rky3a1OSCi qqpkq3z9l7VveqTqVPebN6SFV/RBVzXWov4jUBFtda8h6SP8V8K9K64/ptpLpII9+/qd 9RZ9BL9N4VdRtShqXNkEZEAT0um1MxSQ9Vsb01fnwMQVnLk/to+NGD4KkktKBlubzfgF mbOw== X-Gm-Message-State: AOAM5302MtXHivXpdXcvmeObkl+qDbJD2dnycYJq11/nbAx05V8ZYudI DCzL1lHE91pzfuigxIsTNdwXJ4ghQRDplw== X-Google-Smtp-Source: ABdhPJxz9gFQ6+Fj8/u5a0UlQ9P5CpTWbOE1zDyOpljD30xUSdEEDWjgU9crITBp0uOo0De8Kk1zHA== X-Received: by 2002:a05:620a:cf6:: with SMTP id c22mr28741026qkj.190.1600349738284; Thu, 17 Sep 2020 06:35:38 -0700 (PDT) Received: from localhost.localdomain ([191.83.208.67]) by smtp.gmail.com with ESMTPSA id g45sm22253113qtb.60.2020.09.17.06.35.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Sep 2020 06:35:37 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Sep 2020 10:34:08 -0300 Message-Id: <20200917133408.1113-2-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200917133408.1113-1-jamrial@gmail.com> References: <20200917133408.1113-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/hevcdec: sync User Data Unregistered SEI buffers across threads 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" Signed-off-by: James Almer --- libavcodec/hevcdec.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 1f3ea54d39..2481730788 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3548,6 +3548,25 @@ static int hevc_update_thread_context(AVCodecContext *dst, return AVERROR(ENOMEM); } + for (i = 0; i < s->sei.unregistered.nb_buf_ref; i++) + av_buffer_unref(&s->sei.unregistered.buf_ref[i]); + s->sei.unregistered.nb_buf_ref = 0; + + if (s0->sei.unregistered.nb_buf_ref) { + ret = av_reallocp_array(&s->sei.unregistered.buf_ref, + s0->sei.unregistered.nb_buf_ref, + sizeof(*s0->sei.unregistered.buf_ref)); + if (ret < 0) + return ret; + + for (i = 0; i < s0->sei.unregistered.nb_buf_ref; i++) { + s->sei.unregistered.buf_ref[i] = av_buffer_ref(s0->sei.unregistered.buf_ref[i]); + if (!s->sei.unregistered.buf_ref[i]) + return AVERROR(ENOMEM); + s->sei.unregistered.nb_buf_ref++; + } + } + s->sei.frame_packing = s0->sei.frame_packing; s->sei.display_orientation = s0->sei.display_orientation; s->sei.mastering_display = s0->sei.mastering_display;