From: Kieran Kunhya <[email protected]>
Signed-off-by: Luca Barbato <[email protected]>
---
I'd also bump the version.
doc/APIchanges | 4 ++++
libavutil/pixdesc.c | 36 ++++++++++++++++++++++++++++++++++++
libavutil/pixfmt.h | 4 ++++
libavutil/version.h | 2 +-
4 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index fbd3ff9..85c02d6 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,10 @@ libavutil: 2012-10-22
API changes, most recent first:
+2013-09-21 - xxxxxxx - lavu 52.16.0 - pixfmt.h
+ Add interleaved 4:2:2 8/10-bit formats AV_PIX_FMT_NV16 and
+ AV_PIX_FMT_NV20.
+
2013-09-16 - 3feb3d6 - lavu 52.15.0 - mem.h
Add av_reallocp.
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 3ac5785..c44bc16 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -1392,6 +1392,42 @@ const AVPixFmtDescriptor
av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
},
.flags = AV_PIX_FMT_FLAG_BE,
},
+ [AV_PIX_FMT_NV16] = {
+ .name = "nv16",
+ .nb_components = 3,
+ .log2_chroma_w = 1,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 0, 1, 0, 7 }, /* Y */
+ { 1, 1, 1, 0, 7 }, /* U */
+ { 1, 1, 2, 0, 7 }, /* V */
+ },
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
+ },
+ [AV_PIX_FMT_NV20LE] = {
+ .name = "nv20le",
+ .nb_components = 3,
+ .log2_chroma_w = 1,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 0, 1, 0, 9 }, /* Y */
+ { 1, 1, 1, 0, 9 }, /* U */
+ { 1, 1, 3, 0, 9 }, /* V */
+ },
+ .flags = AV_PIX_FMT_FLAG_PLANAR,
+ },
+ [AV_PIX_FMT_NV20BE] = {
+ .name = "nv20be",
+ .nb_components = 3,
+ .log2_chroma_w = 1,
+ .log2_chroma_h = 0,
+ .comp = {
+ { 0, 0, 1, 0, 9 }, /* Y */
+ { 1, 1, 1, 0, 9 }, /* U */
+ { 1, 1, 3, 0, 9 }, /* V */
+ },
+ .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE,
+ },
};
FF_DISABLE_DEPRECATION_WARNINGS
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 4b04944..43633e7 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -185,6 +185,9 @@ enum AVPixelFormat {
AV_PIX_FMT_VDPAU, ///< HW acceleration through VDPAU, Picture.data[3]
contains a VdpVideoSurface
AV_PIX_FMT_XYZ12LE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y,
12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4
lower bits are set to 0
AV_PIX_FMT_XYZ12BE, ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y,
12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower
bits are set to 0
+ AV_PIX_FMT_NV16, ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr &
Cb sample per 2x1 Y samples)
+ AV_PIX_FMT_NV20LE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr &
Cb sample per 2x1 Y samples), little-endian
+ AV_PIX_FMT_NV20BE, ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr &
Cb sample per 2x1 Y samples), big-endian
AV_PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you
want to link with shared libav* because the number of formats might differ
between versions
#if FF_API_PIX_FMT
@@ -238,6 +241,7 @@ enum AVPixelFormat {
#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
#define AV_PIX_FMT_XYZ12 AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
+#define AV_PIX_FMT_NV20 AV_PIX_FMT_NE(NV20BE, NV20LE)
#if FF_API_PIX_FMT
#define PixelFormat AVPixelFormat
diff --git a/libavutil/version.h b/libavutil/version.h
index 935c505..635055f 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -37,7 +37,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 52
-#define LIBAVUTIL_VERSION_MINOR 15
+#define LIBAVUTIL_VERSION_MINOR 16
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
