AVRational sample_aspect_ratio;
+ int overscan_appropriate_flag;
+
int video_format;
int video_full_range_flag;
int colour_primaries;
need_vui = 1;
}
-#define SET_OR_INFER(field, value, present_flag, infer) do { \
- if (value >= 0) { \
- field = value; \
+#define SET_VUI_FIELD(field) do { \
+ if (ctx->field >= 0) { \
+ sps->vui.field = ctx->field; \
need_vui = 1; \
- } else if (!present_flag) \
- field = infer; \
+ } \
} while (0)
+ if (ctx->overscan_appropriate_flag >= 0) {
+ SET_VUI_FIELD(overscan_appropriate_flag);
+ sps->vui.overscan_info_present_flag = 1;
+ }
+
if (ctx->video_format >= 0 ||
ctx->video_full_range_flag >= 0 ||
ctx->colour_primaries >= 0 ||
ctx->transfer_characteristics >= 0 ||
ctx->matrix_coefficients >= 0) {
- SET_OR_INFER(sps->vui.video_format, ctx->video_format,
- sps->vui.video_signal_type_present_flag, 5);
+ SET_VUI_FIELD(video_format);
- SET_OR_INFER(sps->vui.video_full_range_flag,
- ctx->video_full_range_flag,
- sps->vui.video_signal_type_present_flag, 0);
+ SET_VUI_FIELD(video_full_range_flag);
if (ctx->colour_primaries >= 0 ||
ctx->transfer_characteristics >= 0 ||
ctx->matrix_coefficients >= 0) {
- SET_OR_INFER(sps->vui.colour_primaries,
- ctx->colour_primaries,
- sps->vui.colour_description_present_flag, 2);
-
- SET_OR_INFER(sps->vui.transfer_characteristics,
- ctx->transfer_characteristics,
- sps->vui.colour_description_present_flag, 2);
-
- SET_OR_INFER(sps->vui.matrix_coefficients,
- ctx->matrix_coefficients,
- sps->vui.colour_description_present_flag, 2);
+ SET_VUI_FIELD(colour_primaries);
+ SET_VUI_FIELD(transfer_characteristics);
+ SET_VUI_FIELD(matrix_coefficients);
sps->vui.colour_description_present_flag = 1;
}
sps->vui.video_signal_type_present_flag = 1;
- need_vui = 1;
}
if (ctx->chroma_sample_loc_type >= 0) {
sps->vui.timing_info_present_flag = 1;
need_vui = 1;
}
- SET_OR_INFER(sps->vui.fixed_frame_rate_flag,
- ctx->fixed_frame_rate_flag,
- sps->vui.timing_info_present_flag, 0);
+ SET_VUI_FIELD(fixed_frame_rate_flag);
if (sps->separate_colour_plane_flag || sps->chroma_format_idc == 0) {
crop_unit_x = 1;
return 0;
}
-static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *out)
+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->cbc, 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->cbc, 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(ctx->cbc, au);
+
+ return 0;
+}
+
+static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt)
{
H264MetadataContext *ctx = bsf->priv_data;
- AVPacket *in = NULL;
CodedBitstreamFragment *au = &ctx->access_unit;
int err, i, j, has_sps;
H264RawAUD aud;
- uint8_t *displaymatrix_side_data = NULL;
- size_t displaymatrix_side_data_size = 0;
- err = ff_bsf_get_packet(bsf, &in);
+ err = ff_bsf_get_packet_ref(bsf, pkt);
if (err < 0)
return err;
- err = ff_cbs_read_packet(ctx->cbc, au, in);
+ err = h264_metadata_update_side_data(bsf, pkt);
+ if (err < 0)
+ goto fail;
+
+ err = ff_cbs_read_packet(ctx->cbc, au, pkt);
if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to read packet.\n");
goto fail;
} else {
goto invalid_user_data;
}
- if (i & 1)
+ if (j & 1)
udu->uuid_iso_iec_11578[j / 2] |= v;
else
udu->uuid_iso_iec_11578[j / 2] = v << 4;
}
if (ctx->delete_filler) {
- for (i = 0; i < au->nb_units; i++) {
+ for (i = au->nb_units - 1; i >= 0; i--) {
if (au->units[i].type == H264_NAL_FILLER_DATA) {
- // Filler NAL units.
- err = ff_cbs_delete_unit(ctx->cbc, au, i);
- if (err < 0) {
- av_log(bsf, AV_LOG_ERROR, "Failed to delete "
- "filler NAL.\n");
- goto fail;
- }
- --i;
+ ff_cbs_delete_unit(ctx->cbc, au, i);
continue;
}
// Filler SEI messages.
H264RawSEI *sei = au->units[i].content;
- for (j = 0; j < sei->payload_count; j++) {
+ for (j = sei->payload_count - 1; j >= 0; j--) {
if (sei->payload[j].payload_type ==
- H264_SEI_TYPE_FILLER_PAYLOAD) {
- err = ff_cbs_h264_delete_sei_message(ctx->cbc, au,
- &au->units[i], j);
- if (err < 0) {
- av_log(bsf, AV_LOG_ERROR, "Failed to delete "
- "filler SEI message.\n");
- goto fail;
- }
- // Renumbering might have happened, start again at
- // the same NAL unit position.
- --i;
- break;
- }
+ H264_SEI_TYPE_FILLER_PAYLOAD)
+ ff_cbs_h264_delete_sei_message(ctx->cbc, au,
+ &au->units[i], j);
}
}
}
}
if (ctx->display_orientation != PASS) {
- for (i = 0; i < au->nb_units; i++) {
+ for (i = au->nb_units - 1; i >= 0; i--) {
H264RawSEI *sei;
if (au->units[i].type != H264_NAL_SEI)
continue;
sei = au->units[i].content;
- for (j = 0; j < sei->payload_count; j++) {
+ for (j = sei->payload_count - 1; j >= 0; j--) {
H264RawSEIDisplayOrientation *disp;
int32_t *matrix;
if (ctx->display_orientation == REMOVE ||
ctx->display_orientation == INSERT) {
- err = ff_cbs_h264_delete_sei_message(ctx->cbc, au,
- &au->units[i], j);
- if (err < 0) {
- av_log(bsf, AV_LOG_ERROR, "Failed to delete "
- "display orientation SEI message.\n");
- goto fail;
- }
- --i;
- break;
+ ff_cbs_h264_delete_sei_message(ctx->cbc, au,
+ &au->units[i], j);
+ continue;
}
- matrix = av_mallocz(9 * sizeof(int32_t));
+ matrix = av_malloc(9 * sizeof(int32_t));
if (!matrix) {
err = AVERROR(ENOMEM);
goto fail;
av_display_matrix_flip(matrix, disp->hor_flip, disp->ver_flip);
// If there are multiple display orientation messages in an
- // access unit then ignore all but the last one.
- av_freep(&displaymatrix_side_data);
-
- displaymatrix_side_data = (uint8_t*)matrix;
- displaymatrix_side_data_size = 9 * sizeof(int32_t);
+ // access unit, then the last one added to the packet (i.e.
+ // the first one in the access unit) will prevail.
+ err = av_packet_add_side_data(pkt, AV_PKT_DATA_DISPLAYMATRIX,
+ (uint8_t*)matrix,
+ 9 * sizeof(int32_t));
+ if (err < 0) {
+ av_log(bsf, AV_LOG_ERROR, "Failed to attach extracted "
+ "displaymatrix side data to packet.\n");
+ av_freep(matrix);
+ goto fail;
+ }
}
}
}
int size;
int write = 0;
- data = av_packet_get_side_data(in, AV_PKT_DATA_DISPLAYMATRIX, &size);
+ data = av_packet_get_side_data(pkt, AV_PKT_DATA_DISPLAYMATRIX, &size);
if (data && size >= 9 * sizeof(int32_t)) {
int32_t matrix[9];
int hflip, vflip;
}
}
- err = ff_cbs_write_packet(ctx->cbc, out, au);
+ err = ff_cbs_write_packet(ctx->cbc, pkt, au);
if (err < 0) {
av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n");
goto fail;
}
- err = av_packet_copy_props(out, in);
- if (err < 0)
- goto fail;
-
- if (displaymatrix_side_data) {
- err = av_packet_add_side_data(out, AV_PKT_DATA_DISPLAYMATRIX,
- displaymatrix_side_data,
- displaymatrix_side_data_size);
- if (err) {
- av_log(bsf, AV_LOG_ERROR, "Failed to attach extracted "
- "displaymatrix side data to packet.\n");
- goto fail;
- }
- displaymatrix_side_data = NULL;
- }
-
ctx->done_first_au = 1;
err = 0;
fail:
ff_cbs_fragment_reset(ctx->cbc, au);
- av_freep(&displaymatrix_side_data);
if (err < 0)
- av_packet_unref(out);
- av_packet_free(&in);
+ av_packet_unref(pkt);
return err;
}
OFFSET(sample_aspect_ratio), AV_OPT_TYPE_RATIONAL,
{ .dbl = 0.0 }, 0, 65535, FLAGS },
+ { "overscan_appropriate_flag", "Set VUI overscan appropriate flag",
+ OFFSET(overscan_appropriate_flag), AV_OPT_TYPE_INT,
+ { .i64 = -1 }, -1, 1, FLAGS },
+
{ "video_format", "Set video format (table E-2)",
OFFSET(video_format), AV_OPT_TYPE_INT,
{ .i64 = -1 }, -1, 7, FLAGS},
projects / ffmpeg / blobdiff