From 16b8525963cb0df8e1d4aedb93916b8dadb7dcf7 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 14 Jun 2012 12:58:08 +0000 Subject: [PATCH 1/3] fate: add snow hpel tests Signed-off-by: Janne Grunau --- tests/fate/vcodec.mak | 5 +++++ tests/ref/fate/vsynth1-snow-hpel | 4 ++++ tests/ref/fate/vsynth2-snow-hpel | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 tests/ref/fate/vsynth1-snow-hpel create mode 100644 tests/ref/fate/vsynth2-snow-hpel diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 324320e6b8..e9a9ad622e 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -211,6 +211,11 @@ fate-vsynth%-snow: ENCOPTS = -strict -2 -qscale 2 -flags +qpel \ -me_method iter -dia_size 2 \ -cmp 12 -subcmp 12 -s 128x64 +FATE_VCODEC += snow-hpel +fate-vsynth%-snow-hpel: ENCOPTS = -strict -2 -qscale 2 \ + -me_method iter -dia_size 2 \ + -cmp 12 -subcmp 12 -s 128x64 + FATE_VCODEC += snow-ll fate-vsynth%-snow-ll: ENCOPTS = -strict -2 -qscale .001 -pred 1 \ -flags +mv4+qpel diff --git a/tests/ref/fate/vsynth1-snow-hpel b/tests/ref/fate/vsynth1-snow-hpel new file mode 100644 index 0000000000..e2968b1d91 --- /dev/null +++ b/tests/ref/fate/vsynth1-snow-hpel @@ -0,0 +1,4 @@ +301755ff5dcd31c2aefc8f103cfc2917 *tests/data/fate/vsynth1-snow-hpel.avi +138712 tests/data/fate/vsynth1-snow-hpel.avi +d6845c8f1310e041afdcebc6bbfc449b *tests/data/fate/vsynth1-snow-hpel.out.rawvideo +stddev: 22.74 PSNR: 20.99 MAXDIFF: 171 bytes: 7603200/ 7603200 diff --git a/tests/ref/fate/vsynth2-snow-hpel b/tests/ref/fate/vsynth2-snow-hpel new file mode 100644 index 0000000000..2194a137e3 --- /dev/null +++ b/tests/ref/fate/vsynth2-snow-hpel @@ -0,0 +1,4 @@ +ac1400b66514aa280300bba6477b4e97 *tests/data/fate/vsynth2-snow-hpel.avi +61772 tests/data/fate/vsynth2-snow-hpel.avi +8680d40905f423999d65b996c4dcb984 *tests/data/fate/vsynth2-snow-hpel.out.rawvideo +stddev: 10.45 PSNR: 27.74 MAXDIFF: 123 bytes: 7603200/ 7603200 From 1cdcf043cae1a4654a59da1022ca3ec2b407cc45 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Thu, 14 Jun 2012 18:41:47 +0200 Subject: [PATCH 2/3] segment: remove unnecessary include --- libavformat/segment.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 8274792bf3..8a0f136c9a 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include "avformat.h" From fbc57405664876cb7f47f1ac264db16a3014e665 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Fri, 15 Jun 2012 16:07:29 +0200 Subject: [PATCH 3/3] af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64 --- libavfilter/af_resample.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c index 8a02cfe976..bc4a0073a1 100644 --- a/libavfilter/af_resample.c +++ b/libavfilter/af_resample.c @@ -119,7 +119,11 @@ static int config_output(AVFilterLink *outlink) av_get_channel_layout_string(buf2, sizeof(buf2), -1, outlink->channel_layout); av_log(ctx, AV_LOG_VERBOSE, +#if FF_API_SAMPLERATE64 + "fmt:%s srate:%"PRId64" cl:%s -> fmt:%s srate:%"PRId64" cl:%s\n", +#else "fmt:%s srate:%d cl:%s -> fmt:%s srate:%d cl:%s\n", +#endif /* FF_API_SAMPLERATE64 */ av_get_sample_fmt_name(inlink ->format), inlink ->sample_rate, buf1, av_get_sample_fmt_name(outlink->format), outlink->sample_rate, buf2);