Unified · Split
| @@ -82,6 +82,9 @@ void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height, · 81 unmodified lines | ||
| 82 | 82 | void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst, |
| 83 | 83 | int width, int height, int src1Stride, |
| 84 | 84 | int src2Stride, int dstStride); |
| 85 | +void (*deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2, | |
| 86 | + int width, int height, int srcStride, | |
| 87 | + int dst1Stride, int dst2Stride); | |
| 85 | 88 | void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2, |
| 86 | 89 | uint8_t *dst1, uint8_t *dst2, |
| 87 | 90 | int width, int height, |
| @@ -129,6 +129,10 @@ extern void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t · 128 unmodified lines | ||
| 129 | 129 | int width, int height, int src1Stride, |
| 130 | 130 | int src2Stride, int dstStride); |
| 131 | 131 | |
| 132 | +extern void (*deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2, | |
| 133 | + int width, int height, int srcStride, | |
| 134 | + int dst1Stride, int dst2Stride); | |
| 135 | + | |
| 132 | 136 | extern void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2, |
| 133 | 137 | uint8_t *dst1, uint8_t *dst2, |
| 134 | 138 | int width, int height, |
| @@ -708,6 +708,24 @@ static void interleaveBytes_c(const uint8_t *src1, const uint8_t *src2, · 707 unmodified lines | ||
| 708 | 708 | } |
| 709 | 709 | } |
| 710 | 710 | |
| 711 | +static void deinterleaveBytes_c(const uint8_t *src, uint8_t *dst1, uint8_t *dst2, | |
| 712 | + int width, int height, int srcStride, | |
| 713 | + int dst1Stride, int dst2Stride) | |
| 714 | +{ | |
| 715 | + int h; | |
| 716 | + | |
| 717 | + for (h = 0; h < height; h++) { | |
| 718 | + int w; | |
| 719 | + for (w = 0; w < width; w++) { | |
| 720 | + dst1[w] = src[2 * w + 0]; | |
| 721 | + dst2[w] = src[2 * w + 1]; | |
| 722 | + } | |
| 723 | + src += srcStride; | |
| 724 | + dst1 += dst1Stride; | |
| 725 | + dst2 += dst2Stride; | |
| 726 | + } | |
| 727 | +} | |
| 728 | + | |
| 711 | 729 | static inline void vu9_to_vu12_c(const uint8_t *src1, const uint8_t *src2, |
| 712 | 730 | uint8_t *dst1, uint8_t *dst2, |
| 713 | 731 | int width, int height, |
| @@ -937,6 +955,7 @@ static av_cold void rgb2rgb_init_c(void) · 223 unmodified lines | ||
| 937 | 955 | planar2x = planar2x_c; |
| 938 | 956 | rgb24toyv12 = rgb24toyv12_c; |
| 939 | 957 | interleaveBytes = interleaveBytes_c; |
| 958 | + deinterleaveBytes = deinterleaveBytes_c; | |
| 940 | 959 | vu9_to_vu12 = vu9_to_vu12_c; |
| 941 | 960 | yvu9_to_yuy2 = yvu9_to_yuy2_c; |
| 942 | 961 | |
| @@ -155,6 +155,27 @@ static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[], · 154 unmodified lines | ||
| 155 | 155 | return srcSliceH; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | +static int nv12ToPlanarWrapper(SwsContext *c, const uint8_t *src[], | |
| 159 | + int srcStride[], int srcSliceY, | |
| 160 | + int srcSliceH, uint8_t *dstParam[], | |
| 161 | + int dstStride[]) | |
| 162 | +{ | |
| 163 | + uint8_t *dst1 = dstParam[1] + dstStride[1] * srcSliceY / 2; | |
| 164 | + uint8_t *dst2 = dstParam[2] + dstStride[2] * srcSliceY / 2; | |
| 165 | + | |
| 166 | + copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW, | |
| 167 | + dstParam[0], dstStride[0]); | |
| 168 | + | |
| 169 | + if (c->srcFormat == AV_PIX_FMT_NV12) | |
| 170 | + deinterleaveBytes(src[1], dst1, dst2,c->srcW / 2, srcSliceH / 2, | |
| 171 | + srcStride[1], dstStride[1], dstStride[2]); | |
| 172 | + else | |
| 173 | + deinterleaveBytes(src[1], dst2, dst1, c->srcW / 2, srcSliceH / 2, | |
| 174 | + srcStride[1], dstStride[2], dstStride[1]); | |
| 175 | + | |
| 176 | + return srcSliceH; | |
| 177 | +} | |
| 178 | + | |
| 158 | 179 | static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *src[], |
| 159 | 180 | int srcStride[], int srcSliceY, int srcSliceH, |
| 160 | 181 | uint8_t *dstParam[], int dstStride[]) |
| @@ -981,6 +1002,11 @@ void ff_get_unscaled_swscale(SwsContext *c) · 820 unmodified lines | ||
| 981 | 1002 | (dstFormat == AV_PIX_FMT_NV12 || dstFormat == AV_PIX_FMT_NV21)) { |
| 982 | 1003 | c->swscale = planarToNv12Wrapper; |
| 983 | 1004 | } |
| 1005 | + /* nv12_to_yv12 */ | |
| 1006 | + if (dstFormat == AV_PIX_FMT_YUV420P && | |
| 1007 | + (srcFormat == AV_PIX_FMT_NV12 || srcFormat == AV_PIX_FMT_NV21)) { | |
| 1008 | + c->swscale = nv12ToPlanarWrapper; | |
| 1009 | + } | |
| 984 | 1010 | /* yuv2bgr */ |
| 985 | 1011 | if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUV422P || |
| 986 | 1012 | srcFormat == AV_PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) && |