avcodec/dovi_rpuenc: add `flags` to ff_dovi_rpu_generate()

Will be used to control compression, encapsulation etc.

Niklas Haas committed 2 years ago

Commit 1e6fdb81 parent c62b3645 files · +6 −5Browse files

Showing the changes to libavcodec (5 of 5 files). Show all

Unified · Split

5 files

libavcodec/dovi_rpu.h +1 −1
libavcodec/dovi_rpuenc.c +1 −1
libavcodec/libaomenc.c +1 −1
libavcodec/libsvtav1.c +1 −1
libavcodec/libx265.c +2 −1

libavcodec/dovi_rpu.h+1−1

@@ -135,7 +135,7 @@ int ff_dovi_configure(DOVIContext s, AVCodecContext avctx); · 134 unmodified lines
135	135	* including the EMDF header (profile 10) or NAL encapsulation (otherwise).
136	136	*/
137	137	int ff_dovi_rpu_generate(DOVIContext s, const AVDOVIMetadata metadata,
138		− uint8_t *out_rpu, int out_size);
	138	+ int flags, uint8_t *out_rpu, int out_size);
139	139
140	140
141	141	/***************************************************

libavcodec/dovi_rpuenc.c+1−1

@@ -435,7 +435,7 @@ static void generate_ext_v2(PutBitContext pb, const AVDOVIDmData dm) · 434 unmodified lines
435	435	}
436	436
437	437	int ff_dovi_rpu_generate(DOVIContext s, const AVDOVIMetadata metadata,
438		− uint8_t *out_rpu, int out_size)
	438	+ int flags, uint8_t *out_rpu, int out_size)
439	439	{
440	440	PutBitContext *pb = &(PutBitContext){0};
441	441	const AVDOVIRpuDataHeader *hdr;

libavcodec/libaomenc.c+1−1

@@ -1294,7 +1294,7 @@ FF_ENABLE_DEPRECATION_WARNINGS · 1293 unmodified lines
1294	1294	const AVDOVIMetadata metadata = (const AVDOVIMetadata )sd->data;
1295	1295	uint8_t *t35;
1296	1296	int size;
1297		− if ((res = ff_dovi_rpu_generate(&ctx->dovi, metadata, &t35, &size)) < 0)
	1297	+ if ((res = ff_dovi_rpu_generate(&ctx->dovi, metadata, 0, &t35, &size)) < 0)
1298	1298	return res;
1299	1299	res = aom_img_add_metadata(rawimg, OBU_METADATA_TYPE_ITUT_T35,
1300	1300	t35, size, AOM_MIF_ANY_FRAME);

libavcodec/libsvtav1.c+1−1

@@ -541,7 +541,7 @@ static int eb_send_frame(AVCodecContext avctx, const AVFrame frame) · 540 unmodified lines
541	541	const AVDOVIMetadata metadata = (const AVDOVIMetadata )sd->data;
542	542	uint8_t *t35;
543	543	int size;
544		− if ((ret = ff_dovi_rpu_generate(&svt_enc->dovi, metadata, &t35, &size)) < 0)
	544	+ if ((ret = ff_dovi_rpu_generate(&svt_enc->dovi, metadata, 0, &t35, &size)) < 0)
545	545	return ret;
546	546	ret = svt_add_metadata(headerPtr, EB_AV1_METADATA_TYPE_ITUT_T35, t35, size);
547	547	av_free(t35);

libavcodec/libx265.c+2−1

@@ -789,7 +789,8 @@ static int libx265_encode_frame(AVCodecContext avctx, AVPacket pkt, · 788 unmodified lines
789	789	sd = av_frame_get_side_data(pic, AV_FRAME_DATA_DOVI_METADATA);
790	790	if (ctx->dovi.cfg.dv_profile && sd) {
791	791	const AVDOVIMetadata metadata = (const AVDOVIMetadata )sd->data;
792		− ret = ff_dovi_rpu_generate(&ctx->dovi, metadata, &x265pic.rpu.payload,
	792	+ ret = ff_dovi_rpu_generate(&ctx->dovi, metadata, 0,
	793	+ &x265pic.rpu.payload,
793	794	&x265pic.rpu.payloadSize);
794	795	if (ret < 0) {
795	796	free_picture(ctx, &x265pic);