From patchwork Sun Aug 23 22:33:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21857 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 62C7A44B129 for ; Mon, 24 Aug 2020 01:35:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C04468A188; Mon, 24 Aug 2020 01:35:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 364056880C4 for ; Mon, 24 Aug 2020 01:35:25 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id k20so6492423wmi.5 for ; Sun, 23 Aug 2020 15:35:25 -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=rMrAc6kurnwPws7PLywSbKXkJGzb/QtzAi1iCN3gqgc=; b=dLIPB6zQvlL++9fnvEsM8W2Vm/7peOisjGZ5ybMNCKxbJF0QQDm+/Ue2tE2a9EmPNM ZUYr8sbM49sw2YkEPNxUsb8OyuDsbgUJ7aXadaWq0tHcc0F4VChI4byTvI5J/UOLKYk+ UasbfPfH+y7sKH0BRR+OQnPvONs0ADQMQB+TE/bpcsdlkx4EkwhyNlvaIPOu7HM2wuVA eT9cteFxcIOmtBGJKFC3ThWSXiAM/rUZlMNwTaSwwjIQT6GbwPo+t6r79eVJf8pSzAGD 8v8GdFprNd4+RSC59d0VbYEhxFiGg1snT0w5bpWq44PaUUK84MB1NPxOIu8RSqXvkgx2 Qc8g== 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=rMrAc6kurnwPws7PLywSbKXkJGzb/QtzAi1iCN3gqgc=; b=nrepkqvJYa2HgWtwTImU1EIvGCYxsTzuOBvC6tslhRq1nsFGCKORBuOPz613t2xmM8 YdBOa7f6Xbu/k1yDlRkwYKg8fMOeWzGPR6Ae6XSOiZBfNO6Xi5Wvw2g79xITEtqQ7Z5h GxMkLBTJeQeOj2VX3JVUnxujkrwUyorEEz991WqAxGgOHc/RFrI8PsbJUYuUz9ICnMtM 1b4Jj99ZhQE31hyR6Il4WBXjOQ8YV7H/118SnYkHwCjP//+aGM0t8H42KjssB8dnXdBM 9D6G+85I2NOgE7U+qCeKmHIpJucBtfOc3PhBRkjag6uTX4/AU7+XiLLB/cQXPrTTfsb6 xJ4Q== X-Gm-Message-State: AOAM530f4Edna6WHhuJFSNPf42ebYTIWZu5RlSkuyKvsKUF9XBj76o0x vZEHpUtJFgtUoggm/GOOZHdN/qZhsQbuAg== X-Google-Smtp-Source: ABdhPJwBIpkiTImK7y4U6f82+7FcSw2vcI5o/2sQwnHhugsAZwmhJGmZnRBugAR/i8UTZA/U4ytMnQ== X-Received: by 2002:a1c:7407:: with SMTP id p7mr2916983wmc.117.1598222124204; Sun, 23 Aug 2020 15:35:24 -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.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 15:35:23 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 23 Aug 2020 23:33:04 +0100 Message-Id: <20200823223310.233061-2-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 2/8] h264_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/h264_metadata_bsf.c | 225 +++++++-------------------------- 1 file changed, 45 insertions(+), 180 deletions(-) diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index 7d6d871240..4243a8da98 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -22,20 +22,13 @@ #include "libavutil/opt.h" #include "bsf.h" -#include "bsf_internal.h" #include "cbs.h" +#include "cbs_bsf.h" #include "cbs_h264.h" #include "h264.h" #include "h264_levels.h" #include "h264_sei.h" -enum { - PASS, - INSERT, - REMOVE, - EXTRACT, -}; - enum { FLIP_HORIZONTAL = 1, FLIP_VERTICAL = 2, @@ -47,11 +40,7 @@ enum { }; typedef struct H264MetadataContext { - const AVClass *class; - - CodedBitstreamContext *input; - CodedBitstreamContext *output; - CodedBitstreamFragment access_unit; + CBSBSFContext common; int done_first_au; @@ -332,49 +321,6 @@ static int h264_metadata_update_sps(AVBSFContext *bsf, return 0; } -static int h264_metadata_update_side_data(AVBSFContext *bsf, AVPacket *pkt) -{ - H264MetadataContext *ctx = bsf->priv_data; - CodedBitstreamFragment *au = &ctx->access_unit; - uint8_t *side_data; - int side_data_size; - int err, i; - - side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, - &side_data_size); - if (!side_data_size) - return 0; - - err = ff_cbs_read(ctx->input, au, side_data, side_data_size); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to read extradata from packet side data.\n"); - return err; - } - - for (i = 0; i < au->nb_units; i++) { - if (au->units[i].type == H264_NAL_SPS) { - err = h264_metadata_update_sps(bsf, au->units[i].content); - if (err < 0) - return err; - } - } - - err = ff_cbs_write_fragment_data(ctx->output, au); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to write extradata into packet side data.\n"); - return err; - } - - side_data = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, au->data_size); - if (!side_data) - return AVERROR(ENOMEM); - memcpy(side_data, au->data, au->data_size); - - ff_cbs_fragment_reset(au); - - return 0; -} - static int h264_metadata_handle_display_orientation(AVBSFContext *bsf, AVPacket *pkt, CodedBitstreamFragment *au, @@ -398,8 +344,8 @@ static int h264_metadata_handle_display_orientation(AVBSFContext *bsf, continue; disp = &sei->payload[j].payload.display_orientation; - if (ctx->display_orientation == REMOVE || - ctx->display_orientation == INSERT) { + if (ctx->display_orientation == BSF_ELEMENT_REMOVE || + ctx->display_orientation == BSF_ELEMENT_INSERT) { ff_cbs_h264_delete_sei_message(au, &au->units[i], j); continue; } @@ -428,7 +374,7 @@ static int h264_metadata_handle_display_orientation(AVBSFContext *bsf, } } - if (ctx->display_orientation == INSERT) { + if (ctx->display_orientation == BSF_ELEMENT_INSERT) { H264RawSEIPayload payload = { .payload_type = H264_SEI_TYPE_DISPLAY_ORIENTATION, }; @@ -517,41 +463,21 @@ static int h264_metadata_handle_display_orientation(AVBSFContext *bsf, return 0; } -static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) +static int h264_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt, + CodedBitstreamFragment *au) { H264MetadataContext *ctx = bsf->priv_data; - CodedBitstreamFragment *au = &ctx->access_unit; int err, i, j, has_sps, seek_point; - err = ff_bsf_get_packet_ref(bsf, pkt); - if (err < 0) - return err; - - err = h264_metadata_update_side_data(bsf, pkt); - if (err < 0) - goto fail; - - err = ff_cbs_read_packet(ctx->input, au, pkt); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to read packet.\n"); - goto fail; - } - - if (au->nb_units == 0) { - av_log(bsf, AV_LOG_ERROR, "No NAL units in packet.\n"); - err = AVERROR_INVALIDDATA; - goto fail; - } - // If an AUD is present, it must be the first NAL unit. if (au->units[0].type == H264_NAL_AUD) { - if (ctx->aud == REMOVE) + if (ctx->aud == BSF_ELEMENT_REMOVE) ff_cbs_delete_unit(au, 0); } else { - if (ctx->aud == INSERT) { + if (ctx->aud == BSF_ELEMENT_INSERT && pkt) { err = h264_metadata_insert_aud(bsf, au); if (err < 0) - goto fail; + return err; } } @@ -560,25 +486,29 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) if (au->units[i].type == H264_NAL_SPS) { err = h264_metadata_update_sps(bsf, au->units[i].content); if (err < 0) - goto fail; + return err; has_sps = 1; } } - // The current packet should be treated as a seek point for metadata - // insertion if any of: - // - It is the first packet in the stream. - // - It contains an SPS, indicating that a sequence might start here. - // - It is marked as containing a key frame. - seek_point = !ctx->done_first_au || has_sps || - (pkt->flags & AV_PKT_FLAG_KEY); + if (pkt) { + // The current packet should be treated as a seek point for metadata + // insertion if any of: + // - It is the first packet in the stream. + // - It contains an SPS, indicating that a sequence might start here. + // - It is marked as containing a key frame. + seek_point = !ctx->done_first_au || has_sps || + (pkt->flags & AV_PKT_FLAG_KEY); + } else { + seek_point = 0; + } if (ctx->sei_user_data && seek_point) { err = ff_cbs_h264_add_sei_message(au, &ctx->sei_user_data_payload); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Failed to add user data SEI " "message to access unit.\n"); - goto fail; + return err; } } @@ -603,41 +533,33 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) } } - if (ctx->display_orientation != PASS) { + if (ctx->display_orientation != BSF_ELEMENT_PASS) { err = h264_metadata_handle_display_orientation(bsf, pkt, au, seek_point); if (err < 0) - goto fail; + return err; } - err = ff_cbs_write_packet(ctx->output, pkt, au); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); - goto fail; - } - - ctx->done_first_au = 1; - - err = 0; -fail: - ff_cbs_fragment_reset(au); - - if (err < 0) - av_packet_unref(pkt); - - return err; + if (pkt) + ctx->done_first_au = 1; + return 0; } +static const CBSBSFType h264_metadata_type = { + .codec_id = AV_CODEC_ID_H264, + .fragment_name = "access unit", + .unit_name = "NAL unit", + .update_fragment = &h264_metadata_update_fragment, +}; + static int h264_metadata_init(AVBSFContext *bsf) { H264MetadataContext *ctx = bsf->priv_data; - CodedBitstreamFragment *au = &ctx->access_unit; - int err, i; if (ctx->sei_user_data) { H264RawSEIUserDataUnregistered *udu = &ctx->sei_user_data_payload.payload.user_data_unregistered; - int j; + int i, j; ctx->sei_user_data_payload.payload_type = H264_SEI_TYPE_USER_DATA_UNREGISTERED; @@ -667,67 +589,18 @@ static int h264_metadata_init(AVBSFContext *bsf) } else { av_log(bsf, AV_LOG_ERROR, "Invalid user data: " "must be \"UUID+string\".\n"); - err = AVERROR(EINVAL); - goto fail; - } - } - - 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; - - 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_SPS) { - err = h264_metadata_update_sps(bsf, au->units[i].content); - if (err < 0) - goto fail; - } - } - - 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; + return AVERROR(EINVAL); } } - err = 0; -fail: - ff_cbs_fragment_reset(au); - return err; -} - -static void h264_metadata_close(AVBSFContext *bsf) -{ - H264MetadataContext *ctx = bsf->priv_data; - - ff_cbs_fragment_free(&ctx->access_unit); - ff_cbs_close(&ctx->input); - ff_cbs_close(&ctx->output); + return ff_cbs_bsf_init(bsf, &h264_metadata_type); } #define OFFSET(x) offsetof(H264MetadataContext, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM) static const AVOption h264_metadata_options[] = { - { "aud", "Access Unit Delimiter NAL units", - OFFSET(aud), AV_OPT_TYPE_INT, - { .i64 = PASS }, PASS, REMOVE, FLAGS, "aud" }, - { "pass", NULL, 0, AV_OPT_TYPE_CONST, - { .i64 = PASS }, .flags = FLAGS, .unit = "aud" }, - { "insert", NULL, 0, AV_OPT_TYPE_CONST, - { .i64 = INSERT }, .flags = FLAGS, .unit = "aud" }, - { "remove", NULL, 0, AV_OPT_TYPE_CONST, - { .i64 = REMOVE }, .flags = FLAGS, .unit = "aud" }, + BSF_ELEMENT_OPTIONS_PIR("aud", "Access Unit Delimiter NAL units", + aud, "aud"), { "sample_aspect_ratio", "Set sample aspect ratio (table E-1)", OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL, @@ -783,17 +656,9 @@ static const AVOption h264_metadata_options[] = { { "delete_filler", "Delete all filler (both NAL and SEI)", OFFSET(delete_filler), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS}, - { "display_orientation", "Display orientation SEI", - OFFSET(display_orientation), AV_OPT_TYPE_INT, - { .i64 = PASS }, PASS, EXTRACT, FLAGS, "disp_or" }, - { "pass", NULL, 0, AV_OPT_TYPE_CONST, - { .i64 = PASS }, .flags = FLAGS, .unit = "disp_or" }, - { "insert", NULL, 0, AV_OPT_TYPE_CONST, - { .i64 = INSERT }, .flags = FLAGS, .unit = "disp_or" }, - { "remove", NULL, 0, AV_OPT_TYPE_CONST, - { .i64 = REMOVE }, .flags = FLAGS, .unit = "disp_or" }, - { "extract", NULL, 0, AV_OPT_TYPE_CONST, - { .i64 = EXTRACT }, .flags = FLAGS, .unit = "disp_or" }, + BSF_ELEMENT_OPTIONS_PIRE("display_orientation", + "Display orientation SEI", + display_orientation, "disp_or"), { "rotate", "Set rotation in display orientation SEI (anticlockwise angle in degrees)", OFFSET(rotate), AV_OPT_TYPE_DOUBLE, @@ -857,7 +722,7 @@ const AVBitStreamFilter ff_h264_metadata_bsf = { .priv_data_size = sizeof(H264MetadataContext), .priv_class = &h264_metadata_class, .init = &h264_metadata_init, - .close = &h264_metadata_close, - .filter = &h264_metadata_filter, + .close = &ff_cbs_bsf_close, + .filter = &ff_cbs_bsf_filter, .codec_ids = h264_metadata_codec_ids, };