From patchwork Mon Nov 26 13:39:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 11172 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 D746144CBC2 for ; Mon, 26 Nov 2018 15:46:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 54F6568A67A; Mon, 26 Nov 2018 15:46:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2F6568A5FF for ; Mon, 26 Nov 2018 15:46:39 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id j2so18997963wrw.1 for ; Mon, 26 Nov 2018 05:46:44 -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=y5vERnvyy88sm1v6M3ckDfrsftyGfjIkobisgxkR/KA=; b=Oqyisak/tzPXT/RVt3XR7xpzrBKa/K8Jgh1gZp3a9Y4PO5nzTWjN+lmX+ls6ncSWKb Y6hmNgH9hiTOIyfV2V9ICv1YEpqBOhpT1aIIUy+I9NSYZWiJDuae6NJ8UZv3Efqxz6t9 DW0QF8RFNnlTXV5jXB8nyqHwGUTj1qUV+lMrDfjHEVZHu0zkw5JlxumezN9v5JHDryzj nqDl/SK8LEtfrtNrAiiKJBGoH3Gvx8QZO3zKfEvbDC+1ztyKVNYRPxxh+9M0E4bh9yDl JpNaSA0fGrEjF2LY7UVyyV2QS3DGyMHcAjhSujE0KEUSpCqsUig+F4agLwbXcY2mPjON GC8g== 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=y5vERnvyy88sm1v6M3ckDfrsftyGfjIkobisgxkR/KA=; b=GpDntpFwbrUpkVF8u6jBfGY/ZOacvWGdyiL7+ihGRxkRueL4AEHmmGPy4avSojKYP7 upVUYZCEjH/xoPMudCesuer/irxyub8LMtZi93o0DXq0KMfsOf6MORyCg8RzGJEA5nku A3hEg3UZEHkvXgAMsgJVKaoE1TPxeYoouy+7W94/YQ+Px+SAFxkK2a3oG2V3wTB3rZ09 ZG6LlpP5O6fYYnk5vMlQGo8ztM1ciqhxF8Twt3leM0Lzn/mfHNkik+hxgT7urAKojUCK kWxodf7ANrTzgG4y3YZEk1uViPiKibaZ+NUU5RGCMEmtgJH+FEOoUImOSNnWfpodMMoc B4Eg== X-Gm-Message-State: AA+aEWbF90Y+duCdzSvAlY5ckyNH5ksO0/nbqxfu+lkmfMzRUAVFuu6g BV5PnCtds9ECpk7g0ouETr4uqJ5j X-Google-Smtp-Source: AFSGD/XD2Sv4Ygw8/qTAjhRW+vYbbkG2/gFMVce6ZTwEs7c6GugJlcQz7OC1zWlEKRs5IVT/vPrQ6g== X-Received: by 2002:adf:ae1a:: with SMTP id x26mr12364525wrc.0.1543239585807; Mon, 26 Nov 2018 05:39:45 -0800 (PST) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id 142sm1184169wmw.27.2018.11.26.05.39.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Nov 2018 05:39:44 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Nov 2018 14:39:09 +0100 Message-Id: <20181126133913.2356-1-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 --- Here is an updated patchset. Sorry for the unnecessary noise. libavcodec/cbs.c | 21 +++++++++++++++++++++ libavcodec/cbs.h | 9 +++++++++ libavcodec/cbs_internal.h | 4 ++++ 3 files changed, 34 insertions(+) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index ecbf57c293..cb2ee3a769 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -665,3 +665,24 @@ int ff_cbs_delete_unit(CodedBitstreamContext *ctx, return 0; } + +int ff_cbs_make_unit_writable(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit, + void** content) +{ + if (unit->content && (!unit->content_ref || + !av_buffer_is_writable(unit->content_ref))) { + int err; + if (!ctx->codec->make_writable) + return AVERROR_PATCHWELCOME; + + err = ctx->codec->make_writable(ctx, unit); + if (err < 0) + return err; + + if (content) + *content = unit->content; + } + + return 0; +} diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index 53ac360bb1..9bdc6aa5fd 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -352,5 +352,14 @@ int ff_cbs_delete_unit(CodedBitstreamContext *ctx, CodedBitstreamFragment *frag, int position); +/** + * Make the content of a unit writable. + * + * If content is supplied, *content will point to the unit's content on success. + */ +int ff_cbs_make_unit_writable(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit, + void **content); + #endif /* AVCODEC_CBS_H */ 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);