Unified · Split
| @@ -921,6 +921,41 @@ static void gbr16ptopacked16(const uint16_t *src[], const int srcStride[], · 920 unmodified lines | |||
| 921 | } | 921 | } |
| 922 | } | 922 | } |
| 923 | 923 | ||
| 924 | static void gbr16ptopacked30(const uint16_t *src[], const int srcStride[], | ||
| 925 | uint8_t *dst, int dstStride, int srcSliceH, | ||
| 926 | int swap, int bpp, int width) | ||
| 927 | { | ||
| 928 | int x, h, i; | ||
| 929 | int shift = bpp - 10; | ||
| 930 | av_assert0(bpp >= 0); | ||
| 931 | for (h = 0; h < srcSliceH; h++) { | ||
| 932 | uint8_t *dest = dst + dstStride * h; | ||
| 933 | |||
| 934 | switch(swap) { | ||
| 935 | case 3: | ||
| 936 | case 1: | ||
| 937 | for (x = 0; x < width; x++) { | ||
| 938 | unsigned C0 = av_bswap16(src[0][x]) >> shift; | ||
| 939 | unsigned C1 = av_bswap16(src[1][x]) >> shift; | ||
| 940 | unsigned C2 = av_bswap16(src[2][x]) >> shift; | ||
| 941 | AV_WL32(dest + 4 * x, (3U << 30) + (C0 << 20) + (C1 << 10) + C2); | ||
| 942 | } | ||
| 943 | break; | ||
| 944 | default: | ||
| 945 | for (x = 0; x < width; x++) { | ||
| 946 | unsigned C0 = src[0][x] >> shift; | ||
| 947 | unsigned C1 = src[1][x] >> shift; | ||
| 948 | unsigned C2 = src[2][x] >> shift; | ||
| 949 | AV_WL32(dest + 4 * x, (3U << 30) + (C0 << 20) + (C1 << 10) + C2); | ||
| 950 | } | ||
| 951 | break; | ||
| 952 | } | ||
| 953 | for (i = 0; i < 3; i++) | ||
| 954 | src[i] += srcStride[i] >> 1; | ||
| 955 | } | ||
| 956 | } | ||
| 957 | |||
| 958 | |||
| 924 | static int planarRgb16ToRgb16Wrapper(SwsInternal *c, const uint8_t *const src[], | 959 | static int planarRgb16ToRgb16Wrapper(SwsInternal *c, const uint8_t *const src[], |
| 925 | const int srcStride[], int srcSliceY, int srcSliceH, | 960 | const int srcStride[], int srcSliceY, int srcSliceH, |
| 926 | uint8_t *const dst[], const int dstStride[]) | 961 | uint8_t *const dst[], const int dstStride[]) |
| @@ -972,6 +1007,16 @@ static int planarRgb16ToRgb16Wrapper(SwsInternal *c, const uint8_t *const src[], · 45 unmodified lines | |||
| 972 | dst[0] + srcSliceY * dstStride[0], dstStride[0], | 1007 | dst[0] + srcSliceY * dstStride[0], dstStride[0], |
| 973 | srcSliceH, 1, swap, bits_per_sample, c->srcW); | 1008 | srcSliceH, 1, swap, bits_per_sample, c->srcW); |
| 974 | break; | 1009 | break; |
| 1010 | case AV_PIX_FMT_X2RGB10LE: | ||
| 1011 | gbr16ptopacked30(src201, stride201, | ||
| 1012 | dst[0] + srcSliceY * dstStride[0], dstStride[0], | ||
| 1013 | srcSliceH, swap, bits_per_sample, c->srcW); | ||
| 1014 | break; | ||
| 1015 | case AV_PIX_FMT_X2BGR10LE: | ||
| 1016 | gbr16ptopacked30(src102, stride102, | ||
| 1017 | dst[0] + srcSliceY * dstStride[0], dstStride[0], | ||
| 1018 | srcSliceH, swap, bits_per_sample, c->srcW); | ||
| 1019 | break; | ||
| 975 | default: | 1020 | default: |
| 976 | av_log(c, AV_LOG_ERROR, | 1021 | av_log(c, AV_LOG_ERROR, |
| 977 | "unsupported planar RGB conversion %s -> %s\n", | 1022 | "unsupported planar RGB conversion %s -> %s\n", |
| @@ -2161,6 +2206,11 @@ void ff_get_unscaled_swscale(SwsInternal *c) · 1183 unmodified lines | |||
| 2161 | dstFormat == AV_PIX_FMT_BGRA64LE || dstFormat == AV_PIX_FMT_BGRA64BE)) | 2206 | dstFormat == AV_PIX_FMT_BGRA64LE || dstFormat == AV_PIX_FMT_BGRA64BE)) |
| 2162 | c->convert_unscaled = planarRgb16ToRgb16Wrapper; | 2207 | c->convert_unscaled = planarRgb16ToRgb16Wrapper; |
| 2163 | 2208 | ||
| 2209 | if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth >= 10 && | ||
| 2210 | isPlanarRGB(srcFormat) && !isFloat(srcFormat) && | ||
| 2211 | (dstFormat == AV_PIX_FMT_X2RGB10LE || dstFormat == AV_PIX_FMT_X2BGR10LE)) | ||
| 2212 | c->convert_unscaled = planarRgb16ToRgb16Wrapper; | ||
| 2213 | |||
| 2164 | if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth == 8 && | 2214 | if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth == 8 && |
| 2165 | isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP) | 2215 | isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP) |
| 2166 | c->convert_unscaled = rgbToPlanarRgbWrapper; | 2216 | c->convert_unscaled = rgbToPlanarRgbWrapper; |