Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8

Browse Source 
The rationale is that you have a packed format in form
<greyscale sample> <alpha sample> <greyscale sample> <alpha sample>
and shortening greyscale to 'G' might make one thing about Greenscale instead.
An alias pixel format and color space name are provided for compatibility.
pull/80/head
Vittorio Giovara 11 years ago
parent e0d73fda36
commit e96c3b81ca
15 changed files with 29 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      doc/APIchanges
  2. 2
      libavcodec/brenderpix.c
  3. 2
      libavcodec/libopenjpegdec.c
  4. 6
      libavcodec/libopenjpegenc.c
  5. 2
      libavcodec/pngdec.c
  6. 2
      libavcodec/raw.c
  7. 5
      libavutil/pixdesc.c
  8. 5
      libavutil/pixfmt.h
  9. 2
      libavutil/version.h
  10. 4
      libswscale/input.c
  11. 2
      libswscale/swscale-test.c
  12. 4
      libswscale/swscale_internal.h
  13. 4
      libswscale/swscale_unscaled.c
  14. 2
      libswscale/utils.c
  15. 4
      libswscale/x86/swscale.c

4
doc/APIchanges
Unescape View File

@ -13,6 +13,10 @@ libavutil: 2013-12-xx
API changes, most recent first: API changes, most recent first:
2014-08-xx - xxxxxxx - lavu 53.21.1 - avstring.h
Rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 to better identify the format.
An alias pixel format and color space name are provided for compatibility.
2014-08-xx - xxxxxxx - lavu 53.21.0 - pixdesc.h 2014-08-xx - xxxxxxx - lavu 53.21.0 - pixdesc.h
Support name aliases for pixel formats. Support name aliases for pixel formats.

2
libavcodec/brenderpix.c
Unescape View File

@ -193,7 +193,7 @@ static int pix_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
bytes_pp = 4; bytes_pp = 4;
break; break;
case 18: case 18:
avctx->pix_fmt = AV_PIX_FMT_Y400A; avctx->pix_fmt = AV_PIX_FMT_YA8;
bytes_pp = 2; bytes_pp = 2;
break; break;
default: default:

2
libavcodec/libopenjpegdec.c
Unescape View File

@ -45,7 +45,7 @@
#define RGB_PIXEL_FORMATS AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, \ #define RGB_PIXEL_FORMATS AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, \
AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64 AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64
#define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_Y400A, \ #define GRAY_PIXEL_FORMATS AV_PIX_FMT_GRAY8, AV_PIX_FMT_YA8, \
AV_PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
#define YUV_PIXEL_FORMATS AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, \ #define YUV_PIXEL_FORMATS AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, \

6
libavcodec/libopenjpegenc.c
Unescape View File

@ -90,7 +90,7 @@ static opj_image_t *libopenjpeg_create_image(AVCodecContext *avctx,
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_GRAY8:
case AV_PIX_FMT_GRAY16: case AV_PIX_FMT_GRAY16:
case AV_PIX_FMT_Y400A: case AV_PIX_FMT_YA8:
color_space = CLRSPC_GRAY; color_space = CLRSPC_GRAY;
break; break;
case AV_PIX_FMT_RGB24: case AV_PIX_FMT_RGB24:
@ -302,7 +302,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
switch (avctx->pix_fmt) { switch (avctx->pix_fmt) {
case AV_PIX_FMT_RGB24: case AV_PIX_FMT_RGB24:
case AV_PIX_FMT_RGBA: case AV_PIX_FMT_RGBA:
case AV_PIX_FMT_Y400A: case AV_PIX_FMT_YA8:
libopenjpeg_copy_packed8(avctx, frame, image); libopenjpeg_copy_packed8(avctx, frame, image);
break; break;
case AV_PIX_FMT_RGB48: case AV_PIX_FMT_RGB48:
@ -424,7 +424,7 @@ AVCodec ff_libopenjpeg_encoder = {
.pix_fmts = (const enum AVPixelFormat[]) { .pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48, AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB48,
AV_PIX_FMT_RGBA64, AV_PIX_FMT_RGBA64,
AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_Y400A, AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY16, AV_PIX_FMT_YA8,
AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUVA420P,
AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P,
AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P,

2
libavcodec/pngdec.c
Unescape View File

@ -499,7 +499,7 @@ static int decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
} else if (s->bit_depth == 8 && } else if (s->bit_depth == 8 &&
s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
avctx->pix_fmt = AV_PIX_FMT_Y400A; avctx->pix_fmt = AV_PIX_FMT_YA8;
} else { } else {
goto fail; goto fail;
} }

2
libavcodec/raw.c
Unescape View File

@ -127,7 +127,7 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{ AV_PIX_FMT_YUV444P16LE, MKTAG('Y', '3', 0 , 16 ) }, { AV_PIX_FMT_YUV444P16LE, MKTAG('Y', '3', 0 , 16 ) },
{ AV_PIX_FMT_YUV444P16BE, MKTAG(16 , 0 , '3', 'Y') }, { AV_PIX_FMT_YUV444P16BE, MKTAG(16 , 0 , '3', 'Y') },
{ AV_PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) }, { AV_PIX_FMT_YUVA420P, MKTAG('Y', '4', 11 , 8 ) },
{ AV_PIX_FMT_Y400A, MKTAG('Y', '2', 0 , 8 ) }, { AV_PIX_FMT_YA8, MKTAG('Y', '2', 0 , 8 ) },
{ AV_PIX_FMT_YUVA420P9LE, MKTAG('Y', '4', 11 , 9 ) }, { AV_PIX_FMT_YUVA420P9LE, MKTAG('Y', '4', 11 , 9 ) },
{ AV_PIX_FMT_YUVA420P9BE, MKTAG( 9 , 11 , '4', 'Y') }, { AV_PIX_FMT_YUVA420P9BE, MKTAG( 9 , 11 , '4', 'Y') },

5
libavutil/pixdesc.c
Unescape View File

@ -1339,14 +1339,15 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_h = 1, .log2_chroma_h = 1,
.flags = AV_PIX_FMT_FLAG_HWACCEL, .flags = AV_PIX_FMT_FLAG_HWACCEL,
}, },
[AV_PIX_FMT_Y400A] = { [AV_PIX_FMT_YA8] = {
.name = "y400a", .name = "ya8",
.nb_components = 2, .nb_components = 2,
.comp = { .comp = {
{ 0, 1, 1, 0, 7 }, /* Y */ { 0, 1, 1, 0, 7 }, /* Y */
{ 0, 1, 2, 0, 7 }, /* A */ { 0, 1, 2, 0, 7 }, /* A */
}, },
.flags = AV_PIX_FMT_FLAG_ALPHA, .flags = AV_PIX_FMT_FLAG_ALPHA,
.alias = "gray8a",
}, },
[AV_PIX_FMT_GBRP] = { [AV_PIX_FMT_GBRP] = {
.name = "gbrp", .name = "gbrp",

5
libavutil/pixfmt.h
Unescape View File

@ -141,7 +141,10 @@ enum AVPixelFormat {
AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0 AV_PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1 AV_PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1 AV_PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
AV_PIX_FMT_Y400A, ///< 8bit gray, 8bit alpha AV_PIX_FMT_YA8, ///< 8bit gray, 8bit alpha
AV_PIX_FMT_Y400A = AV_PIX_FMT_YA8, ///< alias for AV_PIX_FMT_YA8
AV_PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian AV_PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
AV_PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian AV_PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian

2
libavutil/version.h
Unescape View File

@ -55,7 +55,7 @@
#define LIBAVUTIL_VERSION_MAJOR 53 #define LIBAVUTIL_VERSION_MAJOR 53
#define LIBAVUTIL_VERSION_MINOR 21 #define LIBAVUTIL_VERSION_MINOR 21
#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_MICRO 1
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \

4
libswscale/input.c
Unescape View File

@ -989,7 +989,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
#endif #endif
case AV_PIX_FMT_YUYV422: case AV_PIX_FMT_YUYV422:
case AV_PIX_FMT_YVYU422: case AV_PIX_FMT_YVYU422:
case AV_PIX_FMT_Y400A: case AV_PIX_FMT_YA8:
c->lumToYV12 = yuy2ToY_c; c->lumToYV12 = yuy2ToY_c;
break; break;
case AV_PIX_FMT_UYVY422: case AV_PIX_FMT_UYVY422:
@ -1085,7 +1085,7 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
case AV_PIX_FMT_ARGB: case AV_PIX_FMT_ARGB:
c->alpToYV12 = abgrToA_c; c->alpToYV12 = abgrToA_c;
break; break;
case AV_PIX_FMT_Y400A: case AV_PIX_FMT_YA8:
c->alpToYV12 = uyvyToY_c; c->alpToYV12 = uyvyToY_c;
break; break;
} }

2
libswscale/swscale-test.c
Unescape View File

@ -37,7 +37,7 @@
* Should be removed when a cleaner pixel format system exists. */ * Should be removed when a cleaner pixel format system exists. */
#define isGray(x) \ #define isGray(x) \
((x) == AV_PIX_FMT_GRAY8 || \ ((x) == AV_PIX_FMT_GRAY8 || \
(x) == AV_PIX_FMT_Y400A || \ (x) == AV_PIX_FMT_YA8 || \
(x) == AV_PIX_FMT_GRAY16BE || \ (x) == AV_PIX_FMT_GRAY16BE || \
(x) == AV_PIX_FMT_GRAY16LE) (x) == AV_PIX_FMT_GRAY16LE)
#define hasChroma(x) \ #define hasChroma(x) \

4
libswscale/swscale_internal.h
Unescape View File

@ -606,7 +606,7 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt)
#else #else
#define isGray(x) \ #define isGray(x) \
((x) == AV_PIX_FMT_GRAY8 || \ ((x) == AV_PIX_FMT_GRAY8 || \
(x) == AV_PIX_FMT_Y400A || \ (x) == AV_PIX_FMT_YA8 || \
(x) == AV_PIX_FMT_GRAY16BE || \ (x) == AV_PIX_FMT_GRAY16BE || \
(x) == AV_PIX_FMT_GRAY16LE) (x) == AV_PIX_FMT_GRAY16LE)
#endif #endif
@ -697,7 +697,7 @@ static av_always_inline int usePal(enum AVPixelFormat pix_fmt)
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
av_assert0(desc); av_assert0(desc);
return ((desc->flags & AV_PIX_FMT_FLAG_PAL) || (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) || return ((desc->flags & AV_PIX_FMT_FLAG_PAL) || (desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) ||
pix_fmt == AV_PIX_FMT_Y400A); pix_fmt == AV_PIX_FMT_YA8);
} }
extern const uint64_t ff_dither4[2]; extern const uint64_t ff_dither4[2];

4
libswscale/swscale_unscaled.c
Unescape View File

@ -351,7 +351,7 @@ static int palToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[],
uint8_t *dstPtr = dst[0] + dstStride[0] * srcSliceY; uint8_t *dstPtr = dst[0] + dstStride[0] * srcSliceY;
const uint8_t *srcPtr = src[0]; const uint8_t *srcPtr = src[0];
if (srcFormat == AV_PIX_FMT_Y400A) { if (srcFormat == AV_PIX_FMT_YA8) {
switch (dstFormat) { switch (dstFormat) {
case AV_PIX_FMT_RGB32 : conv = gray8aToPacked32; break; case AV_PIX_FMT_RGB32 : conv = gray8aToPacked32; break;
case AV_PIX_FMT_BGR32 : conv = gray8aToPacked32; break; case AV_PIX_FMT_BGR32 : conv = gray8aToPacked32; break;
@ -1204,7 +1204,7 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
g = ((i >> 1) & 3) * 85; g = ((i >> 1) & 3) * 85;
b = ( i & 1) * 255; b = ( i & 1) * 255;
} else if (c->srcFormat == AV_PIX_FMT_GRAY8 || } else if (c->srcFormat == AV_PIX_FMT_GRAY8 ||
c->srcFormat == AV_PIX_FMT_Y400A) { c->srcFormat == AV_PIX_FMT_YA8) {
r = g = b = i; r = g = b = i;
} else { } else {
assert(c->srcFormat == AV_PIX_FMT_BGR4_BYTE); assert(c->srcFormat == AV_PIX_FMT_BGR4_BYTE);

2
libswscale/utils.c
Unescape View File

@ -154,7 +154,7 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_RGB444BE] = { 1, 1 }, [AV_PIX_FMT_RGB444BE] = { 1, 1 },
[AV_PIX_FMT_BGR444LE] = { 1, 1 }, [AV_PIX_FMT_BGR444LE] = { 1, 1 },
[AV_PIX_FMT_BGR444BE] = { 1, 1 }, [AV_PIX_FMT_BGR444BE] = { 1, 1 },
[AV_PIX_FMT_Y400A] = { 1, 0 }, [AV_PIX_FMT_YA8] = { 1, 0 },
[AV_PIX_FMT_BGR48BE] = { 1, 1 }, [AV_PIX_FMT_BGR48BE] = { 1, 1 },
[AV_PIX_FMT_BGR48LE] = { 1, 1 }, [AV_PIX_FMT_BGR48LE] = { 1, 1 },
[AV_PIX_FMT_BGRA64BE] = { 0, 0, 1 }, [AV_PIX_FMT_BGRA64BE] = { 0, 0, 1 },

4
libswscale/x86/swscale.c
Unescape View File

@ -363,7 +363,7 @@ switch(c->dstBpc){ \
ASSIGN_VSCALE_FUNC(c->yuv2plane1, mmx, mmxext, cpu_flags & AV_CPU_FLAG_MMXEXT); ASSIGN_VSCALE_FUNC(c->yuv2plane1, mmx, mmxext, cpu_flags & AV_CPU_FLAG_MMXEXT);
switch (c->srcFormat) { switch (c->srcFormat) {
case AV_PIX_FMT_Y400A: case AV_PIX_FMT_YA8:
c->lumToYV12 = ff_yuyvToY_mmx; c->lumToYV12 = ff_yuyvToY_mmx;
if (c->alpPixBuf) if (c->alpPixBuf)
c->alpToYV12 = ff_uyvyToY_mmx; c->alpToYV12 = ff_uyvyToY_mmx;
@ -412,7 +412,7 @@ switch(c->dstBpc){ \
ASSIGN_VSCALE_FUNC(c->yuv2plane1, sse2, sse2, 1); ASSIGN_VSCALE_FUNC(c->yuv2plane1, sse2, sse2, 1);
switch (c->srcFormat) { switch (c->srcFormat) {
case AV_PIX_FMT_Y400A: case AV_PIX_FMT_YA8:
c->lumToYV12 = ff_yuyvToY_sse2; c->lumToYV12 = ff_yuyvToY_sse2;
if (c->alpPixBuf) if (c->alpPixBuf)
c->alpToYV12 = ff_uyvyToY_sse2; c->alpToYV12 = ff_uyvyToY_sse2;

Write Preview
Loading…
Cancel
Save