From patchwork Sat Nov 24 01:55:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 11138 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 4A9DE44DA38 for ; Sat, 24 Nov 2018 03:57:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CC3AE68A37C; Sat, 24 Nov 2018 03:57:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75B9C68A2B4 for ; Sat, 24 Nov 2018 03:57:08 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id y139so13204848wmc.5 for ; Fri, 23 Nov 2018 17:57:12 -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=5zF6Ybu2awHJjyI81DZrPEEAvY8mEWKz3zqKJG1yTAs=; b=Sb5FlOodB1VzF7bkq+EOyRgF0eY2L+UvAd5CPCl9F76iF5Cxd6ilK7zNlor1d0cypJ 6XRvKX8BtvFe7iocrNMFdgu0U42pQ2TQHHKh4C2ZF2K9Z4WkPRh7tSjR5PI46UDk0zKw 9Ga9sLR5pZXOlGUpQAxdYP1qr6t2PgUylUp2+HQtFqwTHIv8zqD0eGawdyrJaHiDCKhL IC9VUY5Id6gUm3sVdCUxpxikrC3W0Cnc+CIu0ffGZBnsMxbDz1yCPGkX06X+BnCLSPrd d3VLoDna+BJ0DYxLae6aY/yTuRa5IW39ozVRAgWrhXITjMSSuB59wFh+wjjBZ28B0frP yrcQ== 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=5zF6Ybu2awHJjyI81DZrPEEAvY8mEWKz3zqKJG1yTAs=; b=fSOyFgzou4bIgtxBlgeOi9KwJtfMReNDpu/8VpXjqn9mLJj8hpk1FMni751i7jJ+Mz 5Gv9U12acZ/KuZlZ1THXF4uF+xffznp6kSYJokH4nvrsr2WSng2zFU7Cp/DoXWV5xjv3 2jogFqBTCuK0fPWGpXz87jRUFWO/1wfQx/99o+YBg0/fOeizODD5LJgFuhvhF0Z0MnHz uDRr0iAIlHckpAwoWldYZTaz0ZnRHPJiCd3OWMBm10UHbSn0PT8O5Ggdmo3PzAcomeV1 ZAELy+WqAH5NZ4H0ZZPONrUBbR6dfbIqZ8IrSZRGATKHNmwe228GHmAMJ6jmLOA5wvhZ 29ng== X-Gm-Message-State: AGRZ1gJu6y1vhRX7K8XP/nVJc+/88OppBBOaqQGmfLG97z6AUB21u1eq vIe5GSYEfAPlApZ1ayUMjTiKZyXK X-Google-Smtp-Source: AJdET5c1kDkBGvw9k4q0g0Wk2Mh+vZopt8vCECcN3ys2JhUsr/HZs3y70r+nwZOVLe1usoxIrIVfuw== X-Received: by 2002:a1c:6e0b:: with SMTP id j11mr16331852wmc.33.1543024631251; Fri, 23 Nov 2018 17:57:11 -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.57.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 17:57:10 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Nov 2018 02:55:37 +0100 Message-Id: <20181124015539.7164-5-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] cbs_h2645: Implement functions to make a unit's content 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" These functions (which are only implemented for parameter sets) make it possible to change the contents of the parameter sets as one pleases without changing/breaking the parsing process of future access units. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_h2645.c | 67 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index b40cf92a7b..931c7fb2af 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1062,6 +1062,69 @@ static int cbs_h265_read_nal_unit(CodedBitstreamContext *ctx, return 0; } +static int cbs_h264_make_unit_writable(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit) +{ + AVBufferRef *ref; + + switch (unit->type) { + case H264_NAL_SPS: + { + ref = cbs_h264_copy_sps(unit->content); + break; + } + case H264_NAL_PPS: + { + ref = cbs_h264_copy_pps(unit->content); + break; + } + default: + return AVERROR_PATCHWELCOME; + } + if (!ref) + return AVERROR(ENOMEM); + + av_buffer_unref(&unit->content_ref); + unit->content = ref->data; + unit->content_ref = ref; + + return 0; +} + +static int cbs_h265_make_unit_writable(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit) +{ + AVBufferRef *ref; + + switch (unit->type) { + case HEVC_NAL_VPS: + { + ref = cbs_h265_copy_vps(unit->content); + break; + } + case HEVC_NAL_SPS: + { + ref = cbs_h265_copy_sps(unit->content); + break; + } + case HEVC_NAL_PPS: + { + ref = cbs_h265_copy_pps(unit->content); + break; + } + default: + return AVERROR_PATCHWELCOME; + } + if (!ref) + return AVERROR(ENOMEM); + + av_buffer_unref(&unit->content_ref); + unit->content = ref->data; + unit->content_ref = ref; + + return 0; +} + static int cbs_h2645_write_slice_data(CodedBitstreamContext *ctx, PutBitContext *pbc, const uint8_t *data, size_t data_size, int data_bit_start) @@ -1534,7 +1597,7 @@ const CodedBitstreamType ff_cbs_type_h264 = { .split_fragment = &cbs_h2645_split_fragment, .read_unit = &cbs_h264_read_nal_unit, - .make_writable = NULL, + .make_writable = &cbs_h264_make_unit_writable, .write_unit = &cbs_h2645_write_nal_unit, .assemble_fragment = &cbs_h2645_assemble_fragment, @@ -1548,7 +1611,7 @@ const CodedBitstreamType ff_cbs_type_h265 = { .split_fragment = &cbs_h2645_split_fragment, .read_unit = &cbs_h265_read_nal_unit, - .make_writable = NULL, + .make_writable = &cbs_h265_make_unit_writable, .write_unit = &cbs_h2645_write_nal_unit, .assemble_fragment = &cbs_h2645_assemble_fragment,