[FFmpeg-cvslog] swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c on BE

2015-06-22 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue Jun 23 
04:36:02 2015 +0200| [abb833c5681b84d7025c083e2191140eaa30dca7] | committer: 
Michael Niedermayer

swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix 
shuffle_bytes_2103_c on BE

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abb833c5681b84d7025c083e2191140eaa30dca7
---

 libswscale/rgb2rgb.c  |2 +-
 libswscale/rgb2rgb.h  |2 +-
 libswscale/rgb2rgb_template.c |   20 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index 5b1fcf7..340174f 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -51,6 +51,7 @@ void (*rgb16to15)(const uint8_t *src, uint8_t *dst, int 
src_size);
 void (*rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*rgb15to32)(const uint8_t *src, uint8_t *dst, int src_size);
 
+void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size);
 
 void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc,
@@ -333,7 +334,6 @@ void shuffle_bytes_ ## a ## b ## c ## d(const uint8_t *src, 
\
 }   \
 }
 
-DEFINE_SHUFFLE_BYTES(0, 3, 2, 1)
 DEFINE_SHUFFLE_BYTES(1, 2, 3, 0)
 DEFINE_SHUFFLE_BYTES(3, 0, 1, 2)
 DEFINE_SHUFFLE_BYTES(3, 2, 1, 0)
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index 5df5dea..8faebe6 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -50,6 +50,7 @@ extern void(*rgb24to15)(const uint8_t *src, uint8_t *dst, 
int src_size);
 extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
 extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
 
+extern void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int 
src_size);
 extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int 
src_size);
 
 void rgb64tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size);
@@ -71,7 +72,6 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int 
src_size);
 void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size);
 voidrgb12to15(const uint8_t *src, uint8_t *dst, int src_size);
 
-void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, int src_size);
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c
index 70294ae..5b446de 100644
--- a/libswscale/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c
@@ -328,6 +328,20 @@ static inline void shuffle_bytes_2103_c(const uint8_t 
*src, uint8_t *dst,
 }
 }
 
+static inline void shuffle_bytes_0321_c(const uint8_t *src, uint8_t *dst,
+int src_size)
+{
+int idx  = 15  - src_size;
+const uint8_t *s = src - idx;
+uint8_t *d   = dst - idx;
+
+for (; idx < 15; idx += 4) {
+register unsigned v   = *(const uint32_t *)&s[idx], g = v & 0x00ff00ff;
+v&= 0xff00ff00;
+*(uint32_t *)&d[idx]  = (v >> 16) + g + (v << 16);
+}
+}
+
 static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, int 
src_size)
 {
 unsigned i;
@@ -929,7 +943,11 @@ static av_cold void rgb2rgb_init_c(void)
 rgb24to15  = rgb24to15_c;
 rgb24to16  = rgb24to16_c;
 rgb24tobgr24   = rgb24tobgr24_c;
-#if !HAVE_BIGENDIAN
+#if HAVE_BIGENDIAN
+shuffle_bytes_0321 = shuffle_bytes_2103_c;
+shuffle_bytes_2103 = shuffle_bytes_0321_c;
+#else
+shuffle_bytes_0321 = shuffle_bytes_0321_c;
 shuffle_bytes_2103 = shuffle_bytes_2103_c;
 #endif
 rgb32tobgr16   = rgb32tobgr16_c;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c on BE

2015-07-18 Thread Michael Niedermayer 
ffmpeg | branch: release/2.7 | Michael Niedermayer  | Tue Jun 
23 04:36:02 2015 +0200| [2af2c7ecff2c5c5f2bc696149f9584c814d23f73] | committer: 
Michael Niedermayer

swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix 
shuffle_bytes_2103_c on BE

Signed-off-by: Michael Niedermayer 
(cherry picked from commit abb833c5681b84d7025c083e2191140eaa30dca7)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2af2c7ecff2c5c5f2bc696149f9584c814d23f73
---

 libswscale/rgb2rgb.c  |2 +-
 libswscale/rgb2rgb.h  |2 +-
 libswscale/rgb2rgb_template.c |   20 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index 5b1fcf7..340174f 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -51,6 +51,7 @@ void (*rgb16to15)(const uint8_t *src, uint8_t *dst, int 
src_size);
 void (*rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*rgb15to32)(const uint8_t *src, uint8_t *dst, int src_size);
 
+void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size);
 
 void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc,
@@ -333,7 +334,6 @@ void shuffle_bytes_ ## a ## b ## c ## d(const uint8_t *src, 
\
 }   \
 }
 
-DEFINE_SHUFFLE_BYTES(0, 3, 2, 1)
 DEFINE_SHUFFLE_BYTES(1, 2, 3, 0)
 DEFINE_SHUFFLE_BYTES(3, 0, 1, 2)
 DEFINE_SHUFFLE_BYTES(3, 2, 1, 0)
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index 5df5dea..8faebe6 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -50,6 +50,7 @@ extern void(*rgb24to15)(const uint8_t *src, uint8_t *dst, 
int src_size);
 extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
 extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
 
+extern void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int 
src_size);
 extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int 
src_size);
 
 void rgb64tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size);
@@ -71,7 +72,6 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int 
src_size);
 void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size);
 voidrgb12to15(const uint8_t *src, uint8_t *dst, int src_size);
 
-void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, int src_size);
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c
index 70294ae..5b446de 100644
--- a/libswscale/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c
@@ -328,6 +328,20 @@ static inline void shuffle_bytes_2103_c(const uint8_t 
*src, uint8_t *dst,
 }
 }
 
+static inline void shuffle_bytes_0321_c(const uint8_t *src, uint8_t *dst,
+int src_size)
+{
+int idx  = 15  - src_size;
+const uint8_t *s = src - idx;
+uint8_t *d   = dst - idx;
+
+for (; idx < 15; idx += 4) {
+register unsigned v   = *(const uint32_t *)&s[idx], g = v & 0x00ff00ff;
+v&= 0xff00ff00;
+*(uint32_t *)&d[idx]  = (v >> 16) + g + (v << 16);
+}
+}
+
 static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, int 
src_size)
 {
 unsigned i;
@@ -929,7 +943,11 @@ static av_cold void rgb2rgb_init_c(void)
 rgb24to15  = rgb24to15_c;
 rgb24to16  = rgb24to16_c;
 rgb24tobgr24   = rgb24tobgr24_c;
-#if !HAVE_BIGENDIAN
+#if HAVE_BIGENDIAN
+shuffle_bytes_0321 = shuffle_bytes_2103_c;
+shuffle_bytes_2103 = shuffle_bytes_0321_c;
+#else
+shuffle_bytes_0321 = shuffle_bytes_0321_c;
 shuffle_bytes_2103 = shuffle_bytes_2103_c;
 #endif
 rgb32tobgr16   = rgb32tobgr16_c;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c on BE

2015-07-20 Thread Michael Niedermayer 
ffmpeg | branch: release/2.6 | Michael Niedermayer  | Tue Jun 
23 04:36:02 2015 +0200| [12e166dacb544e55dd02b456f8e548be70c0be2e] | committer: 
Michael Niedermayer

swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix 
shuffle_bytes_2103_c on BE

Signed-off-by: Michael Niedermayer 
(cherry picked from commit abb833c5681b84d7025c083e2191140eaa30dca7)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12e166dacb544e55dd02b456f8e548be70c0be2e
---

 libswscale/rgb2rgb.c  |2 +-
 libswscale/rgb2rgb.h  |2 +-
 libswscale/rgb2rgb_template.c |   20 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index 5b1fcf7..340174f 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -51,6 +51,7 @@ void (*rgb16to15)(const uint8_t *src, uint8_t *dst, int 
src_size);
 void (*rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*rgb15to32)(const uint8_t *src, uint8_t *dst, int src_size);
 
+void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size);
 
 void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc,
@@ -333,7 +334,6 @@ void shuffle_bytes_ ## a ## b ## c ## d(const uint8_t *src, 
\
 }   \
 }
 
-DEFINE_SHUFFLE_BYTES(0, 3, 2, 1)
 DEFINE_SHUFFLE_BYTES(1, 2, 3, 0)
 DEFINE_SHUFFLE_BYTES(3, 0, 1, 2)
 DEFINE_SHUFFLE_BYTES(3, 2, 1, 0)
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index 5df5dea..8faebe6 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -50,6 +50,7 @@ extern void(*rgb24to15)(const uint8_t *src, uint8_t *dst, 
int src_size);
 extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
 extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
 
+extern void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int 
src_size);
 extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int 
src_size);
 
 void rgb64tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size);
@@ -71,7 +72,6 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int 
src_size);
 void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size);
 voidrgb12to15(const uint8_t *src, uint8_t *dst, int src_size);
 
-void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, int src_size);
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c
index 70294ae..5b446de 100644
--- a/libswscale/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c
@@ -328,6 +328,20 @@ static inline void shuffle_bytes_2103_c(const uint8_t 
*src, uint8_t *dst,
 }
 }
 
+static inline void shuffle_bytes_0321_c(const uint8_t *src, uint8_t *dst,
+int src_size)
+{
+int idx  = 15  - src_size;
+const uint8_t *s = src - idx;
+uint8_t *d   = dst - idx;
+
+for (; idx < 15; idx += 4) {
+register unsigned v   = *(const uint32_t *)&s[idx], g = v & 0x00ff00ff;
+v&= 0xff00ff00;
+*(uint32_t *)&d[idx]  = (v >> 16) + g + (v << 16);
+}
+}
+
 static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, int 
src_size)
 {
 unsigned i;
@@ -929,7 +943,11 @@ static av_cold void rgb2rgb_init_c(void)
 rgb24to15  = rgb24to15_c;
 rgb24to16  = rgb24to16_c;
 rgb24tobgr24   = rgb24tobgr24_c;
-#if !HAVE_BIGENDIAN
+#if HAVE_BIGENDIAN
+shuffle_bytes_0321 = shuffle_bytes_2103_c;
+shuffle_bytes_2103 = shuffle_bytes_0321_c;
+#else
+shuffle_bytes_0321 = shuffle_bytes_0321_c;
 shuffle_bytes_2103 = shuffle_bytes_2103_c;
 #endif
 rgb32tobgr16   = rgb32tobgr16_c;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c on BE

2015-07-27 Thread Michael Niedermayer 
ffmpeg | branch: release/2.5 | Michael Niedermayer  | Tue Jun 
23 04:36:02 2015 +0200| [17b7262b4f9dca6a69dc35ac236c3407476cb21a] | committer: 
Michael Niedermayer

swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix 
shuffle_bytes_2103_c on BE

Signed-off-by: Michael Niedermayer 
(cherry picked from commit abb833c5681b84d7025c083e2191140eaa30dca7)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17b7262b4f9dca6a69dc35ac236c3407476cb21a
---

 libswscale/rgb2rgb.c  |2 +-
 libswscale/rgb2rgb.h  |2 +-
 libswscale/rgb2rgb_template.c |   20 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index 5b1fcf7..340174f 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -51,6 +51,7 @@ void (*rgb16to15)(const uint8_t *src, uint8_t *dst, int 
src_size);
 void (*rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*rgb15to32)(const uint8_t *src, uint8_t *dst, int src_size);
 
+void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size);
 
 void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc,
@@ -333,7 +334,6 @@ void shuffle_bytes_ ## a ## b ## c ## d(const uint8_t *src, 
\
 }   \
 }
 
-DEFINE_SHUFFLE_BYTES(0, 3, 2, 1)
 DEFINE_SHUFFLE_BYTES(1, 2, 3, 0)
 DEFINE_SHUFFLE_BYTES(3, 0, 1, 2)
 DEFINE_SHUFFLE_BYTES(3, 2, 1, 0)
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index 5df5dea..8faebe6 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -50,6 +50,7 @@ extern void(*rgb24to15)(const uint8_t *src, uint8_t *dst, 
int src_size);
 extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
 extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
 
+extern void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int 
src_size);
 extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int 
src_size);
 
 void rgb64tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size);
@@ -71,7 +72,6 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int 
src_size);
 void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size);
 voidrgb12to15(const uint8_t *src, uint8_t *dst, int src_size);
 
-void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, int src_size);
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c
index 70294ae..5b446de 100644
--- a/libswscale/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c
@@ -328,6 +328,20 @@ static inline void shuffle_bytes_2103_c(const uint8_t 
*src, uint8_t *dst,
 }
 }
 
+static inline void shuffle_bytes_0321_c(const uint8_t *src, uint8_t *dst,
+int src_size)
+{
+int idx  = 15  - src_size;
+const uint8_t *s = src - idx;
+uint8_t *d   = dst - idx;
+
+for (; idx < 15; idx += 4) {
+register unsigned v   = *(const uint32_t *)&s[idx], g = v & 0x00ff00ff;
+v&= 0xff00ff00;
+*(uint32_t *)&d[idx]  = (v >> 16) + g + (v << 16);
+}
+}
+
 static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, int 
src_size)
 {
 unsigned i;
@@ -929,7 +943,11 @@ static av_cold void rgb2rgb_init_c(void)
 rgb24to15  = rgb24to15_c;
 rgb24to16  = rgb24to16_c;
 rgb24tobgr24   = rgb24tobgr24_c;
-#if !HAVE_BIGENDIAN
+#if HAVE_BIGENDIAN
+shuffle_bytes_0321 = shuffle_bytes_2103_c;
+shuffle_bytes_2103 = shuffle_bytes_0321_c;
+#else
+shuffle_bytes_0321 = shuffle_bytes_0321_c;
 shuffle_bytes_2103 = shuffle_bytes_2103_c;
 #endif
 rgb32tobgr16   = rgb32tobgr16_c;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c on BE

2015-08-20 Thread Michael Niedermayer 
ffmpeg | branch: release/2.4 | Michael Niedermayer  | Tue Jun 
23 04:36:02 2015 +0200| [2f1bff16900067e5c477f725fe9280721e8ab755] | committer: 
Michael Niedermayer

swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix 
shuffle_bytes_2103_c on BE

Signed-off-by: Michael Niedermayer 
(cherry picked from commit abb833c5681b84d7025c083e2191140eaa30dca7)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2f1bff16900067e5c477f725fe9280721e8ab755
---

 libswscale/rgb2rgb.c  |2 +-
 libswscale/rgb2rgb.h  |2 +-
 libswscale/rgb2rgb_template.c |   20 +++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c
index 5b1fcf7..340174f 100644
--- a/libswscale/rgb2rgb.c
+++ b/libswscale/rgb2rgb.c
@@ -51,6 +51,7 @@ void (*rgb16to15)(const uint8_t *src, uint8_t *dst, int 
src_size);
 void (*rgb15to16)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*rgb15to32)(const uint8_t *src, uint8_t *dst, int src_size);
 
+void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int src_size);
 void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size);
 
 void (*yv12toyuy2)(const uint8_t *ysrc, const uint8_t *usrc,
@@ -333,7 +334,6 @@ void shuffle_bytes_ ## a ## b ## c ## d(const uint8_t *src, 
\
 }   \
 }
 
-DEFINE_SHUFFLE_BYTES(0, 3, 2, 1)
 DEFINE_SHUFFLE_BYTES(1, 2, 3, 0)
 DEFINE_SHUFFLE_BYTES(3, 0, 1, 2)
 DEFINE_SHUFFLE_BYTES(3, 2, 1, 0)
diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h
index 5df5dea..8faebe6 100644
--- a/libswscale/rgb2rgb.h
+++ b/libswscale/rgb2rgb.h
@@ -50,6 +50,7 @@ extern void(*rgb24to15)(const uint8_t *src, uint8_t *dst, 
int src_size);
 extern void (*rgb32tobgr16)(const uint8_t *src, uint8_t *dst, int src_size);
 extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size);
 
+extern void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int 
src_size);
 extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int 
src_size);
 
 void rgb64tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size);
@@ -71,7 +72,6 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int 
src_size);
 void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size);
 voidrgb12to15(const uint8_t *src, uint8_t *dst, int src_size);
 
-void shuffle_bytes_0321(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_1230(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, int src_size);
 void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, int src_size);
diff --git a/libswscale/rgb2rgb_template.c b/libswscale/rgb2rgb_template.c
index 70294ae..5b446de 100644
--- a/libswscale/rgb2rgb_template.c
+++ b/libswscale/rgb2rgb_template.c
@@ -328,6 +328,20 @@ static inline void shuffle_bytes_2103_c(const uint8_t 
*src, uint8_t *dst,
 }
 }
 
+static inline void shuffle_bytes_0321_c(const uint8_t *src, uint8_t *dst,
+int src_size)
+{
+int idx  = 15  - src_size;
+const uint8_t *s = src - idx;
+uint8_t *d   = dst - idx;
+
+for (; idx < 15; idx += 4) {
+register unsigned v   = *(const uint32_t *)&s[idx], g = v & 0x00ff00ff;
+v&= 0xff00ff00;
+*(uint32_t *)&d[idx]  = (v >> 16) + g + (v << 16);
+}
+}
+
 static inline void rgb24tobgr24_c(const uint8_t *src, uint8_t *dst, int 
src_size)
 {
 unsigned i;
@@ -929,7 +943,11 @@ static av_cold void rgb2rgb_init_c(void)
 rgb24to15  = rgb24to15_c;
 rgb24to16  = rgb24to16_c;
 rgb24tobgr24   = rgb24tobgr24_c;
-#if !HAVE_BIGENDIAN
+#if HAVE_BIGENDIAN
+shuffle_bytes_0321 = shuffle_bytes_2103_c;
+shuffle_bytes_2103 = shuffle_bytes_0321_c;
+#else
+shuffle_bytes_0321 = shuffle_bytes_0321_c;
 shuffle_bytes_2103 = shuffle_bytes_2103_c;
 #endif
 rgb32tobgr16   = rgb32tobgr16_c;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog