August 2015 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/movtextdec: Free ftab_temp
by git＠videolan.org 01 Sep '15

01 Sep '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Aug 31 23:43:43 2015 +0200| [a047ccbb9fad2c33db7ebc40b95e34ea6ee89c21] | committer: Michael Niedermayer avcodec/movtextdec: Free ftab_temp Fixes memleak Fixes: efe937780e95574250dabe07151bdc23/unknown_unknown_351_849_cov_3187578556_shellymanne.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a047ccbb9fad2c33d… --- libavcodec/movtextdec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index bdef856..257d598 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -121,6 +121,9 @@ static void mov_text_cleanup(MovTextContext *m) static void mov_text_cleanup_ftab(MovTextContext *m) { int i; + if (m->ftab_temp) + av_freep(&m->ftab_temp->font); + av_freep(&m->ftab_temp); if (m->ftab) { for(i = 0; i < m->count_f; i++) { av_freep(&m->ftab[i]->font); @@ -210,7 +213,7 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) m->ftab_entries = 0; return -1; } - m->ftab_temp = av_malloc(sizeof(*m->ftab_temp)); + m->ftab_temp = av_mallocz(sizeof(*m->ftab_temp)); if (!m->ftab_temp) { mov_text_cleanup_ftab(m); return AVERROR(ENOMEM); @@ -237,6 +240,7 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) mov_text_cleanup_ftab(m); return AVERROR(ENOMEM); } + m->ftab_temp = NULL; tx3g_ptr = tx3g_ptr + font_length; } for (i = 0; i < m->ftab_entries; i++) {

1 0

avcodec/movtextdec: Make tx3g_ptr unsigned
by git＠videolan.org 01 Sep '15

01 Sep '15

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Aug 31 23:01:23 2015 +0200| [a1a32fdb0ee63783d06c63b7d90bb382eea356ce] | committer: Michael Niedermayer avcodec/movtextdec: Make tx3g_ptr unsigned Fixes integer overflow Fixes: efe937780e95574250dabe07151bdc23/unknown_unknown_351_849_cov_3187578556_shellymanne.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1a32fdb0ee63783d… --- libavcodec/movtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 8f1015a..bdef856 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -132,7 +132,7 @@ static void mov_text_cleanup_ftab(MovTextContext *m) static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) { - char *tx3g_ptr = avctx->extradata; + uint8_t *tx3g_ptr = avctx->extradata; int i, box_size, font_length; int8_t v_align, h_align; int style_fontID;

1 0

tests: Renamed pix_fmts wording in ffv1 test target name to match pix_fmt parameter.
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Peter B <pb(a)das-werkstatt.com> | Mon Aug 31 03:02:36 2015 +0200| [baeb8f5f7149a5287f015f145eeb3ab18e2bc43c] | committer: Michael Niedermayer tests: Renamed pix_fmts wording in ffv1 test target name to match pix_fmt parameter. Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=baeb8f5f7149a5287… --- tests/fate/vcodec.mak | 20 +++++++++++--------- tests/ref/vsynth/vsynth1-ffv1-v0 | 4 ++++ tests/ref/vsynth/vsynth1-ffv1-v3-bgr0 | 4 ++++ tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p | 4 ++++ tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10 | 4 ++++ tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16 | 4 ++++ tests/ref/vsynth/vsynth1-ffv1.0 | 4 ---- tests/ref/vsynth/vsynth1-ffv1.3-420 | 4 ---- tests/ref/vsynth/vsynth1-ffv1.3-422p10 | 4 ---- tests/ref/vsynth/vsynth1-ffv1.3-444p16 | 4 ---- tests/ref/vsynth/vsynth1-ffv1.3-bgr | 4 ---- tests/ref/vsynth/vsynth2-ffv1-v0 | 4 ++++ tests/ref/vsynth/vsynth2-ffv1-v3-bgr0 | 4 ++++ tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p | 4 ++++ tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10 | 4 ++++ tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16 | 4 ++++ tests/ref/vsynth/vsynth2-ffv1.0 | 4 ---- tests/ref/vsynth/vsynth2-ffv1.3-420 | 4 ---- tests/ref/vsynth/vsynth2-ffv1.3-422p10 | 4 ---- tests/ref/vsynth/vsynth2-ffv1.3-444p16 | 4 ---- tests/ref/vsynth/vsynth2-ffv1.3-bgr | 4 ---- tests/ref/vsynth/vsynth3-ffv1-v0 | 4 ++++ tests/ref/vsynth/vsynth3-ffv1-v3-bgr0 | 4 ++++ tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p | 4 ++++ tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10 | 4 ++++ tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16 | 4 ++++ tests/ref/vsynth/vsynth3-ffv1.0 | 4 ---- tests/ref/vsynth/vsynth3-ffv1.3-420 | 4 ---- tests/ref/vsynth/vsynth3-ffv1.3-422p10 | 4 ---- tests/ref/vsynth/vsynth3-ffv1.3-444p16 | 4 ---- tests/ref/vsynth/vsynth3-ffv1.3-bgr | 4 ---- .../{vsynth_lena-ffv1.0 => vsynth_lena-ffv1-v0} | 6 +++--- ...th_lena-ffv1.3-bgr => vsynth_lena-ffv1-v3-bgr0} | 6 +++--- ..._lena-ffv1.3-420 => vsynth_lena-ffv1-v3-yuv420} | 6 +++--- tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p | 4 ++++ ...ffv1.3-422p10 => vsynth_lena-ffv1-v3-yuv422p10} | 6 +++--- ...ffv1.3-444p16 => vsynth_lena-ffv1-v3-yuv444p16} | 6 +++--- 37 files changed, 90 insertions(+), 84 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index d4d0df5..310352e 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -68,19 +68,21 @@ fate-vsynth%-dv-50: ENCOPTS = -dct int -s pal -pix_fmt yuv422p \ fate-vsynth%-dv-50: DECOPTS = -sws_flags neighbor fate-vsynth%-dv-50: FMT = dv -FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 ffv1.0 ffv1.3-420 ffv1.3-422p10 ffv1.3-444p16 ffv1.3-bgr +FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 ffv1-v0 \ + ffv1-v3-yuv420p ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \ + ffv1-v3-bgr0 fate-vsynth%-ffv1: ENCOPTS = -slices 4 -fate-vsynth%-ffv1.0: CODEC = ffv1 -fate-vsynth%-ffv1.3-420: ENCOPTS = -vcodec ffv1 -level 3 -pix_fmt yuv420p -fate-vsynth%-ffv1.3-422p10: ENCOPTS = -vcodec ffv1 -level 3 -pix_fmt yuv422p10 \ +fate-vsynth%-ffv1-v0: CODEC = ffv1 +fate-vsynth%-ffv1-v3-yuv420p: ENCOPTS = -level 3 -pix_fmt yuv420p +fate-vsynth%-ffv1-v3-yuv422p10: ENCOPTS = -level 3 -pix_fmt yuv422p10 \ -sws_flags neighbor+bitexact -fate-vsynth%-ffv1.3-422p10: DECOPTS = -sws_flags neighbor+bitexact -fate-vsynth%-ffv1.3-444p16: ENCOPTS = -vcodec ffv1 -level 3 -pix_fmt yuv444p16 \ +fate-vsynth%-ffv1-v3-yuv422p10: DECOPTS = -sws_flags neighbor+bitexact +fate-vsynth%-ffv1-v3-yuv444p16: ENCOPTS = -level 3 -pix_fmt yuv444p16 \ -sws_flags neighbor+bitexact -fate-vsynth%-ffv1.3-444p16: DECOPTS = -sws_flags neighbor+bitexact -fate-vsynth%-ffv1.3-bgr: ENCOPTS = -vcodec ffv1 -level 3 -pix_fmt bgr0 \ +fate-vsynth%-ffv1-v3-yuv444p16: DECOPTS = -sws_flags neighbor+bitexact +fate-vsynth%-ffv1-v3-bgr0: ENCOPTS = -level 3 -pix_fmt bgr0 \ -sws_flags neighbor+bitexact -fate-vsynth%-ffv1.3-bgr: DECOPTS = -sws_flags neighbor+bitexact +fate-vsynth%-ffv1-v3-bgr0: DECOPTS = -sws_flags neighbor+bitexact FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16 fate-vsynth%-ffvhuff444: ENCOPTS = -vcodec ffvhuff -pix_fmt yuv444p diff --git a/tests/ref/vsynth/vsynth1-ffv1-v0 b/tests/ref/vsynth/vsynth1-ffv1-v0 new file mode 100644 index 0000000..8c722e4 --- /dev/null +++ b/tests/ref/vsynth/vsynth1-ffv1-v0 @@ -0,0 +1,4 @@ +36011c9a2b288fb04bf6c520371646d4 *tests/data/fate/vsynth1-ffv1-v0.avi +2655368 tests/data/fate/vsynth1-ffv1-v0.avi +c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1-v0.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0 b/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0 new file mode 100644 index 0000000..3808f49 --- /dev/null +++ b/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0 @@ -0,0 +1,4 @@ +3c68357b239479fc26656f6dd76b0b58 *tests/data/fate/vsynth1-ffv1-v3-bgr0.avi +6883176 tests/data/fate/vsynth1-ffv1-v3-bgr0.avi +49c03ab1b73b7cd3cabc3c77a9479c9e *tests/data/fate/vsynth1-ffv1-v3-bgr0.out.rawvideo +stddev: 3.16 PSNR: 38.12 MAXDIFF: 50 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p new file mode 100644 index 0000000..a4af95b --- /dev/null +++ b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p @@ -0,0 +1,4 @@ +26b1296a0ef80a3b5c8b63cc57c52bc2 *tests/data/fate/vsynth1-ffv1-v3-yuv420p.avi +2691268 tests/data/fate/vsynth1-ffv1-v3-yuv420p.avi +c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1-v3-yuv420p.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10 b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10 new file mode 100644 index 0000000..d56cf27 --- /dev/null +++ b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10 @@ -0,0 +1,4 @@ +aa8c5630213381c7b2afdec4a91405ed *tests/data/fate/vsynth1-ffv1-v3-yuv422p10.avi +2845574 tests/data/fate/vsynth1-ffv1-v3-yuv422p10.avi +c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1-v3-yuv422p10.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16 b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16 new file mode 100644 index 0000000..5d919ea --- /dev/null +++ b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16 @@ -0,0 +1,4 @@ +f6b6943455d8b2c3010ff898df5dc9db *tests/data/fate/vsynth1-ffv1-v3-yuv444p16.avi +5357816 tests/data/fate/vsynth1-ffv1-v3-yuv444p16.avi +c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1-v3-yuv444p16.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-ffv1.0 b/tests/ref/vsynth/vsynth1-ffv1.0 deleted file mode 100644 index 0905303..0000000 --- a/tests/ref/vsynth/vsynth1-ffv1.0 +++ /dev/null @@ -1,4 +0,0 @@ -36011c9a2b288fb04bf6c520371646d4 *tests/data/fate/vsynth1-ffv1.0.avi -2655368 tests/data/fate/vsynth1-ffv1.0.avi -c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1.0.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-ffv1.3-420 b/tests/ref/vsynth/vsynth1-ffv1.3-420 deleted file mode 100644 index 08c5764..0000000 --- a/tests/ref/vsynth/vsynth1-ffv1.3-420 +++ /dev/null @@ -1,4 +0,0 @@ -26b1296a0ef80a3b5c8b63cc57c52bc2 *tests/data/fate/vsynth1-ffv1.3-420.avi -2691268 tests/data/fate/vsynth1-ffv1.3-420.avi -c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1.3-420.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-ffv1.3-422p10 b/tests/ref/vsynth/vsynth1-ffv1.3-422p10 deleted file mode 100644 index eecef94..0000000 --- a/tests/ref/vsynth/vsynth1-ffv1.3-422p10 +++ /dev/null @@ -1,4 +0,0 @@ -aa8c5630213381c7b2afdec4a91405ed *tests/data/fate/vsynth1-ffv1.3-422p10.avi -2845574 tests/data/fate/vsynth1-ffv1.3-422p10.avi -c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1.3-422p10.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-ffv1.3-444p16 b/tests/ref/vsynth/vsynth1-ffv1.3-444p16 deleted file mode 100644 index 9f6ecba..0000000 --- a/tests/ref/vsynth/vsynth1-ffv1.3-444p16 +++ /dev/null @@ -1,4 +0,0 @@ -f6b6943455d8b2c3010ff898df5dc9db *tests/data/fate/vsynth1-ffv1.3-444p16.avi -5357816 tests/data/fate/vsynth1-ffv1.3-444p16.avi -c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1.3-444p16.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-ffv1.3-bgr b/tests/ref/vsynth/vsynth1-ffv1.3-bgr deleted file mode 100644 index d76fe9e..0000000 --- a/tests/ref/vsynth/vsynth1-ffv1.3-bgr +++ /dev/null @@ -1,4 +0,0 @@ -3c68357b239479fc26656f6dd76b0b58 *tests/data/fate/vsynth1-ffv1.3-bgr.avi -6883176 tests/data/fate/vsynth1-ffv1.3-bgr.avi -49c03ab1b73b7cd3cabc3c77a9479c9e *tests/data/fate/vsynth1-ffv1.3-bgr.out.rawvideo -stddev: 3.16 PSNR: 38.12 MAXDIFF: 50 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1-v0 b/tests/ref/vsynth/vsynth2-ffv1-v0 new file mode 100644 index 0000000..e1e71f1 --- /dev/null +++ b/tests/ref/vsynth/vsynth2-ffv1-v0 @@ -0,0 +1,4 @@ +9647e906f0739ed84303bd03d1cb8105 *tests/data/fate/vsynth2-ffv1-v0.avi +3692542 tests/data/fate/vsynth2-ffv1-v0.avi +36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1-v0.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0 b/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0 new file mode 100644 index 0000000..11f516b --- /dev/null +++ b/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0 @@ -0,0 +1,4 @@ +4e8ea4c31ddb7703638989c6251e37fe *tests/data/fate/vsynth2-ffv1-v3-bgr0.avi +6386312 tests/data/fate/vsynth2-ffv1-v3-bgr0.avi +835a86f8dff88917c3e5f2776954c5b7 *tests/data/fate/vsynth2-ffv1-v3-bgr0.out.rawvideo +stddev: 1.57 PSNR: 44.18 MAXDIFF: 20 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p new file mode 100644 index 0000000..5d85ffc --- /dev/null +++ b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p @@ -0,0 +1,4 @@ +6d7b6352f49e21153bb891df411e60ec *tests/data/fate/vsynth2-ffv1-v3-yuv420p.avi +3718026 tests/data/fate/vsynth2-ffv1-v3-yuv420p.avi +36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1-v3-yuv420p.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10 b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10 new file mode 100644 index 0000000..b1a6c19 --- /dev/null +++ b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10 @@ -0,0 +1,4 @@ +b43b20163948e44a6c806714e69ac3bf *tests/data/fate/vsynth2-ffv1-v3-yuv422p10.avi +4069370 tests/data/fate/vsynth2-ffv1-v3-yuv422p10.avi +36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1-v3-yuv422p10.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16 b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16 new file mode 100644 index 0000000..4d0a0c2 --- /dev/null +++ b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16 @@ -0,0 +1,4 @@ +ae0bad7ece3ceacc9554f342ab489a4d *tests/data/fate/vsynth2-ffv1-v3-yuv444p16.avi +5086918 tests/data/fate/vsynth2-ffv1-v3-yuv444p16.avi +36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1-v3-yuv444p16.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1.0 b/tests/ref/vsynth/vsynth2-ffv1.0 deleted file mode 100644 index 117fe27..0000000 --- a/tests/ref/vsynth/vsynth2-ffv1.0 +++ /dev/null @@ -1,4 +0,0 @@ -9647e906f0739ed84303bd03d1cb8105 *tests/data/fate/vsynth2-ffv1.0.avi -3692542 tests/data/fate/vsynth2-ffv1.0.avi -36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1.0.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1.3-420 b/tests/ref/vsynth/vsynth2-ffv1.3-420 deleted file mode 100644 index 9490778..0000000 --- a/tests/ref/vsynth/vsynth2-ffv1.3-420 +++ /dev/null @@ -1,4 +0,0 @@ -6d7b6352f49e21153bb891df411e60ec *tests/data/fate/vsynth2-ffv1.3-420.avi -3718026 tests/data/fate/vsynth2-ffv1.3-420.avi -36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1.3-420.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1.3-422p10 b/tests/ref/vsynth/vsynth2-ffv1.3-422p10 deleted file mode 100644 index 0e3f342..0000000 --- a/tests/ref/vsynth/vsynth2-ffv1.3-422p10 +++ /dev/null @@ -1,4 +0,0 @@ -b43b20163948e44a6c806714e69ac3bf *tests/data/fate/vsynth2-ffv1.3-422p10.avi -4069370 tests/data/fate/vsynth2-ffv1.3-422p10.avi -36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1.3-422p10.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1.3-444p16 b/tests/ref/vsynth/vsynth2-ffv1.3-444p16 deleted file mode 100644 index f3578cc..0000000 --- a/tests/ref/vsynth/vsynth2-ffv1.3-444p16 +++ /dev/null @@ -1,4 +0,0 @@ -ae0bad7ece3ceacc9554f342ab489a4d *tests/data/fate/vsynth2-ffv1.3-444p16.avi -5086918 tests/data/fate/vsynth2-ffv1.3-444p16.avi -36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1.3-444p16.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1.3-bgr b/tests/ref/vsynth/vsynth2-ffv1.3-bgr deleted file mode 100644 index 3684bd4..0000000 --- a/tests/ref/vsynth/vsynth2-ffv1.3-bgr +++ /dev/null @@ -1,4 +0,0 @@ -4e8ea4c31ddb7703638989c6251e37fe *tests/data/fate/vsynth2-ffv1.3-bgr.avi -6386312 tests/data/fate/vsynth2-ffv1.3-bgr.avi -835a86f8dff88917c3e5f2776954c5b7 *tests/data/fate/vsynth2-ffv1.3-bgr.out.rawvideo -stddev: 1.57 PSNR: 44.18 MAXDIFF: 20 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-ffv1-v0 b/tests/ref/vsynth/vsynth3-ffv1-v0 new file mode 100644 index 0000000..967a022 --- /dev/null +++ b/tests/ref/vsynth/vsynth3-ffv1-v0 @@ -0,0 +1,4 @@ +91ddf7723476e2b084253ffca69f382e *tests/data/fate/vsynth3-ffv1-v0.avi +52256 tests/data/fate/vsynth3-ffv1-v0.avi +a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1-v0.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0 b/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0 new file mode 100644 index 0000000..2adffed --- /dev/null +++ b/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0 @@ -0,0 +1,4 @@ +bdb5f694222e91bb7cb7264d2d5d419b *tests/data/fate/vsynth3-ffv1-v3-bgr0.avi +112780 tests/data/fate/vsynth3-ffv1-v3-bgr0.avi +5d031d2e891b13593b8cd79e63d083b4 *tests/data/fate/vsynth3-ffv1-v3-bgr0.out.rawvideo +stddev: 3.23 PSNR: 37.92 MAXDIFF: 50 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p new file mode 100644 index 0000000..38fb24a --- /dev/null +++ b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p @@ -0,0 +1,4 @@ +f969ca8542c8384c27233f362b661f8a *tests/data/fate/vsynth3-ffv1-v3-yuv420p.avi +62194 tests/data/fate/vsynth3-ffv1-v3-yuv420p.avi +a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1-v3-yuv420p.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10 b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10 new file mode 100644 index 0000000..d86c9c9 --- /dev/null +++ b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10 @@ -0,0 +1,4 @@ +4fc113caac00ada68e19639ae6f7bc47 *tests/data/fate/vsynth3-ffv1-v3-yuv422p10.avi +63840 tests/data/fate/vsynth3-ffv1-v3-yuv422p10.avi +a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1-v3-yuv422p10.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16 b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16 new file mode 100644 index 0000000..5d61f11 --- /dev/null +++ b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16 @@ -0,0 +1,4 @@ +1e8981cec92407938b25cd82381d1c64 *tests/data/fate/vsynth3-ffv1-v3-yuv444p16.avi +82908 tests/data/fate/vsynth3-ffv1-v3-yuv444p16.avi +a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1-v3-yuv444p16.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-ffv1.0 b/tests/ref/vsynth/vsynth3-ffv1.0 deleted file mode 100644 index 7abc1f0..0000000 --- a/tests/ref/vsynth/vsynth3-ffv1.0 +++ /dev/null @@ -1,4 +0,0 @@ -91ddf7723476e2b084253ffca69f382e *tests/data/fate/vsynth3-ffv1.0.avi -52256 tests/data/fate/vsynth3-ffv1.0.avi -a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1.0.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-ffv1.3-420 b/tests/ref/vsynth/vsynth3-ffv1.3-420 deleted file mode 100644 index 99bfd66..0000000 --- a/tests/ref/vsynth/vsynth3-ffv1.3-420 +++ /dev/null @@ -1,4 +0,0 @@ -f969ca8542c8384c27233f362b661f8a *tests/data/fate/vsynth3-ffv1.3-420.avi -62194 tests/data/fate/vsynth3-ffv1.3-420.avi -a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1.3-420.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-ffv1.3-422p10 b/tests/ref/vsynth/vsynth3-ffv1.3-422p10 deleted file mode 100644 index fb69234..0000000 --- a/tests/ref/vsynth/vsynth3-ffv1.3-422p10 +++ /dev/null @@ -1,4 +0,0 @@ -4fc113caac00ada68e19639ae6f7bc47 *tests/data/fate/vsynth3-ffv1.3-422p10.avi -63840 tests/data/fate/vsynth3-ffv1.3-422p10.avi -a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1.3-422p10.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-ffv1.3-444p16 b/tests/ref/vsynth/vsynth3-ffv1.3-444p16 deleted file mode 100644 index fa8377c..0000000 --- a/tests/ref/vsynth/vsynth3-ffv1.3-444p16 +++ /dev/null @@ -1,4 +0,0 @@ -1e8981cec92407938b25cd82381d1c64 *tests/data/fate/vsynth3-ffv1.3-444p16.avi -82908 tests/data/fate/vsynth3-ffv1.3-444p16.avi -a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1.3-444p16.out.rawvideo -stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-ffv1.3-bgr b/tests/ref/vsynth/vsynth3-ffv1.3-bgr deleted file mode 100644 index af89d15..0000000 --- a/tests/ref/vsynth/vsynth3-ffv1.3-bgr +++ /dev/null @@ -1,4 +0,0 @@ -bdb5f694222e91bb7cb7264d2d5d419b *tests/data/fate/vsynth3-ffv1.3-bgr.avi -112780 tests/data/fate/vsynth3-ffv1.3-bgr.avi -5d031d2e891b13593b8cd79e63d083b4 *tests/data/fate/vsynth3-ffv1.3-bgr.out.rawvideo -stddev: 3.23 PSNR: 37.92 MAXDIFF: 50 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-ffv1.0 b/tests/ref/vsynth/vsynth_lena-ffv1-v0 similarity index 71% rename from tests/ref/vsynth/vsynth_lena-ffv1.0 rename to tests/ref/vsynth/vsynth_lena-ffv1-v0 index 58b1061..cbfb4af 100644 --- a/tests/ref/vsynth/vsynth_lena-ffv1.0 +++ b/tests/ref/vsynth/vsynth_lena-ffv1-v0 @@ -1,4 +1,4 @@ -ad518c7014bdd6a72514a79a9102f64f *tests/data/fate/vsynth_lena-ffv1.0.avi -3525796 tests/data/fate/vsynth_lena-ffv1.0.avi -dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1.0.out.rawvideo +ad518c7014bdd6a72514a79a9102f64f *tests/data/fate/vsynth_lena-ffv1-v0.avi +3525796 tests/data/fate/vsynth_lena-ffv1-v0.avi +dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v0.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-ffv1.3-bgr b/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0 similarity index 68% rename from tests/ref/vsynth/vsynth_lena-ffv1.3-bgr rename to tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0 index 5c0993f..cfc98f6 100644 --- a/tests/ref/vsynth/vsynth_lena-ffv1.3-bgr +++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0 @@ -1,4 +1,4 @@ -edf0987619d4d63f8b7e3022a8d0a724 *tests/data/fate/vsynth_lena-ffv1.3-bgr.avi -6013028 tests/data/fate/vsynth_lena-ffv1.3-bgr.avi -0a8b7ddfec03622e37c869c5b552f9fc *tests/data/fate/vsynth_lena-ffv1.3-bgr.out.rawvideo +edf0987619d4d63f8b7e3022a8d0a724 *tests/data/fate/vsynth_lena-ffv1-v3-bgr0.avi +6013028 tests/data/fate/vsynth_lena-ffv1-v3-bgr0.avi +0a8b7ddfec03622e37c869c5b552f9fc *tests/data/fate/vsynth_lena-ffv1-v3-bgr0.out.rawvideo stddev: 1.24 PSNR: 46.26 MAXDIFF: 17 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-ffv1.3-420 b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420 similarity index 66% rename from tests/ref/vsynth/vsynth_lena-ffv1.3-420 rename to tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420 index db00ba1..7db437e 100644 --- a/tests/ref/vsynth/vsynth_lena-ffv1.3-420 +++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420 @@ -1,4 +1,4 @@ -ed72c22374718589ffacd7ea15424687 *tests/data/fate/vsynth_lena-ffv1.3-420.avi -3547792 tests/data/fate/vsynth_lena-ffv1.3-420.avi -dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1.3-420.out.rawvideo +ed72c22374718589ffacd7ea15424687 *tests/data/fate/vsynth_lena-ffv1-v3-yuv420.avi +3547792 tests/data/fate/vsynth_lena-ffv1-v3-yuv420.avi +dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v3-yuv420.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p new file mode 100644 index 0000000..1cffcb6 --- /dev/null +++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p @@ -0,0 +1,4 @@ +ed72c22374718589ffacd7ea15424687 *tests/data/fate/vsynth_lena-ffv1-v3-yuv420p.avi +3547792 tests/data/fate/vsynth_lena-ffv1-v3-yuv420p.avi +dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v3-yuv420p.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-ffv1.3-422p10 b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10 similarity index 64% rename from tests/ref/vsynth/vsynth_lena-ffv1.3-422p10 rename to tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10 index c5e3986..ab1cd34 100644 --- a/tests/ref/vsynth/vsynth_lena-ffv1.3-422p10 +++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10 @@ -1,4 +1,4 @@ -cd3f5b3d4544a30bd08a9a11945a8adc *tests/data/fate/vsynth_lena-ffv1.3-422p10.avi -3910306 tests/data/fate/vsynth_lena-ffv1.3-422p10.avi -dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1.3-422p10.out.rawvideo +cd3f5b3d4544a30bd08a9a11945a8adc *tests/data/fate/vsynth_lena-ffv1-v3-yuv422p10.avi +3910306 tests/data/fate/vsynth_lena-ffv1-v3-yuv422p10.avi +dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v3-yuv422p10.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-ffv1.3-444p16 b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16 similarity index 64% rename from tests/ref/vsynth/vsynth_lena-ffv1.3-444p16 rename to tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16 index 22fb79e..08f9f0e 100644 --- a/tests/ref/vsynth/vsynth_lena-ffv1.3-444p16 +++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16 @@ -1,4 +1,4 @@ -e65ad01440ad756b1872b22d3cfa23d7 *tests/data/fate/vsynth_lena-ffv1.3-444p16.avi -4871266 tests/data/fate/vsynth_lena-ffv1.3-444p16.avi -dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1.3-444p16.out.rawvideo +e65ad01440ad756b1872b22d3cfa23d7 *tests/data/fate/vsynth_lena-ffv1-v3-yuv444p16.avi +4871266 tests/data/fate/vsynth_lena-ffv1-v3-yuv444p16.avi +dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v3-yuv444p16.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200

1 0

fate: use 'c' for setting the channel_layout
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> | Sat Aug 8 20:01:50 2015 +0200| [2ac5b6ce8d828f15ced89b0dcdc61dadde20fedd] | committer: Andreas Cadhalpun fate: use 'c' for setting the channel_layout Without this fate-filter-join failes with FF_API_GET_CHANNEL_LAYOUT_COMPAT disabled. Reviewed-by: Ronald S. Bultje <rsbultje(a)gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun(a)googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ac5b6ce8d828f15c… --- tests/fate/filter-audio.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 2669498..85a36d2 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -81,7 +81,7 @@ FATE_AFILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16 fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav fate-filter-join: tests/data/asynth-44100-2.wav tests/data/asynth-44100-3.wav -fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5 -f s16le +fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5c -f s16le fate-filter-join: CMP = oneline fate-filter-join: REF = 88b0d24a64717ba8635b29e8dac6ecd8

1 0

avcodec/pngdec: fully support the tRNS chunk
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Donny Yang <work(a)kota.moe> | Fri Aug 28 13:53:07 2015 +0000| [51d4bca5a40b8087c43421873e1c2262b6a74a76] | committer: Paul B Mahol avcodec/pngdec: fully support the tRNS chunk Signed-off-by: Donny Yang <work(a)kota.moe> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=51d4bca5a40b8087c… --- libavcodec/pngdec.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 9 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 6e7eae0..ee11f12 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -21,6 +21,7 @@ //#define DEBUG +#include "libavutil/avassert.h" #include "libavutil/bprint.h" #include "libavutil/imgutils.h" #include "avcodec.h" @@ -59,6 +60,7 @@ typedef struct PNGDecContext { int bits_per_pixel; int bpp; int has_trns; + uint8_t transparent_color_be[6]; uint8_t *image_buf; int image_linesize; @@ -590,6 +592,7 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, uint32_t length, AVFrame *p) { int ret; + size_t byte_depth = s->bit_depth > 8 ? 2 : 1; if (!(s->state & PNG_IHDR)) { av_log(avctx, AV_LOG_ERROR, "IDAT without IHDR\n"); @@ -641,6 +644,31 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, return AVERROR_INVALIDDATA; } + if (s->has_trns && s->color_type != PNG_COLOR_TYPE_PALETTE) { + switch (avctx->pix_fmt) { + case AV_PIX_FMT_RGB24: + avctx->pix_fmt = AV_PIX_FMT_RGBA; + break; + + case AV_PIX_FMT_RGB48BE: + avctx->pix_fmt = AV_PIX_FMT_RGBA64BE; + break; + + case AV_PIX_FMT_GRAY8: + avctx->pix_fmt = AV_PIX_FMT_YA8; + break; + + case AV_PIX_FMT_GRAY16BE: + avctx->pix_fmt = AV_PIX_FMT_YA16BE; + break; + + default: + av_assert0(0); + } + + s->bpp += byte_depth; + } + if ((ret = ff_thread_get_buffer(avctx, &s->picture, AV_GET_BUFFER_FLAG_REF)) < 0) return ret; if (avctx->codec_id == AV_CODEC_ID_APNG && s->last_dispose_op != APNG_DISPOSE_OP_PREVIOUS) { @@ -691,9 +719,21 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, s->zstream.avail_out = s->crow_size; s->zstream.next_out = s->crow_buf; } + s->state |= PNG_IDAT; - if ((ret = png_decode_idat(s, length)) < 0) + + /* set image to non-transparent bpp while decompressing */ + if (s->has_trns && s->color_type != PNG_COLOR_TYPE_PALETTE) + s->bpp -= byte_depth; + + ret = png_decode_idat(s, length); + + if (s->has_trns && s->color_type != PNG_COLOR_TYPE_PALETTE) + s->bpp += byte_depth; + + if (ret < 0) return ret; + bytestream2_skip(&s->gb, 4); /* crc */ return 0; @@ -727,17 +767,33 @@ static int decode_trns_chunk(AVCodecContext *avctx, PNGDecContext *s, { int v, i; - /* read the transparency. XXX: Only palette mode supported */ - if (s->color_type != PNG_COLOR_TYPE_PALETTE || - length > 256 || - !(s->state & PNG_PLTE)) + if (s->color_type == PNG_COLOR_TYPE_PALETTE) { + if (length > 256 || !(s->state & PNG_PLTE)) + return AVERROR_INVALIDDATA; + + for (i = 0; i < length; i++) { + v = bytestream2_get_byte(&s->gb); + s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24); + } + } else if (s->color_type == PNG_COLOR_TYPE_GRAY || s->color_type == PNG_COLOR_TYPE_RGB) { + if ((s->color_type == PNG_COLOR_TYPE_GRAY && length != 2) || + (s->color_type == PNG_COLOR_TYPE_RGB && length != 6)) + return AVERROR_INVALIDDATA; + + for (i = 0; i < length / 2; i++) { + /* only use the least significant bits */ + v = bytestream2_get_be16(&s->gb) & ((1 << s->bit_depth) - 1); + + if (s->bit_depth > 8) + AV_WB16(&s->transparent_color_be[2 * i], v); + else + s->transparent_color_be[i] = v; + } + } else { return AVERROR_INVALIDDATA; - for (i = 0; i < length; i++) { - v = bytestream2_get_byte(&s->gb); - s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24); } - bytestream2_skip(&s->gb, 4); /* crc */ + bytestream2_skip(&s->gb, 4); /* crc */ s->has_trns = 1; return 0; @@ -1122,6 +1178,29 @@ exit_loop: if (s->bits_per_pixel <= 4) handle_small_bpp(s, p); + /* apply transparency if needed */ + if (s->has_trns && s->color_type != PNG_COLOR_TYPE_PALETTE) { + size_t byte_depth = s->bit_depth > 8 ? 2 : 1; + size_t raw_bpp = s->bpp - byte_depth; + unsigned x, y; + + for (y = 0; y < s->height; ++y) { + uint8_t *row = &s->image_buf[s->image_linesize * y]; + + /* since we're updating in-place, we have to go from right to left */ + for (x = s->width; x > 0; --x) { + uint8_t *pixel = &row[s->bpp * (x - 1)]; + memmove(pixel, &row[raw_bpp * (x - 1)], raw_bpp); + + if (!memcmp(pixel, s->transparent_color_be, raw_bpp)) { + memset(&pixel[raw_bpp], 0, byte_depth); + } else { + memset(&pixel[raw_bpp], 0xff, byte_depth); + } + } + } + } + /* handle p-frames only if a predecessor frame is available */ if (s->last_picture.f->data[0]) { if ( !(avpkt->flags & AV_PKT_FLAG_KEY) && avctx->codec_tag != AV_RL32("MPNG") @@ -1285,6 +1364,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src) pdst->x_offset = psrc->x_offset; pdst->y_offset = psrc->y_offset; pdst->has_trns = psrc->has_trns; + memcpy(pdst->transparent_color_be, psrc->transparent_color_be, sizeof(pdst->transparent_color_be)); pdst->dispose_op = psrc->dispose_op;

1 0

Merge commit 'c457bdebe7af643b380aa0f6add3cb4335d218dc'
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Mon Aug 31 10:08:18 2015 +0200| [d5911e6963c0a50cd0ae8d964b08eb128d27b860] | committer: Hendrik Leppkes Merge commit 'c457bdebe7af643b380aa0f6add3cb4335d218dc' * commit 'c457bdebe7af643b380aa0f6add3cb4335d218dc': checkasm: Fix floating point arguments on 64-bit Windows Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5911e6963c0a50cd… ---

1 0

checkasm: Fix floating point arguments on 64-bit Windows
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Henrik Gramner <henrik(a)gramner.com> | Mon Aug 24 22:53:56 2015 +0200| [c457bdebe7af643b380aa0f6add3cb4335d218dc] | committer: Anton Khirnov checkasm: Fix floating point arguments on 64-bit Windows Signed-off-by: Anton Khirnov <anton(a)khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c457bdebe7af643b3… --- tests/checkasm/x86/checkasm.asm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/checkasm/x86/checkasm.asm b/tests/checkasm/x86/checkasm.asm index 4948fc9..828352c 100644 --- a/tests/checkasm/x86/checkasm.asm +++ b/tests/checkasm/x86/checkasm.asm @@ -103,16 +103,20 @@ cglobal checked_call, 2,15,16,max_args*8+8 mov [rsp+(i-6)*8], r9 %assign i i+1 %endrep -%else +%else ; WIN64 %assign i 4 %rep max_args-4 mov r9, [rsp+stack_offset+(i+7)*8] mov [rsp+i*8], r9 %assign i i+1 %endrep -%endif -%if WIN64 + ; Move possible floating-point arguments to the correct registers + movq m0, r0 + movq m1, r1 + movq m2, r2 + movq m3, r3 + %assign i 6 %rep 16-6 mova m %+ i, [x %+ i]

1 0

Merge commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6'
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Mon Aug 31 10:07:34 2015 +0200| [ea1061e147d33e33281570631cab7fdc1195e065] | committer: Hendrik Leppkes Merge commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6' * commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6': vf_scale: Add an option to pass the scaler params Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ea1061e147d33e332… ---

1 0

vf_scale: Add an option to pass the scaler params
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Luca Barbato <lu_zero(a)gentoo.org> | Tue Aug 25 23:04:12 2015 +0200| [b1abd2aaf91be249f24cb74db9c205d9e4ca9da6] | committer: Luca Barbato vf_scale: Add an option to pass the scaler params Reported-By: zehan(a)magicpony.technology > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1abd2aaf91be249f… --- libavfilter/vf_scale.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 73ea9d2..65cf632 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -79,6 +79,7 @@ typedef struct ScaleContext { */ int w, h; unsigned int flags; ///sws flags + double param[2]; // sws params int hsub, vsub; ///< chroma subsampling int slice_y; ///< top of current output slice @@ -238,7 +239,7 @@ static int config_props(AVFilterLink *outlink) else { scale->sws = sws_getContext(inlink ->w, inlink ->h, inlink ->format, outlink->w, outlink->h, outlink->format, - scale->flags, NULL, NULL, NULL); + scale->flags, NULL, NULL, scale->param); if (!scale->sws) return AVERROR(EINVAL); } @@ -300,6 +301,8 @@ static const AVOption options[] = { { "w", "Output video width", OFFSET(w_expr), AV_OPT_TYPE_STRING, { .str = "iw" }, .flags = FLAGS }, { "h", "Output video height", OFFSET(h_expr), AV_OPT_TYPE_STRING, { .str = "ih" }, .flags = FLAGS }, { "flags", "Flags to pass to libswscale", OFFSET(flags_str), AV_OPT_TYPE_STRING, { .str = "bilinear" }, .flags = FLAGS }, + { "param0", "Scaler param 0", OFFSET(param[0]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, FLAGS }, + { "param1", "Scaler param 1", OFFSET(param[1]), AV_OPT_TYPE_DOUBLE, { .dbl = SWS_PARAM_DEFAULT }, INT_MIN, INT_MAX, FLAGS }, { NULL }, };

1 0

Merge commit 'c23999be134bde0a0554261a9043be7dbc01de0c'
by git＠videolan.org 31 Aug '15

31 Aug '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Mon Aug 31 10:01:58 2015 +0200| [80a12be10f39d5ce0c9e95f49d6b2ecb5750b334] | committer: Hendrik Leppkes Merge commit 'c23999be134bde0a0554261a9043be7dbc01de0c' * commit 'c23999be134bde0a0554261a9043be7dbc01de0c': avconv_opt: Add an option that lists all supported hwaccels Merged-by: Hendrik Leppkes <h.leppkes(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=80a12be10f39d5ce0… ---

1 0