summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libswscale/rgb2rgb.c13
-rw-r--r--libswscale/rgb2rgb.h1
-rw-r--r--libswscale/swscale_unscaled.c1
3 files changed, 15 insertions, 0 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index 5b84f89ec5..c6c1ebaaa5 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -282,6 +282,19 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size)
}
}
+void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size)
+{
+ int i;
+ int num_pixels = src_size >> 1;
+
+ for (i = 0; i < num_pixels; i++) {
+ unsigned br;
+ unsigned rgb = ((const uint16_t *)src)[i];
+ br = rgb & 0x0F0F;
+ ((uint16_t *)dst)[i] = (br >> 8) | (rgb & 0x00F0) | (br << 8);
+ }
+}
+
void bgr8torgb8(const uint8_t *src, uint8_t *dst, int src_size)
{
int i;
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index a7542cb211..5d3bbfabe3 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -62,6 +62,7 @@ void rgb15tobgr32(const uint8_t *src, uint8_t *dst, int src_size);
void rgb15to24(const uint8_t *src, uint8_t *dst, int src_size);
void rgb15tobgr16(const uint8_t *src, uint8_t *dst, int src_size);
void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size);
+void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size);
void bgr8torgb8(const uint8_t *src, uint8_t *dst, int src_size);
void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size);
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 748681c0ee..bf79caabcb 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -444,6 +444,7 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t *src[], int srcStride[],
} else if ((isBGRinInt(srcFormat) && isRGBinInt(dstFormat)) ||
(isRGBinInt(srcFormat) && isBGRinInt(dstFormat))) {
switch (srcId | (dstId << 16)) {
+ case 0x000C000C: conv = rgb12tobgr12; break;
case 0x000F000F: conv = rgb15tobgr15; break;
case 0x000F0010: conv = rgb16tobgr15; break;
case 0x000F0018: conv = rgb24tobgr15; break;