diff options
Diffstat (limited to 'video/fmt-conversion.c')
| -rw-r--r-- | video/fmt-conversion.c | 80 |
1 files changed, 27 insertions, 53 deletions
diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 09ff925577..eb6b31cc71 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -30,29 +30,22 @@ static const struct { {IMGFMT_ARGB, AV_PIX_FMT_ARGB}, {IMGFMT_BGRA, AV_PIX_FMT_BGRA}, {IMGFMT_BGR24, AV_PIX_FMT_BGR24}, - {IMGFMT_RGB565_BE, AV_PIX_FMT_RGB565BE}, - {IMGFMT_RGB565_LE, AV_PIX_FMT_RGB565LE}, - {IMGFMT_RGB555_BE, AV_PIX_FMT_RGB555BE}, - {IMGFMT_RGB555_LE, AV_PIX_FMT_RGB555LE}, - {IMGFMT_RGB444_BE, AV_PIX_FMT_RGB444BE}, - {IMGFMT_RGB444_LE, AV_PIX_FMT_RGB444LE}, + {IMGFMT_RGB565, AV_PIX_FMT_RGB565}, + {IMGFMT_RGB555, AV_PIX_FMT_RGB555}, + {IMGFMT_RGB444, AV_PIX_FMT_RGB444}, {IMGFMT_RGB8, AV_PIX_FMT_RGB8}, {IMGFMT_RGB4, AV_PIX_FMT_RGB4}, {IMGFMT_MONO, AV_PIX_FMT_MONOBLACK}, {IMGFMT_MONO_W, AV_PIX_FMT_MONOWHITE}, {IMGFMT_RGB4_BYTE, AV_PIX_FMT_RGB4_BYTE}, {IMGFMT_BGR4_BYTE, AV_PIX_FMT_BGR4_BYTE}, - {IMGFMT_RGB48_LE, AV_PIX_FMT_RGB48LE}, - {IMGFMT_RGB48_BE, AV_PIX_FMT_RGB48BE}, + {IMGFMT_RGB48, AV_PIX_FMT_RGB48}, {IMGFMT_ABGR, AV_PIX_FMT_ABGR}, {IMGFMT_RGBA, AV_PIX_FMT_RGBA}, {IMGFMT_RGB24, AV_PIX_FMT_RGB24}, - {IMGFMT_BGR565_BE, AV_PIX_FMT_BGR565BE}, - {IMGFMT_BGR565_LE, AV_PIX_FMT_BGR565LE}, - {IMGFMT_BGR555_BE, AV_PIX_FMT_BGR555BE}, - {IMGFMT_BGR555_LE, AV_PIX_FMT_BGR555LE}, - {IMGFMT_BGR444_BE, AV_PIX_FMT_BGR444BE}, - {IMGFMT_BGR444_LE, AV_PIX_FMT_BGR444LE}, + {IMGFMT_BGR565, AV_PIX_FMT_BGR565}, + {IMGFMT_BGR555, AV_PIX_FMT_BGR555}, + {IMGFMT_BGR444, AV_PIX_FMT_BGR444}, {IMGFMT_BGR8, AV_PIX_FMT_BGR8}, {IMGFMT_BGR4, AV_PIX_FMT_BGR4}, {IMGFMT_PAL8, AV_PIX_FMT_PAL8}, @@ -64,8 +57,7 @@ static const struct { {IMGFMT_Y8, AV_PIX_FMT_GRAY8}, // FFmpeg prefers AV_PIX_FMT_GRAY8A, but Libav has only Y400A {IMGFMT_YA8, AV_PIX_FMT_Y400A}, - {IMGFMT_Y16_LE, AV_PIX_FMT_GRAY16LE}, - {IMGFMT_Y16_BE, AV_PIX_FMT_GRAY16BE}, + {IMGFMT_Y16, AV_PIX_FMT_GRAY16}, {IMGFMT_410P, AV_PIX_FMT_YUV410P}, {IMGFMT_420P, AV_PIX_FMT_YUV420P}, {IMGFMT_411P, AV_PIX_FMT_YUV411P}, @@ -73,24 +65,15 @@ static const struct { {IMGFMT_444P, AV_PIX_FMT_YUV444P}, {IMGFMT_440P, AV_PIX_FMT_YUV440P}, - {IMGFMT_420P16_LE, AV_PIX_FMT_YUV420P16LE}, - {IMGFMT_420P16_BE, AV_PIX_FMT_YUV420P16BE}, - {IMGFMT_420P9_LE, AV_PIX_FMT_YUV420P9LE}, - {IMGFMT_420P9_BE, AV_PIX_FMT_YUV420P9BE}, - {IMGFMT_420P10_LE, AV_PIX_FMT_YUV420P10LE}, - {IMGFMT_420P10_BE, AV_PIX_FMT_YUV420P10BE}, - {IMGFMT_422P10_LE, AV_PIX_FMT_YUV422P10LE}, - {IMGFMT_422P10_BE, AV_PIX_FMT_YUV422P10BE}, - {IMGFMT_444P9_BE , AV_PIX_FMT_YUV444P9BE}, - {IMGFMT_444P9_LE , AV_PIX_FMT_YUV444P9LE}, - {IMGFMT_444P10_BE, AV_PIX_FMT_YUV444P10BE}, - {IMGFMT_444P10_LE, AV_PIX_FMT_YUV444P10LE}, - {IMGFMT_422P16_LE, AV_PIX_FMT_YUV422P16LE}, - {IMGFMT_422P16_BE, AV_PIX_FMT_YUV422P16BE}, - {IMGFMT_422P9_LE, AV_PIX_FMT_YUV422P9LE}, - {IMGFMT_422P9_BE, AV_PIX_FMT_YUV422P9BE}, - {IMGFMT_444P16_LE, AV_PIX_FMT_YUV444P16LE}, - {IMGFMT_444P16_BE, AV_PIX_FMT_YUV444P16BE}, + {IMGFMT_420P16, AV_PIX_FMT_YUV420P16}, + {IMGFMT_420P9, AV_PIX_FMT_YUV420P9}, + {IMGFMT_420P10, AV_PIX_FMT_YUV420P10}, + {IMGFMT_422P10, AV_PIX_FMT_YUV422P10}, + {IMGFMT_444P9, AV_PIX_FMT_YUV444P9}, + {IMGFMT_444P10, AV_PIX_FMT_YUV444P10}, + {IMGFMT_422P16, AV_PIX_FMT_YUV422P16}, + {IMGFMT_422P9, AV_PIX_FMT_YUV422P9}, + {IMGFMT_444P16, AV_PIX_FMT_YUV444P16}, // YUVJ are YUV formats that use the full Y range. Decoder color range // information is used instead. Deprecated in ffmpeg. @@ -103,28 +86,19 @@ static const struct { {IMGFMT_422AP, AV_PIX_FMT_YUVA422P}, {IMGFMT_444AP, AV_PIX_FMT_YUVA444P}, - {IMGFMT_XYZ12_LE, AV_PIX_FMT_XYZ12LE}, - {IMGFMT_XYZ12_BE, AV_PIX_FMT_XYZ12BE}, + {IMGFMT_XYZ12, AV_PIX_FMT_XYZ12}, // ffmpeg only #if LIBAVUTIL_VERSION_MICRO >= 100 - {IMGFMT_420P12_LE, AV_PIX_FMT_YUV420P12LE}, - {IMGFMT_420P12_BE, AV_PIX_FMT_YUV420P12BE}, - {IMGFMT_420P14_LE, AV_PIX_FMT_YUV420P14LE}, - {IMGFMT_420P14_BE, AV_PIX_FMT_YUV420P14BE}, - {IMGFMT_422P12_LE, AV_PIX_FMT_YUV422P12LE}, - {IMGFMT_422P12_BE, AV_PIX_FMT_YUV422P12BE}, - {IMGFMT_422P14_LE, AV_PIX_FMT_YUV422P14LE}, - {IMGFMT_422P14_BE, AV_PIX_FMT_YUV422P14BE}, - {IMGFMT_444P12_BE, AV_PIX_FMT_YUV444P12BE}, - {IMGFMT_444P12_LE, AV_PIX_FMT_YUV444P12LE}, - {IMGFMT_444P14_BE, AV_PIX_FMT_YUV444P14BE}, - {IMGFMT_444P14_LE, AV_PIX_FMT_YUV444P14LE}, - - {IMGFMT_RGBA64_BE, AV_PIX_FMT_RGBA64BE}, - {IMGFMT_RGBA64_LE, AV_PIX_FMT_RGBA64LE}, - {IMGFMT_BGRA64_BE, AV_PIX_FMT_BGRA64BE}, - {IMGFMT_BGRA64_LE, AV_PIX_FMT_BGRA64LE}, + {IMGFMT_420P12, AV_PIX_FMT_YUV420P12}, + {IMGFMT_420P14, AV_PIX_FMT_YUV420P14}, + {IMGFMT_422P12, AV_PIX_FMT_YUV422P12}, + {IMGFMT_422P14, AV_PIX_FMT_YUV422P14}, + {IMGFMT_444P12, AV_PIX_FMT_YUV444P12}, + {IMGFMT_444P14, AV_PIX_FMT_YUV444P14}, + + {IMGFMT_RGBA64, AV_PIX_FMT_RGBA64}, + {IMGFMT_BGRA64, AV_PIX_FMT_BGRA64}, {IMGFMT_BGR0, AV_PIX_FMT_BGR0}, {IMGFMT_0RGB, AV_PIX_FMT_0RGB}, |