History

swscale: add nv12/nv21->yuv420 converter

Michael Niedermayer committed 12 years ago

Commit 90474911 parent eb01a254 files · +52 −0Browse files

Unified · Split

4 files
  1. libswscale/rgb2rgb.c +3 −0
  2. libswscale/rgb2rgb.h +4 −0
  3. libswscale/rgb2rgb_template.c +19 −0
  4. libswscale/swscale_unscaled.c +26 −0
libswscale/rgb2rgb.c+3−0
@@ -82,6 +82,9 @@ void (*planar2x)(const uint8_t *src, uint8_t *dst, int width, int height, · 81 unmodified lines
8282 void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t *dst,
8383 int width, int height, int src1Stride,
8484 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);
8588 void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
8689 uint8_t *dst1, uint8_t *dst2,
8790 int width, int height,
libswscale/rgb2rgb.h+4−0
@@ -129,6 +129,10 @@ extern void (*interleaveBytes)(const uint8_t *src1, const uint8_t *src2, uint8_t · 128 unmodified lines
129129 int width, int height, int src1Stride,
130130 int src2Stride, int dstStride);
131131
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+
132136 extern void (*vu9_to_vu12)(const uint8_t *src1, const uint8_t *src2,
133137 uint8_t *dst1, uint8_t *dst2,
134138 int width, int height,
libswscale/rgb2rgb_template.c+19−0
@@ -708,6 +708,24 @@ static void interleaveBytes_c(const uint8_t *src1, const uint8_t *src2, · 707 unmodified lines
708708 }
709709 }
710710
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+
711729 static inline void vu9_to_vu12_c(const uint8_t *src1, const uint8_t *src2,
712730 uint8_t *dst1, uint8_t *dst2,
713731 int width, int height,
@@ -937,6 +955,7 @@ static av_cold void rgb2rgb_init_c(void) · 223 unmodified lines
937955 planar2x = planar2x_c;
938956 rgb24toyv12 = rgb24toyv12_c;
939957 interleaveBytes = interleaveBytes_c;
958+ deinterleaveBytes = deinterleaveBytes_c;
940959 vu9_to_vu12 = vu9_to_vu12_c;
941960 yvu9_to_yuy2 = yvu9_to_yuy2_c;
942961
libswscale/swscale_unscaled.c+26−0
@@ -155,6 +155,27 @@ static int planarToNv12Wrapper(SwsContext *c, const uint8_t *src[], · 154 unmodified lines
155155 return srcSliceH;
156156 }
157157
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+
158179 static int planarToYuy2Wrapper(SwsContext *c, const uint8_t *src[],
159180 int srcStride[], int srcSliceY, int srcSliceH,
160181 uint8_t *dstParam[], int dstStride[])
@@ -981,6 +1002,11 @@ void ff_get_unscaled_swscale(SwsContext *c) · 820 unmodified lines
9811002 (dstFormat == AV_PIX_FMT_NV12 || dstFormat == AV_PIX_FMT_NV21)) {
9821003 c->swscale = planarToNv12Wrapper;
9831004 }
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+ }
9841010 /* yuv2bgr */
9851011 if ((srcFormat == AV_PIX_FMT_YUV420P || srcFormat == AV_PIX_FMT_YUV422P ||
9861012 srcFormat == AV_PIX_FMT_YUVA420P) && isAnyRGB(dstFormat) &&

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t