generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64
  segment: remove unnecessary <strings.h> include
  fate: add snow hpel tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-06-15 20:55:37 +02:00
commit 90d8506fbf
5 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/af_resample.c
View File

@ -119,7 +119,11 @@ static int config_output(AVFilterLink *outlink)
av_get_channel_layout_string(buf2, sizeof(buf2), av_get_channel_layout_string(buf2, sizeof(buf2),
-1, outlink->channel_layout); -1, outlink->channel_layout);
av_log(ctx, AV_LOG_VERBOSE, 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", "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(inlink ->format), inlink ->sample_rate, buf1,
av_get_sample_fmt_name(outlink->format), outlink->sample_rate, buf2); av_get_sample_fmt_name(outlink->format), outlink->sample_rate, buf2);

1
libavformat/segment.c
View File

@ -19,7 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <strings.h>
#include <float.h> #include <float.h>
#include "avformat.h" #include "avformat.h"

5
tests/fate/vcodec.mak
View File

@ -236,6 +236,11 @@ fate-vsynth%-snow: ENCOPTS = -strict -2 -qscale 2 -flags +qpel \
-me_method iter -dia_size 2 \ -me_method iter -dia_size 2 \
-cmp 12 -subcmp 12 -s 128x64 -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_VCODEC += snow-ll
fate-vsynth%-snow-ll: ENCOPTS = -strict -2 -qscale .001 -pred 1 \ fate-vsynth%-snow-ll: ENCOPTS = -strict -2 -qscale .001 -pred 1 \
-flags +mv4+qpel -flags +mv4+qpel

4
tests/ref/fate/vsynth1-snow-hpel Normal file
View File

@ -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

4
tests/ref/fate/vsynth2-snow-hpel Normal file
View File

@ -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