From patchwork Fri Nov 9 05:31:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 10960 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 BE8B244D27C for ; Fri, 9 Nov 2018 07:39:58 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CE70689A27; Fri, 9 Nov 2018 07:39:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C816680AEF for ; Fri, 9 Nov 2018 07:39:23 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id e3-v6so561160wrs.5 for ; Thu, 08 Nov 2018 21:39:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p4mVKAcXFiewbm4CFc8cqwCZFzfILs98BfXSCN3SLjo=; b=nO68IiAv2U/DjRK0AJb9UZA99fG9j7O7Vth1dGUBnvO7Ef9v5QjPPmCw/rZQGBqnjG 6dsaqknFzcLcHQDWzYrHEVZu3NyQTFPFby472Bf7vKLMeoGQFWhu/3g1J0WAaQPHltJT 72A/ZSgST594N139FeziUdytywizhPVeb/Ca27Xntk5o/Z2O8FTn+ADnjTzJQoScYaTS Cdr1/9Y88mAHdSKxxU0lcObtfbxl3iD6e0XWrfxaptdnAuVuWyoGdtoqV/QLznU14oMp GrKAtXjyHV6fBej54TUFXTqSi5yXIXKZiP8zqUYwmUJ9lka8W5YEPFl/G9T3CVhufhd2 vKwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p4mVKAcXFiewbm4CFc8cqwCZFzfILs98BfXSCN3SLjo=; b=AkOQ9KDaza1d8QrFEkcGmiSgLIxpZKJBLoaUgsevhBa70NksX4okR1BkDdsWFnaElc 4Buu1+GwWgzLCkem9wxKuY5lzS2FqN8VGVtketYUo+g1Ald0SFAA1hD2owOuTKe8Q2By ck+Tm9PihIRnSxNMUe94BfPxpULikSy3aGPOj8+/HiHJls7CzOvrZbsNrziYt4q+FZnZ ux4s/yswOrDI/JWrr6n/k3Lzs3mRDJIGlApJrJVpOyN+5qHDfvA8vvDC/zvRPt79UPwl 4GAFcSjnIPwxGLVSpFTPNuEcR2dbJ1E0o2wotxyzF2V46FhAE5c5SGrzaJ5ZXgoYocfU BZug== X-Gm-Message-State: AGRZ1gJIsF+P7ckUyS0szAkGukrfUzdkm0zqPNUKBrKe9cBQPkyx0Fnj 2Z6MDt8gCEkCevqUJTu22njWJarg X-Google-Smtp-Source: AJdET5cbAI3Oi8mqSHxHkSOsJw4a6/KUbx0dXRDmNV9pkM7oggxDrTh3PtJWdEq7GYcLeg0+pioPIA== X-Received: by 2002:adf:8422:: with SMTP id 31-v6mr6058442wrf.153.1541741585669; Thu, 08 Nov 2018 21:33:05 -0800 (PST) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id l140-v6sm1098230wmb.24.2018.11.08.21.33.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 21:33:05 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Nov 2018 06:31:35 +0100 Message-Id: <20181109053138.4572-4-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181109053138.4572-1-andreas.rheinhardt@googlemail.com> References: <20181109053138.4572-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/6] cbs_h2645: Create functions to make parameter sets writeable 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" av_buffer_make_writable can't be used here, because a shallow copy isn't enough for parameter sets. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_h264.h | 8 ++++++++ libavcodec/cbs_h2645.c | 16 ++++++++++++++++ libavcodec/cbs_h265.h | 9 +++++++++ 3 files changed, 33 insertions(+) diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h index 92277e4750..dc6019765b 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -479,4 +479,12 @@ int ff_cbs_h264_delete_sei_message(CodedBitstreamContext *ctx, CodedBitstreamUnit *nal_unit, int position); +/** + * Create a writeable reference from a reference to a buffer that contains + * a parameter set of the kind implied by the function name. + */ +int ff_cbs_h264_make_sps_writeable(AVBufferRef **buf); +int ff_cbs_h264_make_pps_writeable(AVBufferRef **buf); + + #endif /* AVCODEC_CBS_H264_H */ diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index e73706f2e6..a323bb2e8a 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -716,6 +716,22 @@ static int cbs_h26 ## h26n ## _replace_ ## ps_var(CodedBitstreamContext *ctx, \ return AVERROR(ENOMEM); \ priv->ps_var[id] = (H26 ## h26n ## Raw ## ps_name *)priv->ps_var ## _ref[id]->data; \ return 0; \ +} \ + \ +int ff_cbs_h26 ## h26n ## _make_ ## ps_var ## _writeable(AVBufferRef **buf) \ +{ \ + if (av_buffer_is_writable(*buf)) {\ + return 0; \ + } else { \ + AVBufferRef *copy = cbs_h26 ## h26n ## _copy_ ## ps_var \ + ((H26 ## h26n ## Raw ## ps_name*)(*buf)->data); \ + if (copy) { \ + av_buffer_unref(buf); \ + *buf = copy; \ + return 0; \ + } else \ + return AVERROR(ENOMEM); \ + } \ } diff --git a/libavcodec/cbs_h265.h b/libavcodec/cbs_h265.h index cca1d7590b..9e951cd945 100644 --- a/libavcodec/cbs_h265.h +++ b/libavcodec/cbs_h265.h @@ -581,4 +581,13 @@ typedef struct CodedBitstreamH265Context { } CodedBitstreamH265Context; +/** + * Create a writeable reference from a reference to a buffer that contains + * a parameter set of the kind implied by the function name. + */ +int ff_cbs_h265_make_vps_writeable(AVBufferRef **buf); +int ff_cbs_h265_make_sps_writeable(AVBufferRef **buf); +int ff_cbs_h265_make_pps_writeable(AVBufferRef **buf); + + #endif /* AVCODEC_CBS_H265_H */