From patchwork Sat Nov 24 01:55:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 11139 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 A005F44E2DD for ; Sat, 24 Nov 2018 04:02:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 291E568A1D2; Sat, 24 Nov 2018 04:02:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6282168A279 for ; Sat, 24 Nov 2018 04:02:14 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id j2so13840383wrw.1 for ; Fri, 23 Nov 2018 18:02:18 -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=ajWbiRHf5unK8kSJwy+I528BIXIP4z2q/keHwbexwQ8=; b=akPMwmx9oUXIBov4f3rmtSrge82T6liitB0uTzViJBMTuc94WoLsOYv16z4JLd6pcY ZKHsaqY/dW951Bvk4qEzFjNAkzRBVfcz0UDMXd9yRENtfJVj9GaptwwfyM/wlMjFPwUh HpAnA47XGaO8XtMtjMdgFR2AJh361v8r7TVwsrRyoeJglJNHjw9KXz7DUO1zeSn/BdVI zst1jZfrJG2rydYHlPLFcgAs/1W32VXo4XEMrBPnan5b+ZybwM81otTiAfAyJCTsCyz2 +Vik4Jr3UOexm9oBOdsh9lNgN/nh0Fe0L5ft3cX/1aTJMeFayZ4S71yu/nsuXBKvh/MP 5Ozg== 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=ajWbiRHf5unK8kSJwy+I528BIXIP4z2q/keHwbexwQ8=; b=SXK7AbJ/yT+0h8G4gmEWujXtYWxNgRzzz+K8rAKGRhlJeEt/7zRvYNfLl224aimZ7c E/qlN3bOukgsnbxgfwNRM+LDLa9lvbivPej5eUmlMSwv4ZWSShvZVS+oggfKhnp8A8jE LhdkFBona44oBW8v2Si6KtUssSDbR8uqOB7WhRIjEQfGw9kCmK35vkTNFpaXKj4otDKF LSJAAmcIZSxf+Cd7A27WClmM93fbKj7ST5elKJ9xTpxQRafudUqfdpaJbNTD5iiQWU6o cY8/5+RhJqzi5KS1KV5gPFjai883bbGOztLGLCLQP4XuynOIeCt8QfPhEYDuNx69Au0F 8mUg== X-Gm-Message-State: AA+aEWaliWCs5CSAHvkABDr34B+9V17YX0ASGzNAvsBBW6EEjyB/qzKn T0a25A4GyIITiqRpVSSo4lNWJHWL X-Google-Smtp-Source: AFSGD/X4DqeJy3J1HgPdBKoVvDm3HJ+JKKZhBnMiofEduxC9H4DRLAL6t+ADr1quGCM64E2Hgtp7hQ== X-Received: by 2002:a5d:494a:: with SMTP id r10mr16407250wrs.272.1543024601201; Fri, 23 Nov 2018 17:56:41 -0800 (PST) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id d8sm398284wrw.70.2018.11.23.17.56.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 17:56:40 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Nov 2018 02:55:34 +0100 Message-Id: <20181124015539.7164-2-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] cbs: Add function to make content of a unit writable 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This will enable us to change e.g. the parameter sets of H.2645 in ways that would change the parsing process of future units. An example of this is the h264_redundant_pps bsf. The actual implementation of the underlying codec-dependent make_writable functions is not contained in this commit. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs.c | 14 ++++++++++++++ libavcodec/cbs.h | 6 ++++++ libavcodec/cbs_av1.c | 1 + libavcodec/cbs_h2645.c | 2 ++ libavcodec/cbs_internal.h | 4 ++++ libavcodec/cbs_jpeg.c | 1 + libavcodec/cbs_mpeg2.c | 1 + libavcodec/cbs_vp9.c | 1 + 8 files changed, 30 insertions(+) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index ecbf57c293..3125656027 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -665,3 +665,17 @@ int ff_cbs_delete_unit(CodedBitstreamContext *ctx, return 0; } + +int ff_cbs_make_unit_writable(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit) +{ + if (unit->content && (!unit->content_ref || + !av_buffer_is_writable(unit->content_ref))) { + if (!ctx->codec->make_writable) + return AVERROR_PATCHWELCOME; + + return ctx->codec->make_writable(ctx, unit); + } + + return 0; +} diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index 53ac360bb1..faef6124f1 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -352,5 +352,11 @@ int ff_cbs_delete_unit(CodedBitstreamContext *ctx, CodedBitstreamFragment *frag, int position); +/** + * Make the content of a unit writable. + */ +int ff_cbs_make_unit_writable(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit); + #endif /* AVCODEC_CBS_H */ diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index e02bc7027a..ce8ee3faaa 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -1305,6 +1305,7 @@ const CodedBitstreamType ff_cbs_type_av1 = { .split_fragment = &cbs_av1_split_fragment, .read_unit = &cbs_av1_read_unit, + .make_writable = NULL, .write_unit = &cbs_av1_write_unit, .assemble_fragment = &cbs_av1_assemble_fragment, diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 666970ed03..7296c4cf29 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1545,6 +1545,7 @@ const CodedBitstreamType ff_cbs_type_h264 = { .split_fragment = &cbs_h2645_split_fragment, .read_unit = &cbs_h264_read_nal_unit, + .make_writable = NULL, .write_unit = &cbs_h2645_write_nal_unit, .assemble_fragment = &cbs_h2645_assemble_fragment, @@ -1558,6 +1559,7 @@ const CodedBitstreamType ff_cbs_type_h265 = { .split_fragment = &cbs_h2645_split_fragment, .read_unit = &cbs_h265_read_nal_unit, + .make_writable = NULL, .write_unit = &cbs_h2645_write_nal_unit, .assemble_fragment = &cbs_h2645_assemble_fragment, diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h index 53f2e5d187..62a836af90 100644 --- a/libavcodec/cbs_internal.h +++ b/libavcodec/cbs_internal.h @@ -44,6 +44,10 @@ typedef struct CodedBitstreamType { int (*read_unit)(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit); + // Make a unit's content writable. + int (*make_writable)(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit); + // Write the unit->data bitstream from unit->content. int (*write_unit)(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit); diff --git a/libavcodec/cbs_jpeg.c b/libavcodec/cbs_jpeg.c index 5a72f0e2e7..f3706e7575 100644 --- a/libavcodec/cbs_jpeg.c +++ b/libavcodec/cbs_jpeg.c @@ -513,6 +513,7 @@ const CodedBitstreamType ff_cbs_type_jpeg = { .split_fragment = &cbs_jpeg_split_fragment, .read_unit = &cbs_jpeg_read_unit, + .make_writable = NULL, .write_unit = &cbs_jpeg_write_unit, .assemble_fragment = &cbs_jpeg_assemble_fragment, diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 8b8b266563..3e6a109550 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -414,6 +414,7 @@ const CodedBitstreamType ff_cbs_type_mpeg2 = { .split_fragment = &cbs_mpeg2_split_fragment, .read_unit = &cbs_mpeg2_read_unit, + .make_writable = NULL, .write_unit = &cbs_mpeg2_write_unit, .assemble_fragment = &cbs_mpeg2_assemble_fragment, diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index c03ce986c0..e939ec10ba 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -685,6 +685,7 @@ const CodedBitstreamType ff_cbs_type_vp9 = { .split_fragment = &cbs_vp9_split_fragment, .read_unit = &cbs_vp9_read_unit, + .make_writable = NULL, .write_unit = &cbs_vp9_write_unit, .assemble_fragment = &cbs_vp9_assemble_fragment,