From patchwork Sun Aug 23 22:33:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21860 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 5453F44B129 for ; Mon, 24 Aug 2020 01:35:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F0F868A353; Mon, 24 Aug 2020 01:35:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C15C7689EA6 for ; Mon, 24 Aug 2020 01:35:27 +0300 (EEST) Received: by mail-wr1-f41.google.com with SMTP id p17so1184760wrj.8 for ; Sun, 23 Aug 2020 15:35:27 -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=npdy+Bc9beRYqcn1kp8bjzI66JfZcYs8HskxinO7xrM=; b=OeJeL7y0WpnuTfhYHj0hInggu1CWTRqshvfDO+uil+fK2YYIRFh74rRSTWvxHhWYzX SUtc9iIlbHj5dlbDAuV3iQcL2Xn+FPno4ozS3C88L3xUNenKo+mmqMe68FUv966ghdyo veaobUK6T8IqD/zJLEPZLzLhF/XBE3p5vRZ5p8+QmHUrN0ESrQs3JCgiQRx/nxTHHiOm M6jYSOUIOXjETLeb4HGh03PtSLO3HO4ig4YJ3BUHUJkBE9UrkhRMpvuV2/DcM+9B6Pwz 8oSkP9nxs1e1MfiekhVHIFCCocIuPTEYwANSvYp2sf0K070XrgB03ydQUJWuhYE4WpJO StOw== 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=npdy+Bc9beRYqcn1kp8bjzI66JfZcYs8HskxinO7xrM=; b=iHE6QsaS0FzOEb0g+RkufYSiVQDpdmhzdL4f8YjyJPnOkvU6J0Wkc6vDeJwloi8gr+ KxJGiYmD2KUVvdPGYeE6IQaHOlArg4ykpdUjUD/luqpf6lQcxalqMKOQBczPmgqotiQP 05P6gtKuI4I08nlG46u/WW3KtRvUhk6xtHNfIB8GgZF5Q7iKz19FwYOxhTsMialeTe5Q YV1MLp8rWAvFDGCYbNX0lr/PfSnJpF0qd2se+KIp+SnOrGGOO/coWIih4oZL/Ozo2Rbl DwKs90BiA1+QUMH2mUIzEDPukUNr+urDI3/U/eAM3rm71sxxbMhCR6FlZM7MIZnSbxKU CAXA== X-Gm-Message-State: AOAM533TjYXlzefOsBZYnn9B6wQ+UH7mlSZ/c7Ya+IzrasCKXZgyOaK7 BH6he5Nx//LlOk0oBXLHfQiuD7Nt4zgkfQ== X-Google-Smtp-Source: ABdhPJyPfrfFsCGLqxWzwxDIhJ1VUftv38/jjLZO/Mv6DiabscU2sNF8spBfmqZYNTODPg21VcPl7Q== X-Received: by 2002:adf:ea0b:: with SMTP id q11mr2266454wrm.285.1598222126862; Sun, 23 Aug 2020 15:35:26 -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.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 15:35:26 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Aug 2020 23:33:07 +0100 Message-Id: <20200823223310.233061-5-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 5/8] vp9_metadata_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/vp9_metadata_bsf.c | 61 +++++++++-------------------------- 1 file changed, 16 insertions(+), 45 deletions(-) diff --git a/libavcodec/vp9_metadata_bsf.c b/libavcodec/vp9_metadata_bsf.c index 00a5580c4d..1d82a401d5 100644 --- a/libavcodec/vp9_metadata_bsf.c +++ b/libavcodec/vp9_metadata_bsf.c @@ -21,15 +21,12 @@ #include "libavutil/opt.h" #include "bsf.h" -#include "bsf_internal.h" #include "cbs.h" +#include "cbs_bsf.h" #include "cbs_vp9.h" typedef struct VP9MetadataContext { - const AVClass *class; - - CodedBitstreamContext *cbc; - CodedBitstreamFragment fragment; + CBSBSFContext common; int color_space; int color_range; @@ -38,21 +35,11 @@ typedef struct VP9MetadataContext { } VP9MetadataContext; -static int vp9_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) +static int vp9_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, + CodedBitstreamFragment *frag) { VP9MetadataContext *ctx = bsf->priv_data; - CodedBitstreamFragment *frag = &ctx->fragment; - int err, i; - - err = ff_bsf_get_packet_ref(bsf, pkt); - if (err < 0) - return err; - - err = ff_cbs_read_packet(ctx->cbc, frag, pkt); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to read packet.\n"); - goto fail; - } + int i; for (i = 0; i < frag->nb_units; i++) { VP9RawFrame *frame = frag->units[i].content; @@ -90,35 +77,19 @@ static int vp9_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) } } - err = ff_cbs_write_packet(ctx->cbc, pkt, frag); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); - goto fail; - } - - err = 0; -fail: - ff_cbs_fragment_reset(frag); - - if (err < 0) - av_packet_unref(pkt); - - return err; + return 0; } -static int vp9_metadata_init(AVBSFContext *bsf) -{ - VP9MetadataContext *ctx = bsf->priv_data; - - return ff_cbs_init(&ctx->cbc, AV_CODEC_ID_VP9, bsf); -} +static const CBSBSFType vp9_metadata_type = { + .codec_id = AV_CODEC_ID_VP9, + .fragment_name = "superframe", + .unit_name = "frame", + .update_fragment = &vp9_metadata_update_fragment, +}; -static void vp9_metadata_close(AVBSFContext *bsf) +static int vp9_metadata_init(AVBSFContext *bsf) { - VP9MetadataContext *ctx = bsf->priv_data; - - ff_cbs_fragment_free(&ctx->fragment); - ff_cbs_close(&ctx->cbc); + return ff_cbs_bsf_init(bsf, &vp9_metadata_type); } #define OFFSET(x) offsetof(VP9MetadataContext, x) @@ -169,7 +140,7 @@ const AVBitStreamFilter ff_vp9_metadata_bsf = { .priv_data_size = sizeof(VP9MetadataContext), .priv_class = &vp9_metadata_class, .init = &vp9_metadata_init, - .close = &vp9_metadata_close, - .filter = &vp9_metadata_filter, + .close = &ff_cbs_bsf_close, + .filter = &ff_cbs_bsf_filter, .codec_ids = vp9_metadata_codec_ids, };