From patchwork Sun Aug 23 22:33:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21862 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 5557144B129 for ; Mon, 24 Aug 2020 01:35:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 34C6568A584; Mon, 24 Aug 2020 01:35:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69D71689CFA for ; Mon, 24 Aug 2020 01:35:29 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id k20so6492477wmi.5 for ; Sun, 23 Aug 2020 15:35:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NQvh0kci7BDmK3Jfb2DZVzMh9N5f8FVMjGA7aYorYdo=; b=DrclqBjGJ4OTTIFuJzXZA79uhB7Wf1JIMl5OBVznPo0Ls73L7fRrKvOD4hhRrX4g/Z vSqOLOdxn72BedxFLNc2Kx+HdewKDRv899sb5tAEHGNWtPXiI4vYvlsCZ3qPYUqY+ES5 TOb3YyCJu+7r5/VqtOReRMVPf8b+e8UyU5XPl8SHyenl+t/eZ1fERc4izzSbKNODRcbh DgInID4KSlj50vlBpyxAQx/r4DlXCqgJXNPGec+HuhfIDVj9LfJ1nunODitEkJ3mEzdS T4ePldgDSqAX7bdps6HgwvvoLsgPHw7+1t4oYMzs80Go40E+DfO6W155LOhtQ/7IwMP3 tl2A== 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=NQvh0kci7BDmK3Jfb2DZVzMh9N5f8FVMjGA7aYorYdo=; b=kcP/+QS26BFD4q6kcoYu//j5bi0PZReZMKJmhHpDNmsl7Hc5HJNwHNbLGmQaT+PRZX 5V0TaR62tgwuwBeDrXBkKVJZGFRHuoskQtoHSY4xoVFbvgRgmT+twdpgB8jCGSnp/BYB CblR8ICkHBASBQKlVa7KoGJGhSGoRqSSWqeFRmyAAJOEN1xEr7izG3owBa3om7gaF8th YwkndJXSeRpFXEf5FGhhPeA6rglHEkWOg98YwQrNMjqXQ2HzIwuMy6Pvgw5C/SlvOVk5 OILKBO4d2Cj5e+9UvRioPQsoEctF+RJjcjj34/K/suSNACaYlQDWHdUowshmZGHmE0tm csZQ== X-Gm-Message-State: AOAM533VV/bwC02qVEFpfUtC1mfOgQb6l5thckPpZYBVg6rbntL+uK+2 AKrdNwCotQAeKpsYKmUvvsTSdMST16TZpw== X-Google-Smtp-Source: ABdhPJxhdcS/tcBXmagFjRH3tFmnY1y6RP57p3W3XfbHuLrbvFWom8t6KFO7Hs2XK8MBXI/BNVfyFw== X-Received: by 2002:a7b:cf29:: with SMTP id m9mr2877397wmg.88.1598222128560; Sun, 23 Aug 2020 15:35:28 -0700 (PDT) Received: from localhost.localdomain (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id f10sm11216852wmj.37.2020.08.23.15.35.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 15:35:27 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Aug 2020 23:33:09 +0100 Message-Id: <20200823223310.233061-7-sw@jkqxz.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200823223310.233061-1-sw@jkqxz.net> References: <20200823223310.233061-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8] h264_redundant_pps_bsf: Use common cbs bsf implementation 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" --- libavcodec/h264_redundant_pps_bsf.c | 99 ++++++----------------------- 1 file changed, 21 insertions(+), 78 deletions(-) diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index cf41abe96c..fb91227eec 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -24,15 +24,13 @@ #include "bsf.h" #include "bsf_internal.h" #include "cbs.h" +#include "cbs_bsf.h" #include "cbs_h264.h" #include "h264.h" typedef struct H264RedundantPPSContext { - CodedBitstreamContext *input; - CodedBitstreamContext *output; - - CodedBitstreamFragment access_unit; + CBSBSFContext common; int global_pic_init_qp; int current_pic_init_qp; @@ -49,7 +47,7 @@ static int h264_redundant_pps_fixup_pps(H264RedundantPPSContext *ctx, // The changes we are about to perform affect the parsing process, // so we must make sure that the PPS is writable, otherwise the // parsing of future slices will be incorrect and even raise errors. - err = ff_cbs_make_unit_writable(ctx->input, unit); + err = ff_cbs_make_unit_writable(ctx->common.input, unit); if (err < 0) return err; pps = unit->content; @@ -78,21 +76,14 @@ static int h264_redundant_pps_fixup_slice(H264RedundantPPSContext *ctx, return 0; } -static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *pkt) +static int h264_redundant_pps_update_fragment(AVBSFContext *bsf, + AVPacket *pkt, + CodedBitstreamFragment *au) { H264RedundantPPSContext *ctx = bsf->priv_data; - CodedBitstreamFragment *au = &ctx->access_unit; int au_has_sps; int err, i; - err = ff_bsf_get_packet_ref(bsf, pkt); - if (err < 0) - return err; - - err = ff_cbs_read_packet(ctx->input, au, pkt); - if (err < 0) - goto fail; - au_has_sps = 0; for (i = 0; i < au->nb_units; i++) { CodedBitstreamUnit *nal = &au->units[i]; @@ -102,7 +93,7 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *pkt) if (nal->type == H264_NAL_PPS) { err = h264_redundant_pps_fixup_pps(ctx, nal); if (err < 0) - goto fail; + return err; if (!au_has_sps) { av_log(bsf, AV_LOG_VERBOSE, "Deleting redundant PPS " "at %"PRId64".\n", pkt->pts); @@ -118,62 +109,7 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *pkt) } } - err = ff_cbs_write_packet(ctx->output, pkt, au); - if (err < 0) - goto fail; - - err = 0; -fail: - ff_cbs_fragment_reset(au); - if (err < 0) - av_packet_unref(pkt); - - return err; -} - -static int h264_redundant_pps_init(AVBSFContext *bsf) -{ - H264RedundantPPSContext *ctx = bsf->priv_data; - CodedBitstreamFragment *au = &ctx->access_unit; - int err, i; - - err = ff_cbs_init(&ctx->input, AV_CODEC_ID_H264, bsf); - if (err < 0) - return err; - - err = ff_cbs_init(&ctx->output, AV_CODEC_ID_H264, bsf); - if (err < 0) - return err; - - ctx->global_pic_init_qp = 26; - - if (bsf->par_in->extradata) { - err = ff_cbs_read_extradata(ctx->input, au, bsf->par_in); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to read extradata.\n"); - goto fail; - } - - for (i = 0; i < au->nb_units; i++) { - if (au->units[i].type == H264_NAL_PPS) { - err = h264_redundant_pps_fixup_pps(ctx, &au->units[i]); - if (err < 0) - goto fail; - } - } - - ctx->extradata_pic_init_qp = ctx->current_pic_init_qp; - err = ff_cbs_write_extradata(ctx->output, bsf->par_out, au); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to write extradata.\n"); - goto fail; - } - } - - err = 0; -fail: - ff_cbs_fragment_reset(au); - return err; + return 0; } static void h264_redundant_pps_flush(AVBSFContext *bsf) @@ -182,13 +118,20 @@ static void h264_redundant_pps_flush(AVBSFContext *bsf) ctx->current_pic_init_qp = ctx->extradata_pic_init_qp; } -static void h264_redundant_pps_close(AVBSFContext *bsf) +static const CBSBSFType h264_redundant_pps_type = { + .codec_id = AV_CODEC_ID_H264, + .fragment_name = "access unit", + .unit_name = "NAL unit", + .update_fragment = &h264_redundant_pps_update_fragment, +}; + +static int h264_redundant_pps_init(AVBSFContext *bsf) { H264RedundantPPSContext *ctx = bsf->priv_data; - ff_cbs_fragment_free(&ctx->access_unit); - ff_cbs_close(&ctx->input); - ff_cbs_close(&ctx->output); + ctx->global_pic_init_qp = 26; + + return ff_cbs_bsf_init(bsf, &h264_redundant_pps_type); } static const enum AVCodecID h264_redundant_pps_codec_ids[] = { @@ -200,7 +143,7 @@ const AVBitStreamFilter ff_h264_redundant_pps_bsf = { .priv_data_size = sizeof(H264RedundantPPSContext), .init = &h264_redundant_pps_init, .flush = &h264_redundant_pps_flush, - .close = &h264_redundant_pps_close, - .filter = &h264_redundant_pps_filter, + .close = &ff_cbs_bsf_close, + .filter = &ff_cbs_bsf_filter, .codec_ids = h264_redundant_pps_codec_ids, };