[FFmpeg-cvslog] swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices

2016-09-28 Thread Michael Niedermayer 
ffmpeg | branch: release/3.0 | Michael Niedermayer  | 
Sat Sep  3 12:15:24 2016 +0200| [cb8a29f872909aa88f34b1b9b8e4a355af889ee6] | 
committer: Michael Niedermayer

swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices

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

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

 libswscale/swscale_unscaled.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 9662a10..b2d1401 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -558,6 +558,8 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const 
uint8_t *src[],
 int bpc = dst_format->comp[0].depth;
 int alpha = src_format->flags & AV_PIX_FMT_FLAG_ALPHA;
 int swap = 0;
+int i;
+
 if ( HAVE_BIGENDIAN && !(src_format->flags & AV_PIX_FMT_FLAG_BE) ||
 !HAVE_BIGENDIAN &&   src_format->flags & AV_PIX_FMT_FLAG_BE)
 swap++;
@@ -571,6 +573,12 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const 
uint8_t *src[],
src_format->name, dst_format->name);
 return srcSliceH;
 }
+
+for(i=0; i<4; i++) {
+dst2013[i] += stride2013[i] * srcSliceY / 2;
+dst1023[i] += stride1023[i] * srcSliceY / 2;
+}
+
 switch (c->srcFormat) {
 case AV_PIX_FMT_RGB48LE:
 case AV_PIX_FMT_RGB48BE:

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

[FFmpeg-cvslog] swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices

2016-09-28 Thread Michael Niedermayer 
ffmpeg | branch: release/3.1 | Michael Niedermayer  | 
Sat Sep  3 12:15:24 2016 +0200| [e91b7852dfae807b1996c30ec77e5bd7eb3a01a1] | 
committer: Michael Niedermayer

swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices

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

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

 libswscale/swscale_unscaled.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 8df0694..1f99462 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -558,6 +558,8 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const 
uint8_t *src[],
 int bpc = dst_format->comp[0].depth;
 int alpha = src_format->flags & AV_PIX_FMT_FLAG_ALPHA;
 int swap = 0;
+int i;
+
 if ( HAVE_BIGENDIAN && !(src_format->flags & AV_PIX_FMT_FLAG_BE) ||
 !HAVE_BIGENDIAN &&   src_format->flags & AV_PIX_FMT_FLAG_BE)
 swap++;
@@ -571,6 +573,12 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const 
uint8_t *src[],
src_format->name, dst_format->name);
 return srcSliceH;
 }
+
+for(i=0; i<4; i++) {
+dst2013[i] += stride2013[i] * srcSliceY / 2;
+dst1023[i] += stride1023[i] * srcSliceY / 2;
+}
+
 switch (c->srcFormat) {
 case AV_PIX_FMT_RGB48LE:
 case AV_PIX_FMT_RGB48BE:

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

[FFmpeg-cvslog] swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices

2016-09-17 Thread Michael Niedermayer 
ffmpeg | branch: release/2.8 | Michael Niedermayer  | 
Sat Sep  3 12:15:24 2016 +0200| [48c51b796a4c067a13141193cee008e8618ada56] | 
committer: Michael Niedermayer

swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices

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

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

 libswscale/swscale_unscaled.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 3deb72f..0605704 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -558,6 +558,8 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const 
uint8_t *src[],
 int bpc = dst_format->comp[0].depth_minus1 + 1;
 int alpha = src_format->flags & AV_PIX_FMT_FLAG_ALPHA;
 int swap = 0;
+int i;
+
 if ( HAVE_BIGENDIAN && !(src_format->flags & AV_PIX_FMT_FLAG_BE) ||
 !HAVE_BIGENDIAN &&   src_format->flags & AV_PIX_FMT_FLAG_BE)
 swap++;
@@ -571,6 +573,12 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const 
uint8_t *src[],
src_format->name, dst_format->name);
 return srcSliceH;
 }
+
+for(i=0; i<4; i++) {
+dst2013[i] += stride2013[i] * srcSliceY / 2;
+dst1023[i] += stride1023[i] * srcSliceY / 2;
+}
+
 switch (c->srcFormat) {
 case AV_PIX_FMT_RGB48LE:
 case AV_PIX_FMT_RGB48BE:

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

[FFmpeg-cvslog] swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices

2016-09-03 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Sep  3 12:15:24 2016 +0200| [e57d99dd4e0d8fe2992da0d65b563580e35ce728] | 
committer: Michael Niedermayer

swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices

Signed-off-by: Michael Niedermayer 

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

 libswscale/swscale_unscaled.c | 8 
 1 file changed, 8 insertions(+)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index ca7374a..b5f8a39 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -597,6 +597,8 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const 
uint8_t *src[],
 int bpc = dst_format->comp[0].depth;
 int alpha = src_format->flags & AV_PIX_FMT_FLAG_ALPHA;
 int swap = 0;
+int i;
+
 if ( HAVE_BIGENDIAN && !(src_format->flags & AV_PIX_FMT_FLAG_BE) ||
 !HAVE_BIGENDIAN &&   src_format->flags & AV_PIX_FMT_FLAG_BE)
 swap++;
@@ -610,6 +612,12 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const 
uint8_t *src[],
src_format->name, dst_format->name);
 return srcSliceH;
 }
+
+for(i=0; i<4; i++) {
+dst2013[i] += stride2013[i] * srcSliceY / 2;
+dst1023[i] += stride1023[i] * srcSliceY / 2;
+}
+
 switch (c->srcFormat) {
 case AV_PIX_FMT_RGB48LE:
 case AV_PIX_FMT_RGB48BE:

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