[FFmpeg-devel] [PATCH v2 09/13] h265_metadata_bsf: Use common cbs bsf implementation
Mark Thompson
sw at jkqxz.net
Tue Jan 19 00:44:51 EET 2021
---
libavcodec/h265_metadata_bsf.c | 191 ++++-----------------------------
1 file changed, 22 insertions(+), 169 deletions(-)
diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c
index 504a75dac2..4be41932bb 100644
--- a/libavcodec/h265_metadata_bsf.c
+++ b/libavcodec/h265_metadata_bsf.c
@@ -20,29 +20,19 @@
#include "libavutil/opt.h"
#include "bsf.h"
-#include "bsf_internal.h"
#include "cbs.h"
+#include "cbs_bsf.h"
#include "cbs_h265.h"
#include "hevc.h"
#include "h265_profile_level.h"
-enum {
- PASS,
- INSERT,
- REMOVE,
-};
-
enum {
LEVEL_UNSET = -2,
LEVEL_AUTO = -1,
};
typedef struct H265MetadataContext {
- const AVClass *class;
-
- CodedBitstreamContext *input;
- CodedBitstreamContext *output;
- CodedBitstreamFragment access_unit;
+ CBSBSFContext common;
H265RawAUD aud_nal;
@@ -338,89 +328,18 @@ static int h265_metadata_update_sps(AVBSFContext *bsf,
return 0;
}
-static int h265_metadata_update_side_data(AVBSFContext *bsf, AVPacket *pkt)
-{
- H265MetadataContext *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;
- }
-
- if (ctx->level == LEVEL_AUTO && !ctx->level_guess)
- h265_metadata_guess_level(bsf, au);
-
- for (i = 0; i < au->nb_units; i++) {
- if (au->units[i].type == HEVC_NAL_VPS) {
- err = h265_metadata_update_vps(bsf, au->units[i].content);
- if (err < 0)
- return err;
- }
- if (au->units[i].type == HEVC_NAL_SPS) {
- err = h265_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 h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt)
+static int h265_metadata_update_fragment(AVBSFContext *bsf, AVPacket *pkt,
+ CodedBitstreamFragment *au)
{
H265MetadataContext *ctx = bsf->priv_data;
- CodedBitstreamFragment *au = &ctx->access_unit;
int err, i;
- err = ff_bsf_get_packet_ref(bsf, pkt);
- if (err < 0)
- return err;
-
- err = h265_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 == HEVC_NAL_AUD) {
- if (ctx->aud == REMOVE)
+ if (ctx->aud == BSF_ELEMENT_REMOVE)
ff_cbs_delete_unit(au, 0);
} else {
- if (ctx->aud == INSERT) {
+ if (pkt && ctx->aud == BSF_ELEMENT_INSERT) {
H265RawAUD *aud = &ctx->aud_nal;
int pic_type = 0, temporal_id = 8, layer_id = 0;
@@ -453,7 +372,7 @@ static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt)
err = ff_cbs_insert_unit_content(au, 0, HEVC_NAL_AUD, aud, NULL);
if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to insert AUD.\n");
- goto fail;
+ return err;
}
}
}
@@ -465,101 +384,35 @@ static int h265_metadata_filter(AVBSFContext *bsf, AVPacket *pkt)
if (au->units[i].type == HEVC_NAL_VPS) {
err = h265_metadata_update_vps(bsf, au->units[i].content);
if (err < 0)
- goto fail;
+ return err;
}
if (au->units[i].type == HEVC_NAL_SPS) {
err = h265_metadata_update_sps(bsf, au->units[i].content);
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;
- }
-
- err = 0;
-fail:
- ff_cbs_fragment_reset(au);
-
- if (err < 0)
- av_packet_unref(pkt);
-
- return err;
+ return 0;
}
-static int h265_metadata_init(AVBSFContext *bsf)
-{
- H265MetadataContext *ctx = bsf->priv_data;
- CodedBitstreamFragment *au = &ctx->access_unit;
- int err, i;
-
- err = ff_cbs_init(&ctx->input, AV_CODEC_ID_HEVC, bsf);
- if (err < 0)
- return err;
- err = ff_cbs_init(&ctx->output, AV_CODEC_ID_HEVC, 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;
- }
-
- if (ctx->level == LEVEL_AUTO)
- h265_metadata_guess_level(bsf, au);
-
- for (i = 0; i < au->nb_units; i++) {
- if (au->units[i].type == HEVC_NAL_VPS) {
- err = h265_metadata_update_vps(bsf, au->units[i].content);
- if (err < 0)
- goto fail;
- }
- if (au->units[i].type == HEVC_NAL_SPS) {
- err = h265_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;
- }
- }
-
- err = 0;
-fail:
- ff_cbs_fragment_reset(au);
- return err;
-}
+static const CBSBSFType h265_metadata_type = {
+ .codec_id = AV_CODEC_ID_HEVC,
+ .fragment_name = "access unit",
+ .unit_name = "NAL unit",
+ .update_fragment = &h265_metadata_update_fragment,
+};
-static void h265_metadata_close(AVBSFContext *bsf)
+static int h265_metadata_init(AVBSFContext *bsf)
{
- H265MetadataContext *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_generic_init(bsf, &h265_metadata_type);
}
#define OFFSET(x) offsetof(H265MetadataContext, x)
#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM)
static const AVOption h265_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,
@@ -650,7 +503,7 @@ const AVBitStreamFilter ff_hevc_metadata_bsf = {
.priv_data_size = sizeof(H265MetadataContext),
.priv_class = &h265_metadata_class,
.init = &h265_metadata_init,
- .close = &h265_metadata_close,
- .filter = &h265_metadata_filter,
+ .close = &ff_cbs_bsf_generic_close,
+ .filter = &ff_cbs_bsf_generic_filter,
.codec_ids = h265_metadata_codec_ids,
};
--
2.29.2
More information about the ffmpeg-devel
mailing list