avutil/dovi_meta: add AVDOVIDataMapping.nlq_pivots

The NLQ pivots are not documented but should be present in the header for profile 7 RPU format. It has been verified using Dolby's verification toolkit.

quietvoid committed 4 years ago

Commit 78076ed1 parent 591e27d4 files · +13 −2Browse files

Unified · Split

4 files

doc/APIchanges +3 −0
libavcodec/dovi_rpu.c +8 −1
libavutil/dovi_meta.h +1 −0
libavutil/version.h +1 −1

doc/APIchanges+3−0

@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2024-03-07 · 1 unmodified line
2		2
3	API changes, most recent first:	3	API changes, most recent first:
4		4
		5	2024-04-xx - xxxxxxxxxx - lavu 59.11.100 - dovi_meta.h
		6	Add AVDOVIDataMapping.nlq_pivots.
		7
5	2024-03-29 - xxxxxxxxxx - lavf 61.3.100 - avformat.h	8	2024-03-29 - xxxxxxxxxx - lavf 61.3.100 - avformat.h
6	Add AVFormatContext.duration_probesize.	9	Add AVFormatContext.duration_probesize.
7		10

libavcodec/dovi_rpu.c+8−1

     /* Copy only the parts of these structs known to us at compiler-time. */
 #define COPY(t, a, b, last) memcpy(a, b, offsetof(t, last) + sizeof((b)->last))
     COPY(AVDOVIRpuDataHeader, av_dovi_get_header(dovi), &s->header, disable_residual_flag);
-    COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq[2].linear_deadzone_threshold);
+    COPY(AVDOVIDataMapping, av_dovi_get_mapping(dovi), s->mapping, nlq_pivots);
     COPY(AVDOVIColorMetadata, av_dovi_get_color(dovi), s->color, source_diagonal);
     return 0;
 }
         }
         if (use_nlq) {
+            int nlq_pivot = 0;
             vdr->mapping.nlq_method_idc = get_bits(gb, 3);
+            for (int i = 0; i < 2; i++) {
+                nlq_pivot += get_bits(gb, hdr->bl_bit_depth);
+                vdr->mapping.nlq_pivots[i] = av_clip_uint16(nlq_pivot);
+            }
             /**
              * The patent mentions another legal value, NLQ_MU_LAW, but it's
              * not documented anywhere how to parse or apply that type of NLQ.

libavutil/dovi_meta.h+1−0

@@ -147,6 +147,7 @@ typedef struct AVDOVIDataMapping { · 146 unmodified lines
147	uint32_t num_x_partitions;	147	uint32_t num_x_partitions;
148	uint32_t num_y_partitions;	148	uint32_t num_y_partitions;
149	AVDOVINLQParams nlq[3]; /* per component */	149	AVDOVINLQParams nlq[3]; /* per component */
		150	uint16_t nlq_pivots[2];
150	} AVDOVIDataMapping;	151	} AVDOVIDataMapping;
151		152
152	/**	153	/**

libavutil/version.h+1−1

@@ -79,7 +79,7 @@ · 78 unmodified lines
79	*/	79	*/
80		80
81	#define LIBAVUTIL_VERSION_MAJOR 59	81	#define LIBAVUTIL_VERSION_MAJOR 59
82	#define LIBAVUTIL_VERSION_MINOR 10	82	#define LIBAVUTIL_VERSION_MINOR 11
83	#define LIBAVUTIL_VERSION_MICRO 100	83	#define LIBAVUTIL_VERSION_MICRO 100
84		84
85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	85	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

avutil/dovi_meta: add AVDOVIDataMapping.nlq_pivots

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code