From: Michael Niedermayer <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
Signed-off-by: Diego Biurrun <[email protected]>
---
libswscale/rgb2rgb.h | 4 +++
libswscale/rgb2rgb_template.c | 8 ++----
libswscale/x86/rgb2rgb_template.c | 47 +------------------------------------
3 files changed, 8 insertions(+), 51 deletions(-)
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index a8d5531..4dd0d95 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -68,6 +68,10 @@ void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst,
long src_size);
void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, long src_size);
void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, long src_size);
+void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
+ uint8_t *vdst, long width, long height, long lumStride,
+ long chromStride, long srcStride);
+
/**
* Height should be a multiple of 2 and width should be a multiple of 16.
* (If this is a problem for anyone then tell me, and I will fix it.)
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c
index ea39be4..fed7e5e 100644
--- a/libswscale/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c
@@ -633,11 +633,9 @@ static inline void uyvytoyv12_c(const uint8_t *src,
uint8_t *ydst,
* others are ignored in the C version.
* FIXME: Write HQ version.
*/
-static inline void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst,
- uint8_t *udst, uint8_t *vdst,
- long width, long height,
- long lumStride, long chromStride,
- long srcStride)
+void rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst,
+ uint8_t *vdst, long width, long height, long lumStride,
+ long chromStride, long srcStride)
{
long y;
const int chromWidth = width >> 1;
diff --git a/libswscale/x86/rgb2rgb_template.c
b/libswscale/x86/rgb2rgb_template.c
index a083fc8..ce635df 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -1976,52 +1976,7 @@ static inline void RENAME(rgb24toyv12)(const uint8_t
*src, uint8_t *ydst, uint8_
SFENCE" \n\t"
:::"memory");
- for (; y<height; y+=2) {
- long i;
- for (i=0; i<chromWidth; i++) {
- unsigned int b = src[6*i+0];
- unsigned int g = src[6*i+1];
- unsigned int r = src[6*i+2];
-
- unsigned int Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16;
- unsigned int V = ((RV*r + GV*g + BV*b)>>RGB2YUV_SHIFT) + 128;
- unsigned int U = ((RU*r + GU*g + BU*b)>>RGB2YUV_SHIFT) + 128;
-
- udst[i] = U;
- vdst[i] = V;
- ydst[2*i] = Y;
-
- b = src[6*i+3];
- g = src[6*i+4];
- r = src[6*i+5];
-
- Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16;
- ydst[2*i+1] = Y;
- }
- ydst += lumStride;
- src += srcStride;
-
- for (i=0; i<chromWidth; i++) {
- unsigned int b = src[6*i+0];
- unsigned int g = src[6*i+1];
- unsigned int r = src[6*i+2];
-
- unsigned int Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16;
-
- ydst[2*i] = Y;
-
- b = src[6*i+3];
- g = src[6*i+4];
- r = src[6*i+5];
-
- Y = ((RY*r + GY*g + BY*b)>>RGB2YUV_SHIFT) + 16;
- ydst[2*i+1] = Y;
- }
- udst += chromStride;
- vdst += chromStride;
- ydst += lumStride;
- src += srcStride;
- }
+ rgb24toyv12_c(src, ydst, udst, vdst, width, height-y, lumStride,
chromStride, srcStride);
}
static void RENAME(interleaveBytes)(const uint8_t *src1, const uint8_t *src2,
uint8_t *dest,
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
