On Wed, Dec 17, 2014 at 2:54 PM, Vittorio Giovara <[email protected]> wrote: > From: Paul B Mahol <[email protected]> > > Signed-off-by: Vittorio Giovara <[email protected]> > --- > libavutil/pixdesc.c | 39 +++++++++++++++++++++++++++++++++++++++ > libavutil/pixfmt.h | 6 ++++++ > libavutil/version.h | 2 +- > 3 files changed, 46 insertions(+), 1 deletion(-) > > diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c > index baace8c..a9ccfbe 100644 > --- a/libavutil/pixdesc.c > +++ b/libavutil/pixdesc.c > @@ -1451,6 +1451,45 @@ const AVPixFmtDescriptor > av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { > }, > .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | > AV_PIX_FMT_FLAG_RGB, > }, > + [AV_PIX_FMT_GBRAP] = { > + .name = "gbrap", > + .nb_components = 4, > + .log2_chroma_w = 0, > + .log2_chroma_h = 0, > + .comp = { > + { 0, 0, 1, 0, 7 }, /* G */ > + { 1, 0, 1, 0, 7 }, /* B */ > + { 2, 0, 1, 0, 7 }, /* R */ > + { 3, 0, 1, 0, 7 }, /* A */ > + }, > + .flags = PIX_FMT_PLANAR | PIX_FMT_RGB | PIX_FMT_ALPHA, > + }, > + [AV_PIX_FMT_GBRAP16LE] = { > + .name = "gbrap16le", > + .nb_components = 4, > + .log2_chroma_w = 0, > + .log2_chroma_h = 0, > + .comp = { > + { 0, 1, 1, 0, 15 }, /* G */ > + { 1, 1, 1, 0, 15 }, /* B */ > + { 2, 1, 1, 0, 15 }, /* R */ > + { 3, 1, 1, 0, 15 }, /* A */ > + }, > + .flags = PIX_FMT_PLANAR | PIX_FMT_RGB | PIX_FMT_ALPHA, > + }, > + [AV_PIX_FMT_GBRAP16BE] = { > + .name = "gbrap16be", > + .nb_components = 4, > + .log2_chroma_w = 0, > + .log2_chroma_h = 0, > + .comp = { > + { 0, 1, 1, 0, 15 }, /* G */ > + { 1, 1, 1, 0, 15 }, /* B */ > + { 2, 1, 1, 0, 15 }, /* R */ > + { 3, 1, 1, 0, 15 }, /* A */ > + }, > + .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB | PIX_FMT_ALPHA, > + }, > [AV_PIX_FMT_VDPAU] = { > .name = "vdpau", > .log2_chroma_w = 1, > diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h > index 6af6596..e507425 100644 > --- a/libavutil/pixfmt.h > +++ b/libavutil/pixfmt.h > @@ -206,6 +206,10 @@ enum AVPixelFormat { > AV_PIX_FMT_YA16BE, ///< 16bit gray, 16bit alpha (big-endian) > AV_PIX_FMT_YA16LE, ///< 16bit gray, 16bit alpha (little-endian) > > + AV_PIX_FMT_GBRAP, ///< planar GBRA 4:4:4:4 32bpp > + AV_PIX_FMT_GBRAP16BE, ///< planar GBRA 4:4:4:4 64bpp, big-endian > + AV_PIX_FMT_GBRAP16LE, ///< planar GBRA 4:4:4:4 64bpp, little-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 > @@ -251,6 +255,8 @@ enum AVPixelFormat { > #define AV_PIX_FMT_GBRP10 AV_PIX_FMT_NE(GBRP10BE, GBRP10LE) > #define AV_PIX_FMT_GBRP16 AV_PIX_FMT_NE(GBRP16BE, GBRP16LE) > > +#define AV_PIX_FMT_GBRAP16 AV_PIX_FMT_NE(GBRAP16BE, GBRAP16LE) > + > #define AV_PIX_FMT_YUVA420P9 AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE) > #define AV_PIX_FMT_YUVA422P9 AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE) > #define AV_PIX_FMT_YUVA444P9 AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE) > diff --git a/libavutil/version.h b/libavutil/version.h > index 215ecb2..3d973bc 100644 > --- a/libavutil/version.h > +++ b/libavutil/version.h > @@ -54,7 +54,7 @@ > */ > > #define LIBAVUTIL_VERSION_MAJOR 54 > -#define LIBAVUTIL_VERSION_MINOR 6 > +#define LIBAVUTIL_VERSION_MINOR 7 > #define LIBAVUTIL_VERSION_MICRO 0 > > #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ > -- > 1.9.3 (Apple Git-50) >
ping on the 4-patch set. -- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
