diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-02-23 19:29:31 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-05-03 16:58:22 +0000 |
| commit | e6d4e687558d08187e7a415a7725e4b1a416f782 (patch) | |
| tree | 1b78c7eab6cdd94a66419d48b61acbbfd4889f75 | |
| parent | f51aa92b0f165a24c4bd8c3b0b85c159048195d6 (diff) | |
| download | ffmpeg-e6d4e687558d08187e7a415a7725e4b1a416f782.tar.gz | |
lavu: add planar 16 bit and 8 bit rgb with alpha
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavutil/pixdesc.c | 39 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 3 | ||||
| -rw-r--r-- | libavutil/version.h | 4 | ||||
| -rw-r--r-- | libswscale/utils.c | 3 |
4 files changed, 47 insertions, 2 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 9767cc1825..203ec7b1d4 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -1653,6 +1653,45 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, }, + [AV_PIX_FMT_GBRAP] = { + .name = "gbrap", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 2, 0, 1, 0, 7 }, /* R */ + { 0, 0, 1, 0, 7 }, /* G */ + { 1, 0, 1, 0, 7 }, /* B */ + { 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 = { + { 2, 1, 1, 0, 15 }, /* R */ + { 0, 1, 1, 0, 15 }, /* G */ + { 1, 1, 1, 0, 15 }, /* B */ + { 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 = { + { 2, 1, 1, 0, 15 }, /* R */ + { 0, 1, 1, 0, 15 }, /* G */ + { 1, 1, 1, 0, 15 }, /* B */ + { 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 34be30ab64..1760ab14e1 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -234,6 +234,9 @@ enum AVPixelFormat { AV_PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little-endian AV_PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big-endian AV_PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, 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 diff --git a/libavutil/version.h b/libavutil/version.h index abcdba8331..3222adc6a6 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -75,8 +75,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 27 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 28 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ diff --git a/libswscale/utils.c b/libswscale/utils.c index f0139401fc..28fd2e1b73 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -198,6 +198,9 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_GBRP16BE] = { 1, 0 }, [AV_PIX_FMT_XYZ12BE] = { 1, 0 }, [AV_PIX_FMT_XYZ12LE] = { 1, 0 }, + [AV_PIX_FMT_GBRAP] = { 0, 0 }, + [AV_PIX_FMT_GBRAP16LE] = { 0, 0 }, + [AV_PIX_FMT_GBRAP16BE] = { 0, 0 }, }; int sws_isSupportedInput(enum AVPixelFormat pix_fmt) |