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

@@ -135,7 +135,7 @@ int ff_dovi_configure(DOVIContext s, AVCodecContext avctx); · 134 unmodified lines
135	* including the EMDF header (profile 10) or NAL encapsulation (otherwise).	135	* including the EMDF header (profile 10) or NAL encapsulation (otherwise).
136	*/	136	*/
137	int ff_dovi_rpu_generate(DOVIContext s, const AVDOVIMetadata metadata,	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	/***************************************************

@@ -435,7 +435,7 @@ static void generate_ext_v2(PutBitContext pb, const AVDOVIDmData dm) · 434 unmodified lines
435	}	435	}
436		436
437	int ff_dovi_rpu_generate(DOVIContext s, const AVDOVIMetadata metadata,	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	PutBitContext *pb = &(PutBitContext){0};	440	PutBitContext *pb = &(PutBitContext){0};
441	const AVDOVIRpuDataHeader *hdr;	441	const AVDOVIRpuDataHeader *hdr;

@@ -1294,7 +1294,7 @@ FF_ENABLE_DEPRECATION_WARNINGS · 1293 unmodified lines
1294	const AVDOVIMetadata metadata = (const AVDOVIMetadata )sd->data;	1294	const AVDOVIMetadata metadata = (const AVDOVIMetadata )sd->data;
1295	uint8_t *t35;	1295	uint8_t *t35;
1296	int size;	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	return res;	1298	return res;
1299	res = aom_img_add_metadata(rawimg, OBU_METADATA_TYPE_ITUT_T35,	1299	res = aom_img_add_metadata(rawimg, OBU_METADATA_TYPE_ITUT_T35,
1300	t35, size, AOM_MIF_ANY_FRAME);	1300	t35, size, AOM_MIF_ANY_FRAME);

@@ -541,7 +541,7 @@ static int eb_send_frame(AVCodecContext avctx, const AVFrame frame) · 540 unmodified lines
541	const AVDOVIMetadata metadata = (const AVDOVIMetadata )sd->data;	541	const AVDOVIMetadata metadata = (const AVDOVIMetadata )sd->data;
542	uint8_t *t35;	542	uint8_t *t35;
543	int size;	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	return ret;	545	return ret;
546	ret = svt_add_metadata(headerPtr, EB_AV1_METADATA_TYPE_ITUT_T35, t35, size);	546	ret = svt_add_metadata(headerPtr, EB_AV1_METADATA_TYPE_ITUT_T35, t35, size);
547	av_free(t35);	547	av_free(t35);

         sd = av_frame_get_side_data(pic, AV_FRAME_DATA_DOVI_METADATA);
         if (ctx->dovi.cfg.dv_profile && sd) {
             const AVDOVIMetadata *metadata = (const AVDOVIMetadata *)sd->data;
-            ret = ff_dovi_rpu_generate(&ctx->dovi, metadata, &x265pic.rpu.payload,
+            ret = ff_dovi_rpu_generate(&ctx->dovi, metadata, 0,
+                                       &x265pic.rpu.payload,
                                        &x265pic.rpu.payloadSize);
             if (ret < 0) {
                 free_picture(ctx, &x265pic);

Keyboard shortcuts