From patchwork Fri Jan 1 21:35:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 24759 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 63D8C448818 for ; Fri, 1 Jan 2021 23:59:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BAD968A9F3; Fri, 1 Jan 2021 23:59:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7BA568A9F3 for ; Fri, 1 Jan 2021 23:59:10 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id l11so50829600lfg.0 for ; Fri, 01 Jan 2021 13:59:10 -0800 (PST) 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=RLGTFnRy8X/tiBZ4AGPUA+lYaYyisBzfDTMVQ9DQCGo=; b=xSYcoX7S/8MtjHrpzBYlQ8wHJZj1j8qj3r5UfsTD+JeQE/3osfVXDv2EX1vT990Jkd EF0rLj7GSP4TTUiSBDh7kUuINrrbwyGOvPX8AubSRocb0LUryM8HdKtkbEqj+q7b9eSs 8JuCOJXpC9JUdSPilfxbblJxS7+tTvJrk/LNK/i1vmgXvkdBBjwUdEdcdrQZER2odu1m mFV7FM4G6a/IJBUKz96oLe7N48M+aApDpCgQaqrIhxwNhwQiDQpf9r9t9DqJGi8VRXz0 h6ydiozBy1JkXGmhHXA7Y/Zgd0xtaO/AAUkpJdeo+eR5JdujhcawicPZhPiSitI11Us7 vi0A== 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=RLGTFnRy8X/tiBZ4AGPUA+lYaYyisBzfDTMVQ9DQCGo=; b=s0Edbj8K/En/yUtSA4JtGHFI9z2672vDlP3QJSXH/1TINyWzN7W1oLWZt2oR6TubjE ey/vhRe2woEGUOdn0cx+Un4kS59aAw2kiEjS/Suc65ymCNU/RTG3IHx2mTobzBXtZ2gM KAI+XH+JHjLBS9XxCiEn2iJAPr4WjWMixDzXusl2graGTZ3OENY5nraBt3zr+kbU67hm 4SdIaZBf0XUZGUCKiSgq2UsX92ByZkZ0kDsiBJ9s+xm3Zvg0h4sZU52bBLfNidaFbR8a D+shrMuxF4n3FiFFjHAGpUqq56LxG99vT0wcGb8wG6el5+wHK5sjvWNJ8KtwtIU8FyYd v96g== X-Gm-Message-State: AOAM5307DGOA+0m4rom2YC9IX2DgjCkrJCJJDM2JLv/pAb7f5eHT9f0y sZFSzyT2Z0WssrrQ06hiw5rh5vjH3BXj0A== X-Google-Smtp-Source: ABdhPJxsIUbnRyK6xSqB65RwKTNfBCiC7WjK5Q9Lpt5WYA23MOexWPJGa36XNFEWIqylXyMl4nGbgA== X-Received: by 2002:a05:6000:101:: with SMTP id o1mr69531990wrx.211.1609537081192; Fri, 01 Jan 2021 13:38:01 -0800 (PST) Received: from localhost.localdomain (cpc91226-cmbg18-2-0-cust7.5-4.cable.virginm.net. [82.0.29.8]) by smtp.gmail.com with ESMTPSA id v20sm18784595wml.34.2021.01.01.13.38.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 13:38:00 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jan 2021 21:35:21 +0000 Message-Id: <20210101213537.169546-12-sw@jkqxz.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210101213537.169546-1-sw@jkqxz.net> References: <20210101213537.169546-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/27] 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, };