From patchwork Mon Jan 18 22:44:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 25025 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 806C244B378 for ; Tue, 19 Jan 2021 00:55:01 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 694996805A5; Tue, 19 Jan 2021 00:55:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A429680389 for ; Tue, 19 Jan 2021 00:54:55 +0200 (EET) Received: by mail-wm1-f44.google.com with SMTP id u14so10871745wmq.4 for ; Mon, 18 Jan 2021 14:54:55 -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=BJc49eDNMbV8WCyNgFkIZmsrb7G4sBPuoGUCj5IHBiY=; b=Di3y4r2cXioO2fx9EjbTTWji8sin1eULLtwhHXvgcDbXvv6chfQTyF3cNlFg3gdVpO am1pC0ZqToZ9DPZx3gojFJwJNLzmMujUs69oE4gzSa1MOrkh50XodP4X3OTwPqnlDGLg ucI5DImRNETEaxXi3xBf1idZwyYHmch27/jz31HoBYUWIwNA16wouiWucno7eZumtrTz TUKl643fobZoGS0SXp6ZmsHi+8r5QNLGL58ien2CukuA9OsphlvPhnPV24B4Y5E7mrqH zbz6ei9vj4bNTdDV+9HYh3AU37ySgrgIbZz3dGnDuN4oiU6fYsxzlTpGPV5B1nO60yGp n97Q== 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=BJc49eDNMbV8WCyNgFkIZmsrb7G4sBPuoGUCj5IHBiY=; b=JA3EcOPON+sE1W7ySwtfOwEx1xJ1ZVeALWA4VZ36j5htDnRv67WlgLn+xttU1xHobb 0jXFa330DRfHAuEMiMffFF5kEU2zHtknTQK6hWP57gbSvbaGVcYldMkdjQ2ZpqhFWlBN dleDpillGAZuaMN54sFdTMnrEYfoMw+YJsKvt1kQwlrZPESdjcWyD+klLzRFQymJ0FU+ 9lmpQoeD0Ldj2ySxSdZbi9XA5BnCOfyoFRIYnhqtc056m9pP1CBuOyOoNRagD9Th1HBQ guwfgyJz6jNhM9ni5OOFTHKjFepOS977FRl8fQtvEGxuvXt3q5PKpy9mvky8to/onNSV RnEQ== X-Gm-Message-State: AOAM532OFuLVMFH1Z1k8y6oPipV+wsoOdXIG2GTpHMdGBWLnzeF58NM2 Io7N0Fnm9hqmTotJmWP4/8UbVprC7wQUqA== X-Google-Smtp-Source: ABdhPJyE7gAvZBSB/5+Q0GNC1lPGTlZcWBxgYiy3ZKx1LODhb6gB8rKKLExM1VQBsbQCKWGDoVK8aw== X-Received: by 2002:a1c:27c3:: with SMTP id n186mr1336352wmn.96.1611010032982; Mon, 18 Jan 2021 14:47:12 -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 b3sm1525898wme.32.2021.01.18.14.47.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 14:47:12 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Jan 2021 22:44:53 +0000 Message-Id: <20210118224455.750030-12-sw@jkqxz.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210118224455.750030-1-sw@jkqxz.net> References: <20210118224455.750030-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 11/13] 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..d904a0088d 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_generic_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_generic_close, + .filter = &ff_cbs_bsf_generic_filter, .codec_ids = vp9_metadata_codec_ids, };