avcodec: add an export_side_data flag to export picture enhancement layers

James Almer committed 2 years ago

Commit 61473851 parent d250cc04 files · +11 −1Browse files

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

Unified · Split

3 files

libavcodec/avcodec.h +6 −0
libavcodec/options_table.h +1 −0
libavcodec/version.h +1 −1

libavcodec/avcodec.h+6−0

@@ -419,6 +419,12 @@ typedef struct RcOverride{ · 418 unmodified lines
419	419	*/
420	420	#define AV_CODEC_EXPORT_DATA_FILM_GRAIN (1 << 3)
421	421
	422	+/**
	423	+ * Decoding only.
	424	+ * Do not apply picture enhancement layers, export them instead.
	425	+ */
	426	+#define AV_CODEC_EXPORT_DATA_ENHANCEMENTS (1 << 4)
	427	+
422	428	/**
423	429	* The decoder will keep a reference to the frame and may reuse it later.
424	430	*/

libavcodec/options_table.h+1−0

@@ -93,6 +93,7 @@ static const AVOption avcodec_options[] = { · 92 unmodified lines
93	93	{"prft", "export Producer Reference Time through packet side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_PRFT}, INT_MIN, INT_MAX, A\|V\|S\|E, .unit = "export_side_data"},
94	94	{"venc_params", "export video encoding parameters through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS}, INT_MIN, INT_MAX, V\|D, .unit = "export_side_data"},
95	95	{"film_grain", "export film grain parameters through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_FILM_GRAIN}, INT_MIN, INT_MAX, V\|D, .unit = "export_side_data"},
	96	+{"enhancements", "export picture enhancement metadata through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_ENHANCEMENTS}, INT_MIN, INT_MAX, V\|D, .unit = "export_side_data"},
96	97	{"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, INT_MAX},
97	98	{"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V\|E},
98	99	{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A\|D\|E},

libavcodec/version.h+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	29
30	30	#include "version_major.h"
31	31
32		−#define LIBAVCODEC_VERSION_MINOR 17
	32	+#define LIBAVCODEC_VERSION_MINOR 18
33	33	#define LIBAVCODEC_VERSION_MICRO 100
34	34
35	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \