March 2016 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/nvenc: Generate AUD NAL units for better compatiblity
by git＠videolan.org 30 Mar '16

30 Mar '16

ffmpeg | branch: master | Timo Rothenpieler <timo(a)rothenpieler.org> | Wed Mar 30 12:03:59 2016 +0200| [b3557c79dcd8c3415a7de06d51294ed79e4489bf] | committer: Timo Rothenpieler avcodec/nvenc: Generate AUD NAL units for better compatiblity > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3557c79dcd8c3415… --- libavcodec/nvenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 4b20aac..7063f75 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -888,6 +888,8 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx) ctx->encode_config.encodeCodecConfig.h264Config.disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; ctx->encode_config.encodeCodecConfig.h264Config.repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; + ctx->encode_config.encodeCodecConfig.h264Config.outputAUD = 1; + if (!ctx->profile) { switch (avctx->profile) { case FF_PROFILE_H264_HIGH_444_PREDICTIVE: @@ -969,6 +971,8 @@ static av_cold int nvenc_encode_init(AVCodecContext *avctx) ctx->encode_config.encodeCodecConfig.hevcConfig.disableSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 1 : 0; ctx->encode_config.encodeCodecConfig.hevcConfig.repeatSPSPPS = (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) ? 0 : 1; + ctx->encode_config.encodeCodecConfig.hevcConfig.outputAUD = 1; + /* No other profile is supported in the current SDK version 5 */ ctx->encode_config.profileGUID = NV_ENC_HEVC_PROFILE_MAIN_GUID; avctx->profile = FF_PROFILE_HEVC_MAIN;

1 0

tests/audiomatch: Reduce search window
by git＠videolan.org 30 Mar '16

30 Mar '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Mar 22 12:21:27 2016 +0100| [b3ec5b00ce6ef911838010497e7da7ce010f3192] | committer: Michael Niedermayer tests/audiomatch: Reduce search window This avoids unneeded computations Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b3ec5b00ce6ef9118… --- tests/audiomatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/audiomatch.c b/tests/audiomatch.c index e2d6c55..9752f68 100644 --- a/tests/audiomatch.c +++ b/tests/audiomatch.c @@ -100,7 +100,7 @@ int main(int argc, char **argv){ c += signal[i] * data[j]; } if(fabs(c) > sigamp * 0.94) - maxshift = FFMIN(maxshift, fabs(pos)+128); + maxshift = FFMIN(maxshift, fabs(pos)+32); if(fabs(c)>fabs(bestc)){ bestc= c; bestpos = pos;

1 0

tests/audiomatch: also print signal vs reference length
by git＠videolan.org 30 Mar '16

30 Mar '16

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Mar 22 09:59:07 2016 +0100| [c7b983249aa46acf4b64515c5e61f3392706352a] | committer: Michael Niedermayer tests/audiomatch: also print signal vs reference length Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7b983249aa46acf4… --- tests/audiomatch.c | 2 +- tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts | 2 +- tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a | 2 +- tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts | 2 +- tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a | 2 +- tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts | 2 +- tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a | 2 +- tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts | 2 +- tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a | 2 +- tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts | 2 +- tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a | 2 +- tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts | 2 +- tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a | 2 +- tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts | 2 +- tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a | 2 +- tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts | 2 +- tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a | 2 +- tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts | 2 +- tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a | 2 +- tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts | 2 +- tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a | 2 +- tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4 | 2 +- tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4 | 2 +- tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4 | 2 +- tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4 | 2 +- tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4 | 2 +- tests/ref/fate/audiomatch-faac-16000-mono-lc-adts | 2 +- tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a | 2 +- tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts | 2 +- tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a | 2 +- tests/ref/fate/audiomatch-faac-44100-mono-lc-adts | 2 +- tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a | 2 +- tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts | 2 +- tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a | 2 +- tests/ref/fate/audiomatch-nero-16000-mono-he-m4a | 2 +- tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a | 2 +- tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a | 2 +- tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a | 2 +- tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a | 2 +- tests/ref/fate/audiomatch-nero-44100-mono-he-m4a | 2 +- tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a | 2 +- tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a | 2 +- tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a | 2 +- tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a | 2 +- tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4 | 2 +- tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a | 2 +- tests/ref/fate/audiomatch-square-aac | 2 +- tests/ref/fate/audiomatch-square-mp3 | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) diff --git a/tests/audiomatch.c b/tests/audiomatch.c index 6d181cf..e2d6c55 100644 --- a/tests/audiomatch.c +++ b/tests/audiomatch.c @@ -106,5 +106,5 @@ int main(int argc, char **argv){ bestpos = pos; } } - printf("presig: %d postsig:%d c:%7.4f\n", bestpos, datlen - siglen - bestpos, bestc / sigamp); + printf("presig: %d postsig:%d c:%7.4f lenerr:%d\n", bestpos, datlen - siglen - bestpos, bestc / sigamp, datlen - siglen); } diff --git a/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts index 8441bcc..bbbf8ff 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts +++ b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts @@ -1 +1 @@ -presig: 2593 postsig:223 c: 0.9835 +presig: 2593 postsig:223 c: 0.9835 lenerr:2816 diff --git a/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a index 05c5a42..f6f8df5 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a +++ b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a @@ -1 +1 @@ -presig: 481 postsig:223 c: 0.9835 +presig: 481 postsig:223 c: 0.9835 lenerr:704 diff --git a/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts b/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts index df78497..bf6ecf6 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts +++ b/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts @@ -1 +1 @@ -presig: 2112 postsig:704 c: 0.9842 +presig: 2112 postsig:704 c: 0.9842 lenerr:2816 diff --git a/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a b/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a index a31c584..75cd54e 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a +++ b/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:704 c: 0.9842 +presig: 0 postsig:704 c: 0.9842 lenerr:704 diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts index d2526f8..2e29599 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts +++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts @@ -1 +1 @@ -presig: 5186 postsig:446 c: 0.9895 +presig: 5186 postsig:446 c: 0.9895 lenerr:5632 diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a index 192dce2..9ba0ef2 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a +++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a @@ -1 +1 @@ -presig: 962 postsig:446 c: 0.9895 +presig: 962 postsig:446 c: 0.9895 lenerr:1408 diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts index c49e59f..32b2627 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts +++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts @@ -1 +1 @@ -presig: 5186 postsig:446 c: 0.9839 +presig: 5186 postsig:446 c: 0.9839 lenerr:5632 diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a index 7adf917..d4fc21b 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a +++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a @@ -1 +1 @@ -presig: 962 postsig:446 c: 0.9839 +presig: 962 postsig:446 c: 0.9839 lenerr:1408 diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts b/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts index 6af6b35..360049f 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts +++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts @@ -1 +1 @@ -presig: 4224 postsig:1408 c: 0.9985 +presig: 4224 postsig:1408 c: 0.9985 lenerr:5632 diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a b/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a index df05a4b..f86ccb4 100644 --- a/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a +++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:1408 c: 0.9985 +presig: 0 postsig:1408 c: 0.9985 lenerr:1408 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts index 5029b5a..f339483 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts +++ b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts @@ -1 +1 @@ -presig: 5186 postsig:822 c: 0.9911 +presig: 5186 postsig:822 c: 0.9911 lenerr:6008 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a index 0a9ed19..0ad4911 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a +++ b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a @@ -1 +1 @@ -presig: 962 postsig:822 c: 0.9911 +presig: 962 postsig:822 c: 0.9911 lenerr:1784 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts b/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts index 807aa5a..523cb1f 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts +++ b/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts @@ -1 +1 @@ -presig: 2112 postsig:824 c: 0.9995 +presig: 2112 postsig:824 c: 0.9995 lenerr:2936 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a b/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a index 9160b24..9db2d81 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a +++ b/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:824 c: 0.9995 +presig: 0 postsig:824 c: 0.9995 lenerr:824 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts index dfde35d..b8fd805 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts +++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts @@ -1 +1 @@ -presig: 10372 postsig:1644 c: 0.9890 +presig: 10372 postsig:1644 c: 0.9890 lenerr:12016 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a index 2fa74a7..ff5540b 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a +++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a @@ -1 +1 @@ -presig: 1924 postsig:1644 c: 0.9890 +presig: 1924 postsig:1644 c: 0.9890 lenerr:3568 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts index da6b749..7e72d37 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts +++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts @@ -1 +1 @@ -presig: 10372 postsig:1644 c: 0.9909 +presig: 10372 postsig:1644 c: 0.9909 lenerr:12016 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a index bb93fb0..f8214cf 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a +++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a @@ -1 +1 @@ -presig: 1924 postsig:1644 c: 0.9909 +presig: 1924 postsig:1644 c: 0.9909 lenerr:3568 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts b/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts index 10964d1..bca902b 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts +++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts @@ -1 +1 @@ -presig: 4224 postsig:1648 c: 1.0006 +presig: 4224 postsig:1648 c: 1.0006 lenerr:5872 diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a b/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a index b11b921..51f23c7 100644 --- a/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a +++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:1648 c: 1.0006 +presig: 0 postsig:1648 c: 1.0006 lenerr:1648 diff --git a/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4 b/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4 index 53d432e..698c196 100644 --- a/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4 +++ b/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4 @@ -1 +1 @@ -presig: 5569 postsig:-1609 c: 0.9702 +presig: 5569 postsig:-1609 c: 0.9702 lenerr:3960 diff --git a/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4 b/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4 index 3345722..dfc030e 100644 --- a/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4 +++ b/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4 @@ -1 +1 @@ -presig: 2973 postsig:-37 c: 0.9998 +presig: 2973 postsig:-37 c: 0.9998 lenerr:2936 diff --git a/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4 b/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4 index c015373..2de86ac 100644 --- a/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4 +++ b/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4 @@ -1 +1 @@ -presig: 11160 postsig:-3240 c: 0.9703 +presig: 11160 postsig:-3240 c: 0.9703 lenerr:7920 diff --git a/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4 b/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4 index 5876fcb..67edc2b 100644 --- a/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4 +++ b/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4 @@ -1 +1 @@ -presig: 15884 postsig:228 c: 0.8390 +presig: 15884 postsig:228 c: 0.8390 lenerr:16112 diff --git a/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4 b/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4 index c335657..f1be5cb 100644 --- a/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4 +++ b/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4 @@ -1 +1 @@ -presig: 5760 postsig:-1936 c: 0.9837 +presig: 5760 postsig:-1936 c: 0.9837 lenerr:3824 diff --git a/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts b/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts index 00b6b8c..b2615df 100644 --- a/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts +++ b/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts @@ -1 +1 @@ -presig: 0 postsig:768 c: 1.0011 +presig: 0 postsig:768 c: 1.0011 lenerr:768 diff --git a/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a b/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a index 00b6b8c..b2615df 100644 --- a/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a +++ b/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:768 c: 1.0011 +presig: 0 postsig:768 c: 1.0011 lenerr:768 diff --git a/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts b/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts index 3efbe5a..b0fa495 100644 --- a/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts +++ b/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts @@ -1 +1 @@ -presig: 0 postsig:1536 c: 1.0011 +presig: 0 postsig:1536 c: 1.0011 lenerr:1536 diff --git a/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a b/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a index 3efbe5a..b0fa495 100644 --- a/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a +++ b/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:1536 c: 1.0011 +presig: 0 postsig:1536 c: 1.0011 lenerr:1536 diff --git a/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts b/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts index ba69092..66faeb6 100644 --- a/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts +++ b/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts @@ -1 +1 @@ -presig: 0 postsig:888 c: 0.9882 +presig: 0 postsig:888 c: 0.9882 lenerr:888 diff --git a/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a b/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a index ba69092..66faeb6 100644 --- a/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a +++ b/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:888 c: 0.9882 +presig: 0 postsig:888 c: 0.9882 lenerr:888 diff --git a/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts b/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts index 25acdba..c40a48e 100644 --- a/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts +++ b/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts @@ -1 +1 @@ -presig: 0 postsig:1776 c: 0.9882 +presig: 0 postsig:1776 c: 0.9882 lenerr:1776 diff --git a/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a b/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a index 25acdba..c40a48e 100644 --- a/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a +++ b/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:1776 c: 0.9882 +presig: 0 postsig:1776 c: 0.9882 lenerr:1776 diff --git a/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a b/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a index 37f6716..4ee764e 100644 --- a/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a +++ b/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a @@ -1 +1 @@ -presig: -4 postsig:196 c: 0.9736 +presig: -4 postsig:196 c: 0.9736 lenerr:192 diff --git a/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a b/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a index 96627b0..440c419 100644 --- a/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a +++ b/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:192 c: 0.9965 +presig: 0 postsig:192 c: 0.9965 lenerr:192 diff --git a/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a b/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a index c21eb01..cdc31c1 100644 --- a/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a +++ b/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a @@ -1 +1 @@ -presig: -8 postsig:392 c: 0.9777 +presig: -8 postsig:392 c: 0.9777 lenerr:384 diff --git a/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a b/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a index 5df74f1..74d5497 100644 --- a/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a +++ b/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a @@ -1 +1 @@ -presig: 2 postsig:2590 c: 0.9934 +presig: 2 postsig:2590 c: 0.9934 lenerr:2592 diff --git a/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a b/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a index b67165b..f36c3c8 100644 --- a/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a +++ b/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:384 c: 0.9961 +presig: 0 postsig:384 c: 0.9961 lenerr:384 diff --git a/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a b/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a index 5118111..b5dcd9d 100644 --- a/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a +++ b/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a @@ -1 +1 @@ -presig: 0 postsig:1336 c: 0.9973 +presig: 0 postsig:1336 c: 0.9973 lenerr:1336 diff --git a/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a b/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a index 2928869..87b074a 100644 --- a/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a +++ b/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:312 c: 0.9986 +presig: 0 postsig:312 c: 0.9986 lenerr:312 diff --git a/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a b/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a index 7c20e75..42a87c0 100644 --- a/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a +++ b/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a @@ -1 +1 @@ -presig: -2 postsig:2674 c: 0.9986 +presig: -2 postsig:2674 c: 0.9986 lenerr:2672 diff --git a/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a b/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a index f74a128..3fa2cdb 100644 --- a/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a +++ b/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a @@ -1 +1 @@ -presig: 2 postsig:782 c: 0.9980 +presig: 2 postsig:782 c: 0.9980 lenerr:784 diff --git a/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a b/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a index 0393668..11bc41f 100644 --- a/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a +++ b/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:624 c: 0.9954 +presig: 0 postsig:624 c: 0.9954 lenerr:624 diff --git a/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4 b/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4 index c9fd297..b11a486 100644 --- a/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4 +++ b/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4 @@ -1 +1 @@ -presig: 4220 postsig:-2444 c: 0.9768 +presig: 4220 postsig:-2444 c: 0.9768 lenerr:1776 diff --git a/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a b/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a index 18863d7..9fdaf22 100644 --- a/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a +++ b/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a @@ -1 +1 @@ -presig: 0 postsig:1648 c: 0.9994 +presig: 0 postsig:1648 c: 0.9994 lenerr:1648 diff --git a/tests/ref/fate/audiomatch-square-aac b/tests/ref/fate/audiomatch-square-aac index 2e8b8d2..b3480d5 100644 --- a/tests/ref/fate/audiomatch-square-aac +++ b/tests/ref/fate/audiomatch-square-aac @@ -1 +1 @@ -presig: 0 postsig:892 c: 0.9983 +presig: 0 postsig:892 c: 0.9983 lenerr:892 diff --git a/tests/ref/fate/audiomatch-square-mp3 b/tests/ref/fate/audiomatch-square-mp3 index b798641..8de55c2 100644 --- a/tests/ref/fate/audiomatch-square-mp3 +++ b/tests/ref/fate/audiomatch-square-mp3 @@ -1 +1 @@ -presig: 0 postsig:0 c: 0.9447 +presig: 0 postsig:0 c: 0.9447 lenerr:0

1 0

doc/filters: remove false claim in sofalizer description
by git＠videolan.org 30 Mar '16

30 Mar '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Mar 29 22:29:31 2016 +0200| [974734c98ce434e5f7026e0c36edaf4058527943] | committer: Rostislav Pehlivanov doc/filters: remove false claim in sofalizer description Remove false claim that processing in freq domain is worse quality than processing in time domain. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=974734c98ce434e5f… --- doc/filters.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 6cb2ed2..5d6cf52 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3217,9 +3217,9 @@ HRTFs. Default is 1. @item type Set processing type. Can be @var{time} or @var{freq}. @var{time} is -processing audio in time domain which is slow but gives high quality output. -@var{freq} is processing audio in frequency domain which is fast but gives -mediocre output. Default is @var{freq}. +processing audio in time domain which is slow. +@var{freq} is processing audio in frequency domain which is fast. +Default is @var{freq}. @item speakers Set custom positions of virtual loudspeakers. Syntax for this option is:

1 0

Revert "aacenc: use av_clip() instead of av_clip() during quantization"
by git＠videolan.org 30 Mar '16

30 Mar '16

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Wed Mar 30 02:31:22 2016 +0100| [02172d93f6b25b61228d1d8a6204ccb3e80cfcd3] | committer: Rostislav Pehlivanov Revert "aacenc: use av_clip() instead of av_clip() during quantization" This reverts commit c0918613a0ecaac6819409c64107583eebc0ccc2, since it triggered a new assertion with gcc. This bug definitely needs a true proper fix. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02172d93f6b25b612… --- libavcodec/aacenc_quantization.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacenc_quantization.h b/libavcodec/aacenc_quantization.h index 106e632..4250407 100644 --- a/libavcodec/aacenc_quantization.h +++ b/libavcodec/aacenc_quantization.h @@ -141,7 +141,7 @@ static av_always_inline float quantize_and_encode_band_cost_template( if (BT_ESC) { for (j = 0; j < 2; j++) { if (ff_aac_codebook_vectors[cb-1][curidx*2+j] == 64.0f) { - int coef = av_clip(quant(fabsf(in[i+j]), Q, ROUNDING), 0, (1 << 13) - 1); + int coef = av_clip_uintp2(quant(fabsf(in[i+j]), Q, ROUNDING), 13); int len = av_log2(coef); put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2);

1 0

Revert "doc/filters: remove false claim in sofalizer description"
by git＠videolan.org 30 Mar '16

30 Mar '16

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Wed Mar 30 02:30:19 2016 +0100| [7cda7683a547bbac0a2849815659b8cce6b3b57c] | committer: Rostislav Pehlivanov Revert "doc/filters: remove false claim in sofalizer description" This reverts commit bf1495d9a991dd13e382a4c1871d96708fdec4e7. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cda7683a547bbac0… --- doc/filters.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 5d6cf52..6cb2ed2 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3217,9 +3217,9 @@ HRTFs. Default is 1. @item type Set processing type. Can be @var{time} or @var{freq}. @var{time} is -processing audio in time domain which is slow. -@var{freq} is processing audio in frequency domain which is fast. -Default is @var{freq}. +processing audio in time domain which is slow but gives high quality output. +@var{freq} is processing audio in frequency domain which is fast but gives +mediocre output. Default is @var{freq}. @item speakers Set custom positions of virtual loudspeakers. Syntax for this option is:

1 0

aacenc: use av_clip() instead of av_clip() during quantization
by git＠videolan.org 30 Mar '16

30 Mar '16

ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker(a)gmail.com> | Wed Mar 30 00:58:28 2016 +0100| [c0918613a0ecaac6819409c64107583eebc0ccc2] | committer: Rostislav Pehlivanov aacenc: use av_clip() instead of av_clip() during quantization Seems like clang might be miscompiling it and causing a signed integer overflow, making a FATE test fail. Doesn't seem to affect performance, it only runs on the ESC codebook. Reviewed-by: Claudio Freire <klaussfreire(a)gmail.com> Signed-off-by: Rostislav Pehlivanov <atomnuker(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0918613a0ecaac68… --- libavcodec/aacenc_quantization.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacenc_quantization.h b/libavcodec/aacenc_quantization.h index 4250407..106e632 100644 --- a/libavcodec/aacenc_quantization.h +++ b/libavcodec/aacenc_quantization.h @@ -141,7 +141,7 @@ static av_always_inline float quantize_and_encode_band_cost_template( if (BT_ESC) { for (j = 0; j < 2; j++) { if (ff_aac_codebook_vectors[cb-1][curidx*2+j] == 64.0f) { - int coef = av_clip_uintp2(quant(fabsf(in[i+j]), Q, ROUNDING), 13); + int coef = av_clip(quant(fabsf(in[i+j]), Q, ROUNDING), 0, (1 << 13) - 1); int len = av_log2(coef); put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2);

1 0

doc/filters: remove false claim in sofalizer description
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Mar 29 22:29:31 2016 +0200| [bf1495d9a991dd13e382a4c1871d96708fdec4e7] | committer: Paul B Mahol doc/filters: remove false claim in sofalizer description Remove false claim that processing in freq domain is worse quality than processing in time domain. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf1495d9a991dd13e… --- doc/filters.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 6cb2ed2..5d6cf52 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -3217,9 +3217,9 @@ HRTFs. Default is 1. @item type Set processing type. Can be @var{time} or @var{freq}. @var{time} is -processing audio in time domain which is slow but gives high quality output. -@var{freq} is processing audio in frequency domain which is fast but gives -mediocre output. Default is @var{freq}. +processing audio in time domain which is slow. +@var{freq} is processing audio in frequency domain which is fast. +Default is @var{freq}. @item speakers Set custom positions of virtual loudspeakers. Syntax for this option is:

1 0

avfilter/vf_waveform: optimize lowpass filter even more
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Mar 29 15:00:45 2016 +0200| [4a80a6ad2129fb2b30610d2a0cde7a9cab9c54a6] | committer: Paul B Mahol avfilter/vf_waveform: optimize lowpass filter even more Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a80a6ad2129fb2b3… --- libavfilter/vf_waveform.c | 51 +++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c index 62fba6c..26aa809 100644 --- a/libavfilter/vf_waveform.c +++ b/libavfilter/vf_waveform.c @@ -698,29 +698,54 @@ static av_always_inline void lowpass(WaveformContext *s, uint8_t *dst = dst_line; for (p = src_data; p < src_data_end; p++) { - int i = 0; uint8_t *target; if (column) { - do { - target = dst++ + dst_signed_linesize * *p; - update(target, max, intensity); - } while (++i < step); + target = dst + dst_signed_linesize * *p; + dst += step; + update(target, max, intensity); } else { uint8_t *row = dst_data; - do { - if (mirror) - target = row - *p - 1; - else - target = row + *p; - update(target, max, intensity); - row += dst_linesize; - } while (++i < step); + if (mirror) + target = row - *p - 1; + else + target = row + *p; + update(target, max, intensity); + row += dst_linesize; } } src_data += src_linesize; dst_data += dst_linesize * step; } + if (column && step > 1) { + const int dst_w = s->display == PARADE ? out->width / s->acomp : out->width; + const int dst_h = 256; + uint8_t *dst; + int x, z; + + dst = out->data[plane] + offset_y * dst_linesize + offset_x; + for (y = 0; y < dst_h; y++) { + for (x = 0; x < dst_w; x+=step) { + for (z = 1; z < step; z++) { + dst[x + z] = dst[x]; + } + } + dst += dst_linesize; + } + } else if (step > 1) { + const int dst_h = s->display == PARADE ? out->height / s->acomp : out->height; + const int dst_w = 256; + uint8_t *dst; + int z; + + dst = out->data[plane] + offset_y * dst_linesize + offset_x; + for (y = 0; y < dst_h; y+=step) { + for (z = 1; z < step; z++) + memcpy(dst + dst_linesize * z, dst, dst_w); + dst += dst_linesize * step; + } + } + envelope(s, out, plane, plane, column ? offset_x : offset_y); }

1 0

avcodec/mips: Optimization synced to the newest code base.
by git＠videolan.org 29 Mar '16

29 Mar '16

ffmpeg | branch: master | Jovan Zelincevic <jovan.zelincevic(a)imgtec.com> | Tue Mar 29 09:43:35 2016 +0200| [b73c27151eda795932a0169274ed6c2c8bcde062] | committer: Michael Niedermayer avcodec/mips: Optimization synced to the newest code base. FFT expanded to 2^17. Signed-off-by: Jovan Zelincevic <jovan.zelincevic(a)imgtec.com> Reviewed-by: Nedeljko Babic <Nedeljko.Babic(a)imgtec.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b73c27151eda79593… --- libavcodec/mips/fft_mips.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/mips/fft_mips.c b/libavcodec/mips/fft_mips.c index 529e076..03dcbad 100644 --- a/libavcodec/mips/fft_mips.c +++ b/libavcodec/mips/fft_mips.c @@ -72,7 +72,7 @@ static void ff_fft_calc_mips(FFTContext *s, FFTComplex *z) FFTComplex * tmpz_n2, * tmpz_n34, * tmpz_n4; FFTComplex * tmpz_n2_i, * tmpz_n34_i, * tmpz_n4_i, * tmpz_i; - num_transforms = (0x2aab >> (16 - s->nbits)) | 1; + num_transforms = (21845 >> (17 - s->nbits)) | 1; for (n=0; n<num_transforms; n++) { offset = ff_fft_offsets_lut[n] << 2; @@ -251,8 +251,8 @@ static void ff_fft_calc_mips(FFTContext *s, FFTComplex *z) : "memory" ); - w_re_ptr = (float*)(ff_cos_65536 + step); - w_im_ptr = (float*)(ff_cos_65536 + MAX_FFT_SIZE/4 - step); + w_re_ptr = (float*)(ff_cos_131072 + step); + w_im_ptr = (float*)(ff_cos_131072 + MAX_FFT_SIZE/4 - step); for (i=1; i<n4; i++) { w_re = w_re_ptr[0]; @@ -502,11 +502,8 @@ av_cold void ff_fft_init_mips(FFTContext *s) { int n=0; - if (s->nbits > 16) - return; - ff_fft_lut_init(ff_fft_offsets_lut, 0, 1 << 17, &n); - ff_init_ff_cos_tabs(16); + ff_init_ff_cos_tabs(17); #if HAVE_INLINE_ASM #if !HAVE_MIPS32R6 && !HAVE_MIPS64R6

1 0