Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 May 2012 23:39:24 +0000 (01:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 May 2012 23:40:54 +0000 (01:40 +0200)
* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
  fate: fix acodec/vsynth tests for make 3.81
  pcm_mpeg: fix number of consumed bytes to include the header.
  avfilter: include required header file avfilter.h in video.h
  x86: Avoid movs on BUTTERFLYPS when in AVX mode
  x86: use new schema for ASM macros
  fate: convert codec-regression.sh to makefile rules
  fate: allow tests to specify unit size for psnr comparison
  fate: teach videogen/rotozoom to output a single raw video stream
  http: Add support for reusing the http socket for subsequent requests
  http: Add support for using persistent connections

Merged-by: Michael Niedermayer <michaelni@gmx.at>
105 files changed:
1  2 
configure
libavcodec/pcm-mpeg.c
libavcodec/x86/fft_mmx.asm
libavformat/g723_1.c
libavformat/http.c
libavformat/http.h
libavutil/x86/x86util.asm
tests/Makefile
tests/fate-run.sh
tests/fate/aac.mak
tests/fate/ac3.mak
tests/fate/acodec.mak
tests/fate/audio.mak
tests/fate/vcodec.mak
tests/ref/fate/acodec-adpcm-ima_qt
tests/ref/fate/acodec-adpcm_ima_qt
tests/ref/fate/acodec-alac
tests/ref/fate/acodec-aref
tests/ref/fate/acodec-dca
tests/ref/fate/acodec-flac
tests/ref/fate/acodec-g723_1
tests/ref/fate/acodec-pcm-s16be
tests/ref/fate/acodec-pcm-s24be
tests/ref/fate/acodec-pcm-s32be
tests/ref/fate/acodec-pcm-s8
tests/ref/fate/acodec-ra144
tests/ref/fate/acodec-roqaudio
tests/ref/fate/vsynth1-amv
tests/ref/fate/vsynth1-avui
tests/ref/fate/vsynth1-cljr
tests/ref/fate/vsynth1-dnxhd-1080i
tests/ref/fate/vsynth1-dnxhd_1080i
tests/ref/fate/vsynth1-dv
tests/ref/fate/vsynth1-dv-411
tests/ref/fate/vsynth1-dv-50
tests/ref/fate/vsynth1-dv_411
tests/ref/fate/vsynth1-ffvhuff
tests/ref/fate/vsynth1-flashsv
tests/ref/fate/vsynth1-flashsv2
tests/ref/fate/vsynth1-huffyuv
tests/ref/fate/vsynth1-j2k
tests/ref/fate/vsynth1-jpegls
tests/ref/fate/vsynth1-mpeg4
tests/ref/fate/vsynth1-mpng
tests/ref/fate/vsynth1-msvideo1
tests/ref/fate/vsynth1-prores
tests/ref/fate/vsynth1-prores_kostya
tests/ref/fate/vsynth1-qtrle
tests/ref/fate/vsynth1-qtrlegray
tests/ref/fate/vsynth1-r210
tests/ref/fate/vsynth1-rgb
tests/ref/fate/vsynth1-svq1
tests/ref/fate/vsynth1-v308
tests/ref/fate/vsynth1-v408
tests/ref/fate/vsynth1-y41p
tests/ref/fate/vsynth1-yuv
tests/ref/fate/vsynth1-yuv4
tests/ref/fate/vsynth1-zlib
tests/ref/fate/vsynth1-zmbv
tests/ref/fate/vsynth2-amv
tests/ref/fate/vsynth2-avui
tests/ref/fate/vsynth2-cljr
tests/ref/fate/vsynth2-dnxhd-1080i
tests/ref/fate/vsynth2-dnxhd_1080i
tests/ref/fate/vsynth2-dv
tests/ref/fate/vsynth2-dv-411
tests/ref/fate/vsynth2-dv-50
tests/ref/fate/vsynth2-dv_411
tests/ref/fate/vsynth2-ffvhuff
tests/ref/fate/vsynth2-flashsv
tests/ref/fate/vsynth2-flashsv2
tests/ref/fate/vsynth2-huffyuv
tests/ref/fate/vsynth2-j2k
tests/ref/fate/vsynth2-jpegls
tests/ref/fate/vsynth2-mpeg4
tests/ref/fate/vsynth2-mpng
tests/ref/fate/vsynth2-msvideo1
tests/ref/fate/vsynth2-prores
tests/ref/fate/vsynth2-prores_kostya
tests/ref/fate/vsynth2-qtrle
tests/ref/fate/vsynth2-qtrlegray
tests/ref/fate/vsynth2-r210
tests/ref/fate/vsynth2-rgb
tests/ref/fate/vsynth2-svq1
tests/ref/fate/vsynth2-v308
tests/ref/fate/vsynth2-v408
tests/ref/fate/vsynth2-y41p
tests/ref/fate/vsynth2-yuv
tests/ref/fate/vsynth2-yuv4
tests/ref/fate/vsynth2-zlib
tests/ref/fate/vsynth2-zmbv
tests/ref/seek/dv_411_dv
tests/ref/seek/dv_50_dv
tests/ref/seek/mpeg1_mpeg1video
tests/ref/seek/mpeg1b_mpeg1video
tests/ref/seek/mpeg2_422_mpeg2video
tests/ref/seek/mpeg2_idct_int_mpeg2video
tests/ref/seek/mpeg2_ilace_mpeg2video
tests/ref/seek/mpeg2_ivlc_qprd_mpeg2video
tests/ref/seek/mpeg2_thread_ivlc_mpeg2video
tests/ref/seek/mpeg2_thread_mpeg2video
tests/regression-funcs.sh
tests/rotozoom.c
tests/utils.c
tests/videogen.c

diff --cc configure
+++ b/configure
@@@ -1812,20 -1588,7 +1762,19 @@@ test_deps _muxer _demuxe
      wav                                                                 \
      yuv4mpegpipe=yuv4mpeg                                               \
  
- ac3_fixed_test_deps="ac3_fixed_encoder ac3_decoder"
 +colormatrix1_test_deps="colormatrix_filter"
 +colormatrix2_test_deps="colormatrix_filter"
 +flashsv2_test_deps="zlib"
  mpg_test_deps="mpeg1system_muxer mpegps_demuxer"
 +mpng_test_deps="zlib"
 +pp_test_deps="mp_filter"
 +pp2_test_deps="mp_filter"
 +pp3_test_deps="mp_filter"
 +pp4_test_deps="mp_filter"
 +pp5_test_deps="mp_filter"
 +pp6_test_deps="mp_filter"
 +zlib_test_deps="zlib"
 +zmbv_test_deps="zlib"
  
  # default parameters
  
@@@ -1981,16 -1731,11 +1930,12 @@@ find_tests()
      map "echo ${2}\${v}_test" $(ls "$source_path"/tests/ref/$1 | grep -v '[^-a-z0-9_]')
  }
  
- ACODEC_TESTS=$(find_tests acodec)
- VCODEC_TESTS=$(find_tests vsynth1)
 +LAVF_FATE_TESTS=$(find_tests lavf-fate)
  LAVF_TESTS=$(find_tests lavf)
  LAVFI_TESTS=$(find_tests lavfi)
  SEEK_TESTS=$(find_tests seek seek_)
  
- ALL_TESTS="$ACODEC_TESTS $VCODEC_TESTS $LAVF_FATE_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS"
- pcm_test_deps=$(map 'echo ${v%_*}_decoder $v' $(filter pcm_* $ENCODER_LIST))
 -ALL_TESTS="$LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS"
++ALL_TESTS="$LAVF_FATE_TESTS $LAVF_TESTS $LAVFI_TESTS $SEEK_TESTS"
  
  for n in $COMPONENT_LIST; do
      v=$(toupper ${n%s})_LIST
@@@ -3791,9 -3372,6 +3736,7 @@@ print_config CONFIG_ "$config_files" $C
                                       $ALL_COMPONENTS    \
  
  cat >>config.mak <<EOF
- ACODEC_TESTS=$(print_enabled -n _test $ACODEC_TESTS)
- VCODEC_TESTS=$(print_enabled -n _test $VCODEC_TESTS)
 +LAVF_FATE_TESTS=$(print_enabled -n _test $LAVF_FATE_TESTS)
  LAVF_TESTS=$(print_enabled   -n _test $LAVF_TESTS)
  LAVFI_TESTS=$(print_enabled  -n _test $LAVFI_TESTS)
  SEEK_TESTS=$(print_enabled   -n _test $SEEK_TESTS)
Simple merge
Simple merge
index a12a47a,0000000..1e0fd07
mode 100644,000000..100644
--- /dev/null
@@@ -1,82 -1,0 +1,82 @@@
-     .extensions = "tco,rco",
 +/*
 + * G.723.1 demuxer
 + * Copyright (c) 2010 Mohamed Naufal Basheer
 + *
 + * This file is part of FFmpeg.
 + *
 + * FFmpeg is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; either
 + * version 2.1 of the License, or (at your option) any later version.
 + *
 + * FFmpeg is distributed in the hope that it will be useful,
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with FFmpeg; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 + */
 +
 +/**
 + * @file
 + * G.723.1 demuxer
 + */
 +
 +#include "avformat.h"
 +#include "internal.h"
 +
 +static const uint8_t frame_size[4] = {24, 20, 4, 1};
 +
 +static int g723_1_init(AVFormatContext *s)
 +{
 +    AVStream *st;
 +
 +    st = avformat_new_stream(s, NULL);
 +    if (!st)
 +        return AVERROR(ENOMEM);
 +
 +    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;
 +    st->codec->codec_id    = CODEC_ID_G723_1;
 +    st->codec->channels    = 1;
 +    st->codec->sample_rate = 8000;
 +
 +    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
 +
 +    return 0;
 +}
 +
 +static int g723_1_read_packet(AVFormatContext *s, AVPacket *pkt)
 +{
 +    int size, byte, ret;
 +
 +    pkt->pos = avio_tell(s->pb);
 +    byte     = avio_r8(s->pb);
 +    size     = frame_size[byte & 3];
 +
 +    ret = av_new_packet(pkt, size);
 +    if (ret < 0)
 +        return ret;
 +
 +    pkt->data[0]      = byte;
 +    pkt->duration     = 240;
 +    pkt->stream_index = 0;
 +
 +    ret = avio_read(s->pb, pkt->data + 1, size - 1);
 +    if (ret < size - 1) {
 +        av_free_packet(pkt);
 +        return ret < 0 ? ret : AVERROR_EOF;
 +    }
 +
 +    return pkt->size;
 +}
 +
 +AVInputFormat ff_g723_1_demuxer = {
 +    .name        = "g723_1",
 +    .long_name   = NULL_IF_CONFIG_SMALL("G.723.1 format"),
 +    .read_header = g723_1_init,
 +    .read_packet = g723_1_read_packet,
++    .extensions = "tco,rco,g723_1",
 +    .flags = AVFMT_GENERIC_INDEX
 +};
@@@ -63,7 -62,7 +64,8 @@@ typedef struct 
  static const AVOption options[] = {
  {"chunked_post", "use chunked transfer-encoding for posts", OFFSET(chunked_post), AV_OPT_TYPE_INT, {.dbl = 1}, 0, 1, E },
  {"headers", "custom HTTP headers, can override built in default headers", OFFSET(headers), AV_OPT_TYPE_STRING, { 0 }, 0, 0, D|E },
 +{"user-agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC},
+ {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.dbl = 0}, 0, 1, D|E },
  {NULL}
  };
  #define HTTP_CLASS(flavor)\
Simple merge
Simple merge
diff --cc tests/Makefile
@@@ -1,21 -1,7 +1,19 @@@
- AREF = fate-acodec-aref
- VREF = fate-vsynth1-vref fate-vsynth2-vref
- REFS = $(AREF) $(VREF)
 +FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
 +
- $(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
- $(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw tests/data/asynth-16000-1.wav
+ VREF = tests/vsynth1/00.pgm
+ AREF = tests/data/asynth1.sw
 +
- OBJDIRS += tests/data tests/vsynth1 tests/vsynth2
 +$(AREF): CMP=
 +
 +ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw
 +      @echo
 +      @echo "Unfortunately ffserver is broken and therefore its regression"
 +      @echo "test fails randomly. Treat the results accordingly."
 +      @echo
 +      $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
 +
+ OBJDIRS += tests/data tests/vsynth1
  
  # Required due to missing automatic dependency tracking for HOSTOBJS.
  tests/rotozoom.o tests/videogen.o: tests/utils.c
@@@ -32,7 -15,16 +27,16 @@@ tests/data/asynth1.sw: tests/audiogen$(
  tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data
        $(M)./$< $@ $(subst -, ,$*)
  
- tests/data/%.sw tests/data/asynth% tests/vsynth%/00.pgm: TAG = GEN
+ tests/data/vsynth1.yuv: tests/videogen$(HOSTEXESUF) | tests/data
+       $(M)$< >$@
+ tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
+       $(M)$< $(SRC_PATH)/tests/lena.pnm >$@
 -tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
++tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
+ include $(SRC_PATH)/tests/fate/acodec.mak
+ include $(SRC_PATH)/tests/fate/vcodec.mak
  
  include $(SRC_PATH)/tests/fate/aac.mak
  include $(SRC_PATH)/tests/fate/ac3.mak
@@@ -77,11 -68,6 +81,7 @@@ include $(SRC_PATH)/tests/fate/vqf.ma
  include $(SRC_PATH)/tests/fate/wavpack.mak
  include $(SRC_PATH)/tests/fate/wma.mak
  
- FATE_ACODEC  = $(ACODEC_TESTS:%=fate-acodec-%)
- FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%)
- FATE_VSYNTH2 = $(VCODEC_TESTS:%=fate-vsynth2-%)
- FATE_VCODEC  = $(FATE_VSYNTH1) $(FATE_VSYNTH2)
 +FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%)
  FATE_LAVF    = $(LAVF_TESTS:%=fate-lavf-%)
  FATE_LAVFI   = $(LAVFI_TESTS:%=fate-lavfi-%)
  FATE_SEEK    = $(SEEK_TESTS:seek_%=fate-seek-%)
@@@ -103,27 -87,16 +101,18 @@@ FATE_SAMPLES += $(FATE_SAMPLES-yes
  FATE += $(FATE-yes)
  FATE += $(FATE_LIBAVUTIL)
  
 -$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF)
 +$(FATE_FFMPEG) $(FATE_LAVF_FATE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF)
  
- $(filter-out %-aref,$(FATE_ACODEC)): $(AREF)
- $(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref
- $(filter-out %-vref,$(FATE_VSYNTH2)): fate-vsynth2-vref
- $(FATE_LAVF):   $(REFS)
- $(FATE_LAVFI):  $(REFS) tools/lavfi-showfiltfmts$(EXESUF)
- $(FATE_SEEK):   fate-codec fate-lavf libavformat/seek-test$(EXESUF)
+ $(FATE_LAVF):  $(AREF) $(VREF)
+ $(FATE_LAVFI): $(VREF) tools/lavfi-showfiltfmts$(EXESUF)
+ $(FATE_SEEK):  fate-acodec fate-vsynth2 fate-lavf libavformat/seek-test$(EXESUF)
  
- $(FATE_ACODEC):  CMD = codectest acodec
- $(FATE_VSYNTH1): CMD = codectest vsynth1
- $(FATE_VSYNTH2): CMD = codectest vsynth2
 +$(FATE_LAVF_FATE): CMD = lavffatetest
  $(FATE_LAVF):    CMD = lavftest
  $(FATE_LAVFI):   CMD = lavfitest
  $(FATE_SEEK):    CMD = seektest
  
- fate-codec:  fate-acodec fate-vcodec
- fate-acodec: $(FATE_ACODEC)
- fate-vcodec: $(FATE_VCODEC)
 +fate-lavf-fate: $(FATE_LAVF_FATE)
  fate-lavf:   $(FATE_LAVF)
  fate-lavfi:  $(FATE_LAVFI)
  fate-seek:   $(FATE_SEEK)
@@@ -145,13 -114,11 +134,13 @@@ endi
  
  FATE_UTILS = base64 tiny_psnr
  
 -fate: $(FATE)
 +TOOL = ffmpeg
 +
 +fate:: $(FATE)
  
 -$(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
 +$(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
        @echo "TEST    $(@:fate-%=%)"
-       $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)'
+       $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)'
  
  fate-list:
        @printf '%s\n' $(sort $(FATE))
@@@ -106,22 -107,42 +107,46 @@@ enc_dec_pcm()
      encfile="${outdir}/${test}.${out_fmt}"
      cleanfiles=$encfile
      encfile=$(target_path ${encfile})
 -    avconv -i $src_file "$@" -f $out_fmt -y ${encfile} || return
 -    avconv -f $out_fmt -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
 +    ffmpeg -i $src_file "$@" -f $out_fmt -y ${encfile} || return
 +    ffmpeg -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
  }
  
 -    avconv -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS \
+ FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact"
+ DEC_OPTS="-threads $threads -idct simple $FLAGS"
+ ENC_OPTS="-threads 1        -idct simple -dct fastint"
+ enc_dec(){
+     src_fmt=$1
+     srcfile=$2
+     enc_fmt=$3
+     enc_opt=$4
+     dec_fmt=$5
+     dec_opt=$6
+     encfile="${outdir}/${test}.${enc_fmt}"
+     decfile="${outdir}/${test}.out.${dec_fmt}"
+     cleanfiles="$cleanfiles $decfile"
+     test "$7" = -keep || cleanfiles="$cleanfiles $encfile"
+     tsrcfile=$(target_path $srcfile)
+     tencfile=$(target_path $encfile)
+     tdecfile=$(target_path $decfile)
 -    avconv $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
++    ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS \
+         -f $enc_fmt -y $tencfile || return
+     do_md5sum $encfile
+     echo $(wc -c $encfile)
++    ffmpeg $8 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
+         -f $dec_fmt -y $tdecfile || return
+     do_md5sum $decfile
+     tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
+ }
  regtest(){
      t="${test#$2-}"
      ref=${base}/ref/$2/$t
 -    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags"
 +    ${base}/${1}-regression.sh $t $2 $3 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$samples"
 +}
 +
- codectest(){
-     regtest codec $1 tests/$1
- }
 +lavffatetest(){
 +    regtest lavf lavf-fate tests/vsynth1
  }
  
  lavftest(){
@@@ -71,25 -71,7 +71,25 @@@ FATE_AAC_CT = sbr_bc-ps_i.3gp  
  
  FATE_AAC += $(FATE_AAC_CT:%=fate-aac-ct-%)
  
 -FATE_SAMPLES_AVCONV += $(FATE_AAC)
 -fate-aac: $(FATE_AAC)
 +FATE_AAC_ENCODE += fate-aac-aref-encode
 +fate-aac-aref-encode: $(AREF)
 +fate-aac-aref-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aac -b:a 512k
 +fate-aac-aref-encode: CMP = stddev
- fate-aac-aref-encode: REF = ./tests/data/acodec.ref.wav
++fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav
 +fate-aac-aref-encode: CMP_SHIFT = -4096
 +fate-aac-aref-encode: CMP_TARGET = 1862
 +fate-aac-aref-encode: SIZE_TOLERANCE = 2464
 +
 +FATE_AAC_ENCODE += fate-aac-ln-encode
 +fate-aac-ln-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -strict -2 -c:a aac -b:a 512k
 +fate-aac-ln-encode: CMP = stddev
 +fate-aac-ln-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
 +fate-aac-ln-encode: CMP_SHIFT = -4096
 +fate-aac-ln-encode: CMP_TARGET = 65
 +fate-aac-ln-encode: SIZE_TOLERANCE = 3560
 +
 +FATE_SAMPLES_FFMPEG += $(FATE_AAC) $(FATE_AAC_ENCODE)
 +fate-aac: $(FATE_AAC) $(FATE_AAC_ENCODE)
 +
  $(FATE_AAC): CMP = oneoff
  $(FATE_AAC): FUZZ = 2
@@@ -46,5 -46,12 +46,12 @@@ fate-eac3-encode: CMP_TARGET = 514.0
  fate-eac3-encode: SIZE_TOLERANCE = 488
  fate-eac3-encode: FUZZ = 3
  
 -fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -b 128k -f ac3
+ FATE_AC3 += fate-ac3-fixed-encode
+ fate-ac3-fixed-encode: tests/data/asynth-44100-2.wav
+ fate-ac3-fixed-encode: SRC = tests/data/asynth-44100-2.wav
++fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -ab 128k -f ac3
+ fate-ac3-fixed-encode: CMP = oneline
+ fate-ac3-fixed-encode: REF = a1d1fc116463b771abf5aef7ed37d7b1
  FATE_SAMPLES_AVCONV += $(FATE_AC3)
  fate-ac3: $(FATE_AC3)
index 0000000,b4d0cea..58e742b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,50 +1,69 @@@
 -fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC)" wav "-c pcm_s16le" -keep
+ fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
+ fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
++fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" -keep
+ fate-acodec-%: CMP_UNIT = 2
+ FATE_ACODEC_PCM = alaw mulaw                                            \
+                   s8 u8                                                 \
+                   s16be s16le                                           \
+                   s24be s24le                                           \
+                   s32be s32le                                           \
+                   f32be f32le                                           \
+                   f64be f64le
+ FATE_ACODEC += $(FATE_ACODEC_PCM:%=fate-acodec-pcm-%)
+ fate-acodec-pcm-%: FMT = wav
+ fate-acodec-pcm-%: CODEC = pcm_$(@:fate-acodec-pcm-%=%)
+ fate-acodec-pcm-s8:   FMT = mov
+ fate-acodec-pcm-s%be: FMT = mov
+ fate-acodec-pcm-f%be: FMT = au
+ FATE_ACODEC_ADPCM = adx ima_qt ima_wav ms swf yamaha
+ FATE_ACODEC += $(FATE_ACODEC_ADPCM:%=fate-acodec-adpcm-%)
+ fate-acodec-adpcm-%: CODEC = adpcm_$(@:fate-acodec-adpcm-%=%)
+ fate-acodec-adpcm-adx:     FMT = adx
+ fate-acodec-adpcm-ima_qt:  FMT = aiff
+ fate-acodec-adpcm-ima_wav: FMT = wav
+ fate-acodec-adpcm-ms:      FMT = wav
+ fate-acodec-adpcm-swf:     FMT = flv
+ fate-acodec-adpcm-yamaha:  FMT = wav
+ FATE_ACODEC += fate-acodec-mp2
+ fate-acodec-mp2: FMT = mp2
+ fate-acodec-mp2: CMP_SHIFT = -1924
+ FATE_ACODEC += fate-acodec-alac
+ fate-acodec-alac: FMT = mov
+ fate-acodec-alac: CODEC = alac -compression_level 1
+ FATE_ACODEC += fate-acodec-flac
+ fate-acodec-flac: FMT = flac
+ fate-acodec-flac: CODEC = flac -compression_level 2
++FATE_ACODEC += fate-acodec-g723_1
++fate-acodec-g723_1: FMT = g723_1
++fate-acodec-g723_1: CODEC = g723_1
++fate-acodec-g723_1: ENCOPTS = -b:a 6.3k -ac 1 -ar 8000
++#fate-acodec-g723_1: DECOPTS = -ac 2 -ar 44100
++
++FATE_ACODEC += fate-acodec-ra144
++fate-acodec-ra144: FMT = rm
++fate-acodec-ra144: CODEC = real_144
++fate-acodec-ra144: ENCOPTS = -ac 1
++fate-acodec-ra144: DECOPTS = -ac 2
++fate-acodec-ra144: CMP_SHIFT = -640
++
++FATE_ACODEC += fate-acodec-roqaudio
++fate-acodec-roqaudio: FMT = roq
++fate-acodec-roqaudio: CODEC = roq_dpcm
++fate-acodec-roqaudio: ENCOPTS = -ar 22050
++fate-acodec-roqaudio: DECOPTS = -ar 44100
++
+ $(FATE_ACODEC): tests/data/asynth-44100-2.wav
+ FATE_AVCONV += $(FATE_ACODEC)
+ fate-acodec: $(FATE_ACODEC)
@@@ -34,23 -34,11 +34,23 @@@ fate-nellymoser: CMD = pcm -i $(SAMPLES
  fate-nellymoser: CMP = oneoff
  fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
  
 -FATE_SAMPLES_AVCONV += fate-sierra-vmd-audio
 +FATE_SAMPLES_AUDIO += fate-nellymoser-aref-encode
 +fate-nellymoser-aref-encode: $(AREF)
 +fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser
 +fate-nellymoser-aref-encode: CMP = stddev
- fate-nellymoser-aref-encode: REF = ./tests/data/acodec-16000-1.ref.wav
++fate-nellymoser-aref-encode: REF = ./tests/data/asynth-16000-1.wav
 +fate-nellymoser-aref-encode: CMP_SHIFT = -244
 +fate-nellymoser-aref-encode: CMP_TARGET = 9612
 +fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
 +
 +FATE_SAMPLES_AUDIO += fate-sierra-vmd-audio
  fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn
  
 -FATE_SAMPLES_AVCONV += fate-smacker-audio
 +FATE_SAMPLES_AUDIO += fate-smacker-audio
  fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn
  
 -FATE_SAMPLES_AVCONV += fate-ws_snd
 +FATE_SAMPLES_AUDIO += fate-ws_snd
  fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le
 +
 +FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_AUDIO)
 +fate-audio: $(FATE_SAMPLES_AUDIO)
index 0000000,324320e..5d8366c
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,243 +1,288 @@@
 -fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep
+ fate-vsynth1-%: SRC = tests/data/vsynth1.yuv
+ fate-vsynth2-%: SRC = tests/data/vsynth2.yuv
+ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
+ fate-vsynth%: FMT = avi
 -fate-vsynth%-prores:             ENCOPTS = -profile hq
++fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)"
+ fate-vsynth%: CMP_UNIT = 1
++FATE_VCODEC += amv
++
+ FATE_VCODEC += asv1
+ fate-vsynth%-asv1:               ENCOPTS = -qscale 10
+ FATE_VCODEC += asv2
+ fate-vsynth%-asv2:               ENCOPTS = -qscale 10
+ FATE_VCODEC += cljr
+ FATE_VCODEC += dnxhd-720p
+ fate-vsynth%-dnxhd-720p:         ENCOPTS = -s hd720 -b 90M              \
+                                            -pix_fmt yuv422p -frames 5
+ fate-vsynth%-dnxhd-720p:         FMT     = dnxhd
+ FATE_VCODEC += dnxhd-720p-rd
+ fate-vsynth%-dnxhd-720p-rd:      ENCOPTS = -s hd720 -b 90M -threads 4 -mbd rd \
+                                            -pix_fmt yuv422p -frames 5
+ fate-vsynth%-dnxhd-720p-rd:      FMT     = dnxhd
+ FATE_VCODEC += dnxhd-720p-10bit
+ fate-vsynth%-dnxhd-720p-10bit:   ENCOPTS = -s hd720 -b 90M              \
+                                            -pix_fmt yuv422p10 -frames 5
+ fate-vsynth%-dnxhd-720p-10bit:   FMT     = dnxhd
+ FATE_VCODEC += dnxhd-1080i
+ fate-vsynth%-dnxhd-1080i:        ENCOPTS = -s hd1080 -b 120M -flags +ildct \
+                                            -pix_fmt yuv422p -frames 5
+ fate-vsynth%-dnxhd-1080i:        FMT     = mov
+ FATE_VCODEC += dv
+ fate-vsynth%-dv:                 CODEC   = dvvideo
+ fate-vsynth%-dv:                 ENCOPTS = -dct int -s pal
+ fate-vsynth%-dv:                 FMT     = dv
+ FATE_VCODEC += dv-411
+ fate-vsynth%-dv-411:             CODEC   = dvvideo
+ fate-vsynth%-dv-411:             ENCOPTS = -dct int -s pal -pix_fmt yuv411p \
+                                            -sws_flags area
+ fate-vsynth%-dv-411:             DECOPTS = -sws_flags area
+ fate-vsynth%-dv-411:             FMT     = dv
+ FATE_VCODEC += dv-50
+ fate-vsynth%-dv-50:              CODEC   = dvvideo
+ fate-vsynth%-dv-50:              ENCOPTS = -dct int -s pal -pix_fmt yuv422p \
+                                            -sws_flags neighbor
+ fate-vsynth%-dv-50:              DECOPTS = -sws_flags neighbor
+ fate-vsynth%-dv-50:              FMT     = dv
+ FATE_VCODEC += ffv1
+ fate-vsynth%-ffv1:               ENCOPTS = -strict -2
+ FATE_VCODEC += ffvhuff
+ FATE_VCODEC += flashsv
+ fate-vsynth%-flashsv:            ENCOPTS = -sws_flags neighbor+full_chroma_int
+ fate-vsynth%-flashsv:            DECOPTS = -sws_flags area
+ fate-vsynth%-flashsv:            FMT     = flv
++FATE_VCODEC += flashsv2
++fate-vsynth%-flashsv2:           ENCOPTS = -sws_flags neighbor+full_chroma_int -strict experimental -compression_level 0
++fate-vsynth%-flashsv2:           DECOPTS = -sws_flags area
++fate-vsynth%-flashsv2:           FMT     = flv
++
+ FATE_VCODEC += flv
+ fate-vsynth%-flv:                ENCOPTS = -qscale 10
+ fate-vsynth%-flv:                FMT     = flv
+ FATE_VCODEC += h261
+ fate-vsynth%-h261:               ENCOPTS = -qscale 11
+ FATE_VCODEC += h263
+ fate-vsynth%-h263:               ENCOPTS = -qscale 10
+ FATE_VCODEC += h263p
+ fate-vsynth%-h263p:              ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 -ps 300
+ FATE_VCODEC += huffyuv
+ fate-vsynth%-huffyuv:            ENCOPTS = -pix_fmt yuv422p -sws_flags neighbor
+ fate-vsynth%-huffyuv:            DECOPTS = -strict -2 -sws_flags neighbor
+ FATE_VCODEC += jpegls
+ fate-vsynth%-jpegls:             ENCOPTS = -sws_flags neighbor+full_chroma_int
+ fate-vsynth%-jpegls:             DECOPTS = -sws_flags area
++FATE_VCODEC += j2k
++fate-vsynth%-j2k:                ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
++fate-vsynth%-j2k:                DECINOPTS = -vcodec j2k -strict experimental
++
+ FATE_VCODEC += ljpeg
+ fate-vsynth%-ljpeg:              ENCOPTS = -strict -1
+ FATE_VCODEC += mjpeg
+ fate-vsynth%-mjpeg:              ENCOPTS = -qscale 9 -pix_fmt yuvj420p
+ FATE_VCODEC += mpeg1
+ fate-vsynth%-mpeg1:              FMT     = mpeg1video
+ fate-vsynth%-mpeg1:              CODEC   = mpeg1video
+ fate-vsynth%-mpeg1:              ENCOPTS = -qscale 10
+ FATE_VCODEC += mpeg1b
+ fate-vsynth%-mpeg1b:             CODEC   = mpeg1video
+ fate-vsynth%-mpeg1b:             ENCOPTS = -qscale 8 -bf 3 -ps 200
+ fate-vsynth%-mpeg1b:             FMT     = mpeg1video
+ FATE_MPEG2 = mpeg2                                                      \
+              mpeg2-422                                                  \
+              mpeg2-idct-int                                             \
+              mpeg2-ilace                                                \
+              mpeg2-ivlc-qprd                                            \
+              mpeg2-thread                                               \
+              mpeg2-thread-ivlc
+ FATE_VCODEC += $(FATE_MPEG2)
+ $(FATE_MPEG2:%=fate-vsynth\%-%): FMT    = mpeg2video
+ $(FATE_MPEG2:%=fate-vsynth\%-%): CODEC  = mpeg2video
+ fate-vsynth%-mpeg2:              ENCOPTS = -qscale 10
+ fate-vsynth%-mpeg2-422:          ENCOPTS = -vb 1000k                    \
+                                            -bf 2                        \
+                                            -trellis 1                   \
+                                            -flags +mv0+ildct+ilme       \
+                                            -mpv_flags +qp_rd            \
+                                            -intra_vlc 1                 \
+                                            -mbd rd                      \
+                                            -pix_fmt yuv422p
+ fate-vsynth%-mpeg2-idct-int:     ENCOPTS = -qscale 10 -idct int -dct int
+ fate-vsynth%-mpeg2-ilace:        ENCOPTS = -qscale 10 -flags +ildct+ilme
+ fate-vsynth%-mpeg2-ivlc-qprd:    ENCOPTS = -vb 500k                     \
+                                            -bf 2                        \
+                                            -trellis 1                   \
+                                            -flags +mv0                  \
+                                            -mpv_flags +qp_rd            \
+                                            -intra_vlc 1                 \
+                                            -cmp 2 -subcmp 2             \
+                                            -mbd rd
+ fate-vsynth%-mpeg2-thread:       ENCOPTS = -qscale 10 -bf 2 -flags +ildct+ilme \
+                                            -threads 2 -slices 2
+ fate-vsynth%-mpeg2-thread-ivlc:  ENCOPTS = -qscale 10 -bf 2 -flags +ildct+ilme \
+                                            -intra_vlc 1 -threads 2 -slices 2
+ FATE_VCODEC += mpeg4
+ fate-vsynth%-mpeg4:              ENCOPTS = -qscale 10 -flags +mv4 -mbd bits
+ fate-vsynth%-mpeg4:              FMT     = mp4
+ FATE_VCODEC += mpeg4-rc
+ fate-vsynth%-mpeg4-rc:           ENCOPTS = -b 400k -bf 2
+ FATE_VCODEC += mpeg4-adv
+ fate-vsynth%-mpeg4-adv:          ENCOPTS = -qscale 9 -flags +mv4+aic       \
+                                            -data_partitioning 1 -trellis 1 \
+                                            -mbd bits -ps 200
+ FATE_VCODEC += mpeg4-qprd
+ fate-vsynth%-mpeg4-qprd:         ENCOPTS = -b 450k -bf 2 -trellis 1          \
+                                            -flags +mv4+mv0 -mpv_flags +qp_rd \
+                                            -cmp 2 -subcmp 2 -mbd rd
+ FATE_VCODEC += mpeg4-adap
+ fate-vsynth%-mpeg4-adap:         ENCOPTS = -b 550k -bf 2 -flags +mv4+mv0 \
+                                            -trellis 1 -cmp 1 -subcmp 2   \
+                                            -mbd rd -scplx_mask 0.3
+ FATE_VCODEC += mpeg4-qpel
+ fate-vsynth%-mpeg4-qpel:         ENCOPTS = -qscale 7 -flags +mv4+qpel -mbd 2 \
+                                            -bf 2 -cmp 1 -subcmp 2
+ FATE_VCODEC += mpeg4-thread
+ fate-vsynth%-mpeg4-thread:       ENCOPTS = -b 500k -flags +mv4+aic         \
+                                            -data_partitioning 1 -trellis 1 \
+                                            -mbd bits -ps 200 -bf 2         \
+                                            -threads 2 -slices 2
+ FATE_VCODEC += mpeg4-error
+ fate-vsynth%-mpeg4-error:        ENCOPTS = -qscale 7 -flags +mv4+aic    \
+                                            -data_partitioning 1 -mbd rd \
+                                            -ps 250 -error 10
+ FATE_VCODEC += mpeg4-nr
+ fate-vsynth%-mpeg4-nr:           ENCOPTS = -qscale 8 -flags +mv4 -mbd rd -nr 200
+ FATE_VCODEC += msmpeg4
+ fate-vsynth%-msmpeg4:            ENCOPTS = -qscale 10
+ FATE_VCODEC += msmpeg4v2
+ fate-vsynth%-msmpeg4v2:          ENCOPTS = -qscale 10
++FATE_VCODEC += mpng
++fate-vsynth%-mpng:               CODEC   = png
++
++FATE_VCODEC += msvideo1
++
+ FATE_VCODEC += prores
+ fate-vsynth%-prores:             FMT     = mov
++FATE_VCODEC += prores_kostya
++fate-vsynth%-prores_kostya:             ENCOPTS = -profile hq
++fate-vsynth%-prores_kostya:             FMT     = mov
++
+ FATE_VCODEC += qtrle
+ fate-vsynth%-qtrle:              FMT     = mov
++FATE_VCODEC += qtrlegray
++fate-vsynth%-qtrlegray:          CODEC   = qtrle
++fate-vsynth%-qtrlegray:          ENCOPTS = -pix_fmt gray
++fate-vsynth%-qtrlegray:          FMT     = mov
++
+ FATE_VCODEC += rgb
+ fate-vsynth%-rgb:                CODEC   = rawvideo
+ fate-vsynth%-rgb:                ENCOPTS = -pix_fmt bgr24
+ FATE_VCODEC += roqvideo
+ fate-vsynth%-roqvideo:           CODEC   = roqvideo
+ fate-vsynth%-roqvideo:           ENCOPTS = -frames 5
++fate-vsynth%-roqvideo:           RAWDECOPTS = -r 30
+ fate-vsynth%-roqvideo:           FMT     = roq
+ FATE_VCODEC += rv10
+ fate-vsynth%-rv10:               ENCOPTS = -qscale 10
+ fate-vsynth%-rv10:               FMT     = rm
+ FATE_VCODEC += rv20
+ fate-vsynth%-rv20:               ENCOPTS = -qscale 10
+ fate-vsynth%-rv20:               FMT     = rm
+ FATE_VCODEC += snow
+ 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-ll
+ fate-vsynth%-snow-ll:            ENCOPTS = -strict -2 -qscale .001 -pred 1 \
+                                            -flags +mv4+qpel
+ FATE_VCODEC += svq1
+ fate-vsynth%-svq1:               ENCOPTS = -qscale 3 -pix_fmt yuv410p
+ fate-vsynth%-svq1:               FMT     = mov
++FATE_VCODEC += r210
++
+ FATE_VCODEC += v210
++FATE_VCODEC += v308
++
++FATE_VCODEC += v408
++fate-vsynth%-v408:               ENCOPTS = -sws_flags neighbor+bitexact
++fate-vsynth%-v408:               DECOPTS = -sws_flags neighbor+bitexact
++
++FATE_VCODEC += avui
++fate-vsynth%-avui:               ENCOPTS = -s pal -strict experimental -sws_flags neighbor+bitexact
++fate-vsynth%-avui:               DECOPTS = -sws_flags neighbor+bitexact
++fate-vsynth%-avui:               FMT     = mov
++
+ FATE_VCODEC += wmv1
+ fate-vsynth%-wmv1:               ENCOPTS = -qscale 10
+ FATE_VCODEC += wmv2
+ fate-vsynth%-wmv2:               ENCOPTS = -qscale 10
+ FATE_VCODEC += yuv
+ fate-vsynth%-yuv:                CODEC = rawvideo
++FATE_VCODEC += yuv4
++
++FATE_VCODEC += y41p
++
++FATE_VCODEC += zlib
++
++
+ FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%)
+ FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%)
+ $(FATE_VSYNTH1): tests/data/vsynth1.yuv
+ $(FATE_VSYNTH2): tests/data/vsynth2.yuv
+ FATE_AVCONV += $(FATE_VSYNTH1) $(FATE_VSYNTH2)
+ fate-vsynth1: $(FATE_VSYNTH1)
+ fate-vsynth2: $(FATE_VSYNTH2)
+ fate-vcodec:  fate-vsynth1 fate-vsynth2
index 0000000,79b8c60..8001527
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -057d27978b35888776512e4e9669a63b *tests/data/fate/acodec-adpcm-ima_qt.aiff
++23cbae1182e150ebf28e0abfb9cba127 *tests/data/fate/acodec-adpcm-ima_qt.aiff
+ 281252 tests/data/fate/acodec-adpcm-ima_qt.aiff
 -169c40435c68d50112c9c61fc67e446d *tests/data/fate/acodec-adpcm-ima_qt.out.wav
 -stddev:  918.61 PSNR: 37.07 MAXDIFF:34029 bytes:  1058400/  1058560
++b0fafd002c38fb70acaddfda1a31ed61 *tests/data/fate/acodec-adpcm-ima_qt.out.wav
++stddev:  904.76 PSNR: 37.20 MAXDIFF:34029 bytes:  1058400/  1058560
index 0000000,0000000..a50c30a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++23cbae1182e150ebf28e0abfb9cba127 *./tests/data/acodec/adpcm_qt.aiff
++281252 ./tests/data/acodec/adpcm_qt.aiff
++b0fafd002c38fb70acaddfda1a31ed61 *./tests/data/adpcm_ima_qt.acodec.out.wav
++stddev:  904.76 PSNR: 37.20 MAXDIFF:34029 bytes:  1058560/  1058400
index 0000000,10ff211..6f52d8b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -238759bcb462fe9697973f4dd04d5b54 *tests/data/fate/acodec-alac.mov
 -389234 tests/data/fate/acodec-alac.mov
++1e5266b204b33ab4608e368d309716cb *tests/data/fate/acodec-alac.mov
++388994 tests/data/fate/acodec-alac.mov
+ 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-alac.out.wav
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
index 0000000,0000000..d70876d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/acodec.ref.wav
++1058446 ./tests/data/acodec.ref.wav
++ce524631c2ad0a40aaab46e3a80a1176 *./tests/data/acodec-16000-1.ref.wav
++192046 ./tests/data/acodec-16000-1.ref.wav
index 0000000,0000000..f4f4a19
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++66bd0e602be7fb97dc19151554c0ee29 *./tests/data/acodec/dca.dts
++1097124 ./tests/data/acodec/dca.dts
++stddev: 8944.44 PSNR: 17.30 MAXDIFF:56478 bytes:  1060864/  1058400
++stddev: 2424.93 PSNR: 28.64 MAXDIFF:13723 bytes:  1058944/  1058400
index 0000000,3ef32c2..1cc3770
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -f582b59cc68adfcb3342dcfd7e020b71 *tests/data/fate/acodec-flac.flac
 -361581 tests/data/fate/acodec-flac.flac
++151eef9097f944726968bec48649f00a *tests/data/fate/acodec-flac.flac
++361582 tests/data/fate/acodec-flac.flac
+ 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-flac.out.wav
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
index 0000000,0000000..6452661
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++d34f35011a3d596eb359cc62c92fa737 *tests/data/fate/acodec-g723_1.g723_1
++4800 tests/data/fate/acodec-g723_1.g723_1
++bc1807ce2a90997c09df66ced6900ebc *tests/data/fate/acodec-g723_1.out.wav
++stddev: 8507.27 PSNR: 17.73 MAXDIFF:26473 bytes:  1058400/    96000
index 0000000,f76e89c..00285b8
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -53c9eb319c778e7ce137667f62384994 *tests/data/fate/acodec-pcm-s16be.mov
 -1060073 tests/data/fate/acodec-pcm-s16be.mov
++a874f5c08b8d104a6bbf41b21454180d *tests/data/fate/acodec-pcm-s16be.mov
++1059045 tests/data/fate/acodec-pcm-s16be.mov
+ 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s16be.out.wav
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
index 0000000,51972ca..894844a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -af8acd2f08e4bbebe7f4bea4d6f59dd6 *tests/data/fate/acodec-pcm-s24be.mov
 -1589273 tests/data/fate/acodec-pcm-s24be.mov
++833d4afd907139af7106a5642a9c23d3 *tests/data/fate/acodec-pcm-s24be.mov
++1588245 tests/data/fate/acodec-pcm-s24be.mov
+ 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s24be.out.wav
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
index 0000000,f2b6c44..5360fc1
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -63f0e22b4f7c5d61d75047d85f140d52 *tests/data/fate/acodec-pcm-s32be.mov
 -2118473 tests/data/fate/acodec-pcm-s32be.mov
++c02c96e37b321f2c978968e3a102c669 *tests/data/fate/acodec-pcm-s32be.mov
++2117449 tests/data/fate/acodec-pcm-s32be.mov
+ 64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s32be.out.wav
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
index 0000000,b471b2c..e7c09f4
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -4b3013a3f3c328ecdb617cd88b3fe836 *tests/data/fate/acodec-pcm-s8.mov
 -530873 tests/data/fate/acodec-pcm-s8.mov
++111d465266385298fde83005402ac171 *tests/data/fate/acodec-pcm-s8.mov
++529829 tests/data/fate/acodec-pcm-s8.mov
+ 651d4eb8d98dfcdda96ae6c43d8f156b *tests/data/fate/acodec-pcm-s8.out.wav
+ stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400
index 0000000,0000000..129b276
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++d6740bee5e20fa665e6c94298125b834 *tests/data/fate/acodec-ra144.rm
++53227 tests/data/fate/acodec-ra144.rm
++16d1a0d6cae06cf8a4db009d0fe7a952 *tests/data/fate/acodec-ra144.out.wav
++stddev: 5696.26 PSNR: 21.22 MAXDIFF:44956 bytes:  1058400/  1058560
index 0000000,0000000..ec28668
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++c8ff13cf7ebece23af76502f5785202e *tests/data/fate/acodec-roqaudio.roq
++265992 tests/data/fate/acodec-roqaudio.roq
++709fd60aea880c73b375094ab5307c77 *tests/data/fate/acodec-roqaudio.out.wav
++stddev: 4610.71 PSNR: 23.05 MAXDIFF:43883 bytes:  1058400/  1058400
index 0000000,0000000..a2d1141
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++539c26ba470de4d72279855fcf61f5a2 *tests/data/fate/vsynth1-amv.avi
++1365534 tests/data/fate/vsynth1-amv.avi
++cd45dca00f94927bb36ade2ea7d1f77e *tests/data/fate/vsynth1-amv.out.rawvideo
++stddev:   10.07 PSNR: 28.06 MAXDIFF:   98 bytes:  7603200/  7603200
index 0000000,0000000..810c694
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++6eaf08e0e02bccb135b934c5036eac25 *tests/data/fate/vsynth1-avui.mov
++42624903 tests/data/fate/vsynth1-avui.mov
++c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-avui.out.rawvideo
++stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,41d40c9..77d73b2
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -b4d3d31da0b4b6873ad8239d113c91d2 *tests/data/fate/vsynth1-cljr.avi
++041982e4fa83428c621a127647d47b3f *tests/data/fate/vsynth1-cljr.avi
+ 5075660 tests/data/fate/vsynth1-cljr.avi
 -72e01607bae16527bc6389cf6db00b5f *tests/data/fate/vsynth1-cljr.out.rawvideo
 -stddev:    6.95 PSNR: 31.28 MAXDIFF:   86 bytes:  7603200/  7603200
++7bd979b8b397f7bac22a0102c7889452 *tests/data/fate/vsynth1-cljr.out.rawvideo
++stddev:    6.74 PSNR: 31.55 MAXDIFF:   84 bytes:  7603200/  7603200
index 0000000,1eddbf8..3a9fd66
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -3cfbe36a7dd5b48859b8a569d626ef77 *tests/data/fate/vsynth1-dnxhd-1080i.mov
 -3031875 tests/data/fate/vsynth1-dnxhd-1080i.mov
++027c985483caab9397592bf27477dce1 *tests/data/fate/vsynth1-dnxhd-1080i.mov
++3031911 tests/data/fate/vsynth1-dnxhd-1080i.mov
+ 0c651e840f860592f0d5b66030d9fa32 *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo
+ stddev:    6.29 PSNR: 32.15 MAXDIFF:   64 bytes:  7603200/   760320
index 0000000,0000000..f8f6df0
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++027c985483caab9397592bf27477dce1 *./tests/data/vsynth1/dnxhd-1080i.mov
++3031911 ./tests/data/vsynth1/dnxhd-1080i.mov
++0c651e840f860592f0d5b66030d9fa32 *./tests/data/dnxhd_1080i.vsynth1.out.yuv
++stddev:    6.29 PSNR: 32.15 MAXDIFF:   64 bytes:   760320/  7603200
index 0000000,f5a37ad..d051e8d
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -27ade3031b17214cf81c19cbf70f37d7 *tests/data/fate/vsynth1-dv.dv
++4d572f758b55a1756adf9f54132f3b9e *tests/data/fate/vsynth1-dv.dv
+ 7200000 tests/data/fate/vsynth1-dv.dv
+ 02ac7cdeab91d4d5621e7ce96dddc498 *tests/data/fate/vsynth1-dv.out.rawvideo
+ stddev:    6.90 PSNR: 31.34 MAXDIFF:   76 bytes:  7603200/  7603200
index 0000000,a1f07da..bc4b802
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -bd67f2431db160d4bb6dcd791cea6efd *tests/data/fate/vsynth1-dv-411.dv
++f179899efba432c6f01149c36c709092 *tests/data/fate/vsynth1-dv-411.dv
+ 7200000 tests/data/fate/vsynth1-dv-411.dv
+ 53946d51762b7826773e681fb02f377b *tests/data/fate/vsynth1-dv-411.out.rawvideo
+ stddev:    9.45 PSNR: 28.62 MAXDIFF:   84 bytes:  7603200/  7603200
index 0000000,18ee398..e747075
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -26dba84f0ea895b914ef5b333d8394ac *tests/data/fate/vsynth1-dv-50.dv
++a193c5f92bf6e74c604e759d5f4f0f94 *tests/data/fate/vsynth1-dv-50.dv
+ 14400000 tests/data/fate/vsynth1-dv-50.dv
+ a2ff093e93ffed10f730fa21df02fc50 *tests/data/fate/vsynth1-dv-50.out.rawvideo
+ stddev:    1.72 PSNR: 43.38 MAXDIFF:   29 bytes:  7603200/  7603200
index 0000000,0000000..c45b593
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++f179899efba432c6f01149c36c709092 *./tests/data/vsynth1/dv411.dv
++7200000 ./tests/data/vsynth1/dv411.dv
++b6640a3a572353f51284acb746eb00c4 *./tests/data/dv_411.vsynth1.out.yuv
++stddev:   30.76 PSNR: 18.37 MAXDIFF:  205 bytes:  7603200/  7603200
index 0000000,67f4b35..fc44dff
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -da0c0bd12ac141c976ffa6a71832ab4b *tests/data/fate/vsynth1-ffvhuff.avi
++0632ffae6f1e06dd299bf41a845b9099 *tests/data/fate/vsynth1-ffvhuff.avi
+ 5987208 tests/data/fate/vsynth1-ffvhuff.avi
+ c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffvhuff.out.rawvideo
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,b934d8d..8b27830
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -947cb24ec45a453348ae6fe3fa278071 *tests/data/fate/vsynth1-flashsv.out.rawvideo
 -stddev:    2.85 PSNR: 39.03 MAXDIFF:   49 bytes:  7603200/  7603200
+ 97894502b4cb57aca1105b6333f72dae *tests/data/fate/vsynth1-flashsv.flv
+ 14681925 tests/data/fate/vsynth1-flashsv.flv
++791e1fb999deb2e4156e2286d48c4ed1 *tests/data/fate/vsynth1-flashsv.out.rawvideo
++stddev:    2.84 PSNR: 39.04 MAXDIFF:   49 bytes:  7603200/  7603200
index 0000000,0000000..d21d63f
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++8d105780bb79915bc36f96f7a754f289 *tests/data/fate/vsynth1-flashsv2.flv
++9371095 tests/data/fate/vsynth1-flashsv2.flv
++efa88d09115a2e947eff00ee435ba3f3 *tests/data/fate/vsynth1-flashsv2.out.rawvideo
++stddev:    3.47 PSNR: 37.31 MAXDIFF:   49 bytes:  7603200/  7603200
index 0000000,e237af5..3d55c6b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -ace2536fa169d835d0fb332abde28d51 *tests/data/fate/vsynth1-huffyuv.avi
++f5f2e109af0612694ff3cd6464063e82 *tests/data/fate/vsynth1-huffyuv.avi
+ 7933800 tests/data/fate/vsynth1-huffyuv.avi
+ c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-huffyuv.out.rawvideo
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,0000000..e434db8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++8da8ef50cccb9996f4bebbc585c4edb4 *tests/data/fate/vsynth1-j2k.avi
++2306914 tests/data/fate/vsynth1-j2k.avi
++ee9b245b3b07eed90bc6f2147bbd916c *tests/data/fate/vsynth1-j2k.out.rawvideo
++stddev:    5.47 PSNR: 33.37 MAXDIFF:   64 bytes:  7603200/  7603200
index 0000000,68ae0b2..de4f109
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -947cb24ec45a453348ae6fe3fa278071 *tests/data/fate/vsynth1-jpegls.out.rawvideo
 -stddev:    2.85 PSNR: 39.03 MAXDIFF:   49 bytes:  7603200/  7603200
+ 870dceeb6d3931dd68b34f0c33be5d26 *tests/data/fate/vsynth1-jpegls.avi
+ 9089812 tests/data/fate/vsynth1-jpegls.avi
++791e1fb999deb2e4156e2286d48c4ed1 *tests/data/fate/vsynth1-jpegls.out.rawvideo
++stddev:    2.84 PSNR: 39.04 MAXDIFF:   49 bytes:  7603200/  7603200
index 0000000,9a917d0..988c921
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -59a9e2eed314abface66aaf1b45eb8f2 *tests/data/fate/vsynth1-mpeg4.mp4
 -540180 tests/data/fate/vsynth1-mpeg4.mp4
++6ea715a2de70af8d37128ce643e4cca0 *tests/data/fate/vsynth1-mpeg4.mp4
++539996 tests/data/fate/vsynth1-mpeg4.mp4
+ 8828a375448dc5c2215163ba70656f89 *tests/data/fate/vsynth1-mpeg4.out.rawvideo
+ stddev:    7.97 PSNR: 30.10 MAXDIFF:  105 bytes:  7603200/  7603200
index 0000000,0000000..875d81b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++a8e7393fa534289eee9319ded7807f99 *tests/data/fate/vsynth1-mpng.avi
++12157242 tests/data/fate/vsynth1-mpng.avi
++93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-mpng.out.rawvideo
++stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200
index 0000000,0000000..9beb739
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++37aa67b5928794534cb6a268d4adf48c *tests/data/fate/vsynth1-msvideo1.avi
++2162264 tests/data/fate/vsynth1-msvideo1.avi
++c0665fac1bd896b6fe7fe0eead805bd5 *tests/data/fate/vsynth1-msvideo1.out.rawvideo
++stddev:   11.80 PSNR: 26.69 MAXDIFF:  151 bytes:  7603200/  7603200
index 0000000,ac30a6a..1df41d6
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -2566517b15c62887bd94daaab1b1a85b *tests/data/fate/vsynth1-prores.mov
 -3859037 tests/data/fate/vsynth1-prores.mov
 -0a4153637d0cc0a88a8bcbf04cfaf8c6 *tests/data/fate/vsynth1-prores.out.rawvideo
 -stddev:    3.17 PSNR: 38.09 MAXDIFF:   39 bytes:  7603200/  7603200
++31159cc9d1693bc66ad7a3083c48bcc4 *tests/data/fate/vsynth1-prores.mov
++5022811 tests/data/fate/vsynth1-prores.mov
++a2e2d1d45341a94ff994d1d92629f778 *tests/data/fate/vsynth1-prores.out.rawvideo
++stddev:    2.47 PSNR: 40.27 MAXDIFF:   31 bytes:  7603200/  7603200
index 0000000,0000000..c9350e9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++f8fe98b7f9bb66857c81dbca409a9037 *tests/data/fate/vsynth1-prores_kostya.mov
++3858901 tests/data/fate/vsynth1-prores_kostya.mov
++0a4153637d0cc0a88a8bcbf04cfaf8c6 *tests/data/fate/vsynth1-prores_kostya.out.rawvideo
++stddev:    3.17 PSNR: 38.09 MAXDIFF:   39 bytes:  7603200/  7603200
index 0000000,c9c8ccf..8c12699
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -7d75328a17e04796a39fe9be3a322946 *tests/data/fate/vsynth1-qtrle.mov
 -15263232 tests/data/fate/vsynth1-qtrle.mov
 -243325fb2cae1a9245efd49aff936327 *tests/data/fate/vsynth1-qtrle.out.rawvideo
 -stddev:    3.42 PSNR: 37.43 MAXDIFF:   48 bytes:  7603200/  7603200
++9c6ee876369fceac1ff2478a0225bc9b *tests/data/fate/vsynth1-qtrle.mov
++15263148 tests/data/fate/vsynth1-qtrle.mov
++93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-qtrle.out.rawvideo
++stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200
index 0000000,0000000..3fe3e30
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++dfb185e38b3557eca0ead72d57ca48f8 *tests/data/fate/vsynth1-qtrlegray.mov
++5113284 tests/data/fate/vsynth1-qtrlegray.mov
++29def4aed035ed65d3a89f7d382fccbe *tests/data/fate/vsynth1-qtrlegray.out.rawvideo
++stddev:   25.95 PSNR: 19.85 MAXDIFF:  122 bytes:  7603200/  7603200
index 0000000,0000000..68cdac8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++604a34c9f9151891c2d63d2652b75329 *tests/data/fate/vsynth1-r210.avi
++22125260 tests/data/fate/vsynth1-r210.avi
++ecaafa9eec11b5e1453a63ed6d194eed *tests/data/fate/vsynth1-r210.out.rawvideo
++stddev:    3.23 PSNR: 37.94 MAXDIFF:   48 bytes:  7603200/  7603200
index 0000000,e9a5b19..94e11e9
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -243325fb2cae1a9245efd49aff936327 *tests/data/fate/vsynth1-rgb.out.rawvideo
 -stddev:    3.42 PSNR: 37.43 MAXDIFF:   48 bytes:  7603200/  7603200
+ 05f0719cb52486d9a4beb9cfae3f2571 *tests/data/fate/vsynth1-rgb.avi
+ 15213260 tests/data/fate/vsynth1-rgb.avi
++93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-rgb.out.rawvideo
++stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200
index 0000000,0f8a6b2..0c40dbd
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -5c9d8734693f3cab57f61e76b5b6da7d *tests/data/fate/vsynth1-svq1.mov
 -1334367 tests/data/fate/vsynth1-svq1.mov
++4654e7af0d4aa58c3db1eb145e278038 *tests/data/fate/vsynth1-svq1.mov
++1334223 tests/data/fate/vsynth1-svq1.mov
+ 9cc35c54b2c77d36bd7e308b393c1f81 *tests/data/fate/vsynth1-svq1.out.rawvideo
+ stddev:    9.58 PSNR: 28.50 MAXDIFF:  210 bytes:  7603200/  7603200
index 0000000,0000000..137dcf9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++8d5f2065ce6547acc51041a679b7d6c4 *tests/data/fate/vsynth1-v308.avi
++15213260 tests/data/fate/vsynth1-v308.avi
++10fb42f1abf40a289c3edafc0390482c *tests/data/fate/vsynth1-v308.out.rawvideo
++stddev:    2.67 PSNR: 39.60 MAXDIFF:   43 bytes:  7603200/  7603200
index 0000000,0000000..c7f414c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++98057c4d5ce12a1b1b3ca15839f47c95 *tests/data/fate/vsynth1-v408.avi
++20282060 tests/data/fate/vsynth1-v408.avi
++c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-v408.out.rawvideo
++stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,0000000..d2147f6
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++70bbcb52acac0a3cb3217719669a8242 *tests/data/fate/vsynth1-y41p.avi
++7610060 tests/data/fate/vsynth1-y41p.avi
++3aef1d83732a3f9835ee2523a11c95c1 *tests/data/fate/vsynth1-y41p.out.rawvideo
++stddev:    5.98 PSNR: 32.59 MAXDIFF:   87 bytes:  7603200/  7603200
index 0000000,927a64a..5dc29aa
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -aa6b9e862aebcf8902a6d770e7729d59 *tests/data/fate/vsynth1-yuv.avi
++eaa66c3b27a2602e882befe154a8b119 *tests/data/fate/vsynth1-yuv.avi
+ 7610060 tests/data/fate/vsynth1-yuv.avi
+ c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-yuv.out.rawvideo
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,0000000..5b7b925
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++e0d593eb635432f421b93224e425ee03 *tests/data/fate/vsynth1-yuv4.avi
++7610060 tests/data/fate/vsynth1-yuv4.avi
++c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-yuv4.out.rawvideo
++stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,0000000..068f154
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++fe4983e551b48dc555e1aeaf628f649f *tests/data/fate/vsynth1-zlib.avi
++12108644 tests/data/fate/vsynth1-zlib.avi
++93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-zlib.out.rawvideo
++stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200
index 0000000,0000000..c608c4b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++09bae55394f86ddb9e5c3254b174f865 *tests/data/fate/vsynth1-zmbv.avi
++2285442 tests/data/fate/vsynth1-zmbv.avi
++4ad1ca9de7c65eab68a619c54fffaec8 *tests/data/fate/vsynth1-zmbv.out.rawvideo
++stddev:    8.61 PSNR: 29.43 MAXDIFF:   64 bytes:  7603200/  7603200
index 0000000,0000000..fa0672d
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++816a4226fe7640a835139f8a44286a12 *tests/data/fate/vsynth2-amv.avi
++761976 tests/data/fate/vsynth2-amv.avi
++4f8991a2b25c90f44b18c4b83eb0090d *tests/data/fate/vsynth2-amv.out.rawvideo
++stddev:    4.30 PSNR: 35.46 MAXDIFF:   65 bytes:  7603200/  7603200
index 0000000,0000000..f24023c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++3f7c7bb5eba0006feb727badcad2b9bd *tests/data/fate/vsynth2-avui.mov
++42624903 tests/data/fate/vsynth2-avui.mov
++dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-avui.out.rawvideo
++stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,91ce30c..ae13185
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -416ddcf73d2d993456f3c49f3eed4f1a *tests/data/fate/vsynth2-cljr.avi
++fdc1926e0a599de94513f0a3472b598f *tests/data/fate/vsynth2-cljr.avi
+ 5075660 tests/data/fate/vsynth2-cljr.avi
 -cfe7802bf34aafed7df5dcaa5126ef23 *tests/data/fate/vsynth2-cljr.out.rawvideo
 -stddev:    3.69 PSNR: 36.78 MAXDIFF:   22 bytes:  7603200/  7603200
++965c4a134144b30b24d6d138b03ddb8c *tests/data/fate/vsynth2-cljr.out.rawvideo
++stddev:    3.29 PSNR: 37.76 MAXDIFF:   23 bytes:  7603200/  7603200
index 0000000,41a8d51..ba5bc85
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -19a91b7da35cecf41e5e3cb322485627 *tests/data/fate/vsynth2-dnxhd-1080i.mov
 -3031875 tests/data/fate/vsynth2-dnxhd-1080i.mov
++204e80f2e406ada90fca596ab2810b3e *tests/data/fate/vsynth2-dnxhd-1080i.mov
++3031911 tests/data/fate/vsynth2-dnxhd-1080i.mov
+ 3c559af629ae0a8fb1a9a0e4b4da7733 *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo
+ stddev:    1.31 PSNR: 45.77 MAXDIFF:   23 bytes:  7603200/   760320
index 0000000,0000000..81ecc5e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++204e80f2e406ada90fca596ab2810b3e *./tests/data/vsynth2/dnxhd-1080i.mov
++3031911 ./tests/data/vsynth2/dnxhd-1080i.mov
++3c559af629ae0a8fb1a9a0e4b4da7733 *./tests/data/dnxhd_1080i.vsynth2.out.yuv
++stddev:    1.31 PSNR: 45.77 MAXDIFF:   23 bytes:   760320/  7603200
index 0000000,2aac5ff..0d1465c
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -bfa766f89bfeabc0ae1044f3954bed52 *tests/data/fate/vsynth2-dv.dv
++85b8d55b0b68bb3fc2e90babb580f9b7 *tests/data/fate/vsynth2-dv.dv
+ 7200000 tests/data/fate/vsynth2-dv.dv
+ 7ec62bd3350a6848364669e6e1e4b9cc *tests/data/fate/vsynth2-dv.out.rawvideo
+ stddev:    1.71 PSNR: 43.47 MAXDIFF:   33 bytes:  7603200/  7603200
index 0000000,00ecace..d0e6d29
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -00a9d8683ac6826af41bcf7223fb0389 *tests/data/fate/vsynth2-dv-411.dv
++e428508f400327aeb96969c08fb9e1b5 *tests/data/fate/vsynth2-dv-411.dv
+ 7200000 tests/data/fate/vsynth2-dv-411.dv
+ 3cd4b85065d67bfb7fbab3bea4039711 *tests/data/fate/vsynth2-dv-411.out.rawvideo
+ stddev:    2.89 PSNR: 38.91 MAXDIFF:   45 bytes:  7603200/  7603200
index 0000000,e7e5dc1..c5ac608
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -61e31c79e8949b25c849753a0785b0d7 *tests/data/fate/vsynth2-dv-50.dv
++0032a07167199e6f49e07fa7ed4d5f62 *tests/data/fate/vsynth2-dv-50.dv
+ 14400000 tests/data/fate/vsynth2-dv-50.dv
+ af3f2dd5ab62c1a1d98b07d4aeb6852f *tests/data/fate/vsynth2-dv-50.out.rawvideo
+ stddev:    0.82 PSNR: 49.82 MAXDIFF:   12 bytes:  7603200/  7603200
index 0000000,0000000..708ac88
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++e428508f400327aeb96969c08fb9e1b5 *./tests/data/vsynth2/dv411.dv
++7200000 ./tests/data/vsynth2/dv411.dv
++7f9fa421028aabb11eaf4c6513a5a843 *./tests/data/dv_411.vsynth2.out.yuv
++stddev:   10.09 PSNR: 28.05 MAXDIFF:   60 bytes:  7603200/  7603200
index 0000000,1b279aa..ac58147
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -d31aab445b24f738df45fdd7479d6dd7 *tests/data/fate/vsynth2-ffvhuff.avi
++63926d8835dd5779dca0a4bc081ca8ae *tests/data/fate/vsynth2-ffvhuff.avi
+ 4988056 tests/data/fate/vsynth2-ffvhuff.avi
+ dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-ffvhuff.out.rawvideo
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,cbe79e6..e44fa8f
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -592b3321994e26a990deb3a0a1415de9 *tests/data/fate/vsynth2-flashsv.out.rawvideo
 -stddev:    0.65 PSNR: 51.84 MAXDIFF:   14 bytes:  7603200/  7603200
+ 0667077971e0cb63b5f49c580006e90e *tests/data/fate/vsynth2-flashsv.flv
+ 12368953 tests/data/fate/vsynth2-flashsv.flv
++3a984506f1ebfc9fb73b6814cab201cc *tests/data/fate/vsynth2-flashsv.out.rawvideo
++stddev:    0.66 PSNR: 51.73 MAXDIFF:   14 bytes:  7603200/  7603200
index 0000000,0000000..0ccfb91
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++3f4a7454fa664896ac7532e3551c4071 *tests/data/fate/vsynth2-flashsv2.flv
++9293862 tests/data/fate/vsynth2-flashsv2.flv
++8f63e24049ba1789a7f8353c695a3d99 *tests/data/fate/vsynth2-flashsv2.out.rawvideo
++stddev:    2.39 PSNR: 40.55 MAXDIFF:   21 bytes:  7603200/  7603200
index 0000000,a1c3c22..d94cbd6
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -56cd44907a48990e06bd065e189ff461 *tests/data/fate/vsynth2-huffyuv.avi
++ed66182be0d515e8b6cb970ad63162da *tests/data/fate/vsynth2-huffyuv.avi
+ 6455232 tests/data/fate/vsynth2-huffyuv.avi
+ dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-huffyuv.out.rawvideo
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,0000000..1ad4482
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++b30dc1851c0fb37726d977ec1d5ad527 *tests/data/fate/vsynth2-j2k.avi
++1151156 tests/data/fate/vsynth2-j2k.avi
++ec5218eec33a021945c28c72093382a5 *tests/data/fate/vsynth2-j2k.out.rawvideo
++stddev:    4.54 PSNR: 34.99 MAXDIFF:   61 bytes:  7603200/  7603200
index 0000000,7f17391..728d54f
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -592b3321994e26a990deb3a0a1415de9 *tests/data/fate/vsynth2-jpegls.out.rawvideo
 -stddev:    0.65 PSNR: 51.84 MAXDIFF:   14 bytes:  7603200/  7603200
+ 8a94dc94b6df8bdde9a639246351d816 *tests/data/fate/vsynth2-jpegls.avi
+ 8334630 tests/data/fate/vsynth2-jpegls.avi
++3a984506f1ebfc9fb73b6814cab201cc *tests/data/fate/vsynth2-jpegls.out.rawvideo
++stddev:    0.66 PSNR: 51.73 MAXDIFF:   14 bytes:  7603200/  7603200
index 0000000,4d96557..9e81c17
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -8c9afbf564008a8ce6719cc3546deae1 *tests/data/fate/vsynth2-mpeg4.mp4
 -119833 tests/data/fate/vsynth2-mpeg4.mp4
++051ff85797971b9047723044eaec07be *tests/data/fate/vsynth2-mpeg4.mp4
++119649 tests/data/fate/vsynth2-mpeg4.mp4
+ 90a3577850239083a9042bef33c50e85 *tests/data/fate/vsynth2-mpeg4.out.rawvideo
+ stddev:    5.34 PSNR: 33.57 MAXDIFF:   83 bytes:  7603200/  7603200
index 0000000,0000000..1a298f9
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++198a3d67c56e1b5b12bdd3ffa67d8128 *tests/data/fate/vsynth2-mpng.avi
++12557288 tests/data/fate/vsynth2-mpng.avi
++98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth2-mpng.out.rawvideo
++stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200
index 0000000,0000000..8338ac4
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++e70658b8b97eb4c7e63b2081c3a602de *tests/data/fate/vsynth2-msvideo1.avi
++1259308 tests/data/fate/vsynth2-msvideo1.avi
++cd83ffcbc73573044e3aead3094229e5 *tests/data/fate/vsynth2-msvideo1.out.rawvideo
++stddev:    7.42 PSNR: 30.72 MAXDIFF:  123 bytes:  7603200/  7603200
index 0000000,9a834ed..5db45d9
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -28755ce05e812adbb8b7c180318ffba8 *tests/data/fate/vsynth2-prores.mov
 -3884722 tests/data/fate/vsynth2-prores.mov
 -ca2f6c1162635dedfa468c90f1fdc0ef *tests/data/fate/vsynth2-prores.out.rawvideo
 -stddev:    0.92 PSNR: 48.77 MAXDIFF:   10 bytes:  7603200/  7603200
++0faf42c187120c61d64a5e0cea4fc92a *tests/data/fate/vsynth2-prores.mov
++2844066 tests/data/fate/vsynth2-prores.mov
++b5844025c0f4c7c37db702c3213db232 *tests/data/fate/vsynth2-prores.out.rawvideo
++stddev:    1.31 PSNR: 45.77 MAXDIFF:   11 bytes:  7603200/  7603200
index 0000000,0000000..68acf9c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++26adb18726c08dde23bc4bee2eb591e2 *tests/data/fate/vsynth2-prores_kostya.mov
++3884586 tests/data/fate/vsynth2-prores_kostya.mov
++ca2f6c1162635dedfa468c90f1fdc0ef *tests/data/fate/vsynth2-prores_kostya.out.rawvideo
++stddev:    0.92 PSNR: 48.77 MAXDIFF:   10 bytes:  7603200/  7603200
index 0000000,ceee854..d3b045b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -4805f35ca6e03b9279cc18f3f7356366 *tests/data/fate/vsynth2-qtrle.mov
 -14798419 tests/data/fate/vsynth2-qtrle.mov
 -b2418e0e3a9a8619b31219cbcf24dc82 *tests/data/fate/vsynth2-qtrle.out.rawvideo
 -stddev:    1.26 PSNR: 46.06 MAXDIFF:   13 bytes:  7603200/  7603200
++6ac61c011e1811ebd045535b141351de *tests/data/fate/vsynth2-qtrle.mov
++14798335 tests/data/fate/vsynth2-qtrle.mov
++98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth2-qtrle.out.rawvideo
++stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200
index 0000000,0000000..1306f3e
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++5a66c6d2b2db71eddbc50819483aa647 *tests/data/fate/vsynth2-qtrlegray.mov
++5111273 tests/data/fate/vsynth2-qtrlegray.mov
++f63b5ebdfdba750e547c25131b0a3fd1 *tests/data/fate/vsynth2-qtrlegray.out.rawvideo
++stddev:   19.42 PSNR: 22.36 MAXDIFF:   72 bytes:  7603200/  7603200
index 0000000,0000000..610ba2c
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++d7a6f298e6869a74c0988fc3b30d0351 *tests/data/fate/vsynth2-r210.avi
++22125260 tests/data/fate/vsynth2-r210.avi
++6ea4fcd93fc83defc8770e85b64b60bb *tests/data/fate/vsynth2-r210.out.rawvideo
++stddev:    0.70 PSNR: 51.12 MAXDIFF:   12 bytes:  7603200/  7603200
index 0000000,36ac105..c89f46f
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -b2418e0e3a9a8619b31219cbcf24dc82 *tests/data/fate/vsynth2-rgb.out.rawvideo
 -stddev:    1.26 PSNR: 46.06 MAXDIFF:   13 bytes:  7603200/  7603200
+ f2e9c419023c743bf99aa5b2e55ad233 *tests/data/fate/vsynth2-rgb.avi
+ 15213260 tests/data/fate/vsynth2-rgb.avi
++98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth2-rgb.out.rawvideo
++stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200
index 0000000,251f72d..b2cd35f
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -138ad38281570f1a3b68d63ed896435d *tests/data/fate/vsynth2-svq1.mov
 -766851 tests/data/fate/vsynth2-svq1.mov
++320a7fbbaecc0989df054bf9678bfdf6 *tests/data/fate/vsynth2-svq1.mov
++766691 tests/data/fate/vsynth2-svq1.mov
+ aa03471dac3f49455a33a2b19fda1098 *tests/data/fate/vsynth2-svq1.out.rawvideo
+ stddev:    3.23 PSNR: 37.93 MAXDIFF:   61 bytes:  7603200/  7603200
index 0000000,0000000..cd20214
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++214671673e6c82bad8190d0329f01fdc *tests/data/fate/vsynth2-v308.avi
++15213260 tests/data/fate/vsynth2-v308.avi
++d43cb310c130c69214332d74f6ee5f9a *tests/data/fate/vsynth2-v308.out.rawvideo
++stddev:    0.41 PSNR: 55.80 MAXDIFF:    7 bytes:  7603200/  7603200
index 0000000,0000000..8d12fc7
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++033d112ec5a1a78882233d0b791e5ef7 *tests/data/fate/vsynth2-v408.avi
++20282060 tests/data/fate/vsynth2-v408.avi
++dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-v408.out.rawvideo
++stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,0000000..b310e3b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++8e0139963e79180a0fc1c154e36cebe5 *tests/data/fate/vsynth2-y41p.avi
++7610060 tests/data/fate/vsynth2-y41p.avi
++d27a84ccdac09055724d122e03fea82a *tests/data/fate/vsynth2-y41p.out.rawvideo
++stddev:    1.07 PSNR: 47.54 MAXDIFF:   21 bytes:  7603200/  7603200
index 0000000,a2332e0..e5409b0
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,4 +1,4 @@@
 -30a400773ab26f2c83e469198b156f1d *tests/data/fate/vsynth2-yuv.avi
++3d5ee6d2023bc15bba898819e4977e46 *tests/data/fate/vsynth2-yuv.avi
+ 7610060 tests/data/fate/vsynth2-yuv.avi
+ dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-yuv.out.rawvideo
+ stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,0000000..a5e9ee5
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++3d24f1d320c4ead1efbf3c952a902379 *tests/data/fate/vsynth2-yuv4.avi
++7610060 tests/data/fate/vsynth2-yuv4.avi
++dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth2-yuv4.out.rawvideo
++stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
index 0000000,0000000..d3295e3
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++f4bfa774c853abe8f06a29596c1f16cb *tests/data/fate/vsynth2-zlib.avi
++12517188 tests/data/fate/vsynth2-zlib.avi
++98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth2-zlib.out.rawvideo
++stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200
index 0000000,0000000..93e0b6a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,4 @@@
++e9cc761eb3fedc36ce5f97744196ed8b *tests/data/fate/vsynth2-zmbv.avi
++1808720 tests/data/fate/vsynth2-zmbv.avi
++ee68a5292fd0745834246b4ec0d85e9b *tests/data/fate/vsynth2-zmbv.out.rawvideo
++stddev:    8.12 PSNR: 29.94 MAXDIFF:   32 bytes:  7603200/  7603200
index 0000000,baaeefb..d318794
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,53 +1,53 @@@
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
+ ret: 0         st:-1 flags:0  ts:-1.000000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
+ ret: 0         st:-1 flags:1  ts: 1.894167
 -ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:6768000 size:144000
+ ret: 0         st: 0 flags:0  ts: 0.800000
 -ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:2880000 size:144000
+ ret: 0         st: 0 flags:1  ts:-0.320000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
+ ret: 0         st:-1 flags:0  ts: 2.576668
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
+ ret: 0         st:-1 flags:1  ts: 1.470835
 -ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:5328000 size:144000
+ ret: 0         st: 0 flags:0  ts: 0.360000
 -ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1296000 size:144000
+ ret: 0         st: 0 flags:1  ts:-0.760000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
+ ret: 0         st:-1 flags:0  ts: 2.153336
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
+ ret: 0         st:-1 flags:1  ts: 1.047503
 -ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:3744000 size:144000
+ ret: 0         st: 0 flags:0  ts:-0.040000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
+ ret: 0         st: 0 flags:1  ts: 2.840000
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
+ ret: 0         st:-1 flags:0  ts: 1.730004
 -ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:6192000 size:144000
+ ret: 0         st:-1 flags:1  ts: 0.624171
 -ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2304000 size:144000
+ ret: 0         st: 0 flags:0  ts:-0.480000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
+ ret: 0         st: 0 flags:1  ts: 2.400000
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
+ ret: 0         st:-1 flags:0  ts: 1.306672
 -ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:4752000 size:144000
+ ret: 0         st:-1 flags:1  ts: 0.200839
 -ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 720000 size:144000
+ ret: 0         st: 0 flags:0  ts:-0.920000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
+ ret: 0         st: 0 flags:1  ts: 2.000000
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
+ ret: 0         st:-1 flags:0  ts: 0.883340
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3168000 size:144000
+ ret: 0         st:-1 flags:1  ts:-0.222493
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
+ ret: 0         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
+ ret: 0         st: 0 flags:1  ts: 1.560000
 -ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:5616000 size:144000
+ ret: 0         st:-1 flags:0  ts: 0.460008
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1728000 size:144000
+ ret: 0         st:-1 flags:1  ts:-0.645825
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
index 0000000,1f07e5b..fae6d1b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,53 +1,53 @@@
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ ret: 0         st:-1 flags:0  ts:-1.000000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ ret: 0         st:-1 flags:1  ts: 1.894167
 -ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:13536000 size:288000
+ ret: 0         st: 0 flags:0  ts: 0.800000
 -ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:5760000 size:288000
+ ret: 0         st: 0 flags:1  ts:-0.320000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ ret: 0         st:-1 flags:0  ts: 2.576668
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ ret: 0         st:-1 flags:1  ts: 1.470835
 -ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:10656000 size:288000
+ ret: 0         st: 0 flags:0  ts: 0.360000
 -ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:2592000 size:288000
+ ret: 0         st: 0 flags:1  ts:-0.760000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ ret: 0         st:-1 flags:0  ts: 2.153336
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ ret: 0         st:-1 flags:1  ts: 1.047503
 -ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:7488000 size:288000
+ ret: 0         st: 0 flags:0  ts:-0.040000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ ret: 0         st: 0 flags:1  ts: 2.840000
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ ret: 0         st:-1 flags:0  ts: 1.730004
 -ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:12384000 size:288000
+ ret: 0         st:-1 flags:1  ts: 0.624171
 -ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:4608000 size:288000
+ ret: 0         st: 0 flags:0  ts:-0.480000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ ret: 0         st: 0 flags:1  ts: 2.400000
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ ret: 0         st:-1 flags:0  ts: 1.306672
 -ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:9504000 size:288000
+ ret: 0         st:-1 flags:1  ts: 0.200839
 -ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1440000 size:288000
+ ret: 0         st: 0 flags:0  ts:-0.920000
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ ret: 0         st: 0 flags:1  ts: 2.000000
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ ret: 0         st:-1 flags:0  ts: 0.883340
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:6336000 size:288000
+ ret: 0         st:-1 flags:1  ts:-0.222493
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ ret: 0         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ ret: 0         st: 0 flags:1  ts: 1.560000
 -ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:11232000 size:288000
+ ret: 0         st:-1 flags:0  ts: 0.460008
 -ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3456000 size:288000
+ ret: 0         st:-1 flags:1  ts:-0.645825
 -ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
index 0000000,a85055a..54f0b16
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,46 +1,46 @@@
 -ret: 0         st: 0 flags:0  ts: 0.800000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:  9779
+ ret: 0         st:-1 flags:0  ts:-1.000000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
+ ret: 0         st:-1 flags:1  ts: 1.894167
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 124245 size: 11796
 -ret:-1         st: 0 flags:1  ts:-0.320000
++ret: 0         st: 0 flags:0  ts: 0.788334
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  76694 size: 10792
 -ret: 0         st: 0 flags:0  ts: 0.360000
++ret:-1         st: 0 flags:1  ts:-0.317499
+ ret:-1         st:-1 flags:0  ts: 2.576668
+ ret: 0         st:-1 flags:1  ts: 1.470835
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 124245 size: 11796
 -ret:-1         st: 0 flags:1  ts:-0.760000
++ret: 0         st: 0 flags:0  ts: 0.365002
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  37721 size:  9873
 -ret: 0         st: 0 flags:0  ts:-0.040000
++ret:-1         st: 0 flags:1  ts:-0.740831
+ ret:-1         st:-1 flags:0  ts: 2.153336
+ ret: 0         st:-1 flags:1  ts: 1.047503
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  76694 size: 10792
 -ret: 0         st: 0 flags:1  ts: 2.840000
++ret: 0         st: 0 flags:0  ts:-0.058330
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
 -ret: 0         st: 0 flags:0  ts:-0.480000
++ret: 0         st: 0 flags:1  ts: 2.835837
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 177089 size: 12057
+ ret: 0         st:-1 flags:0  ts: 1.730004
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 177089 size: 12057
+ ret: 0         st:-1 flags:1  ts: 0.624171
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  37721 size:  9873
 -ret: 0         st: 0 flags:1  ts: 2.400000
++ret: 0         st: 0 flags:0  ts:-0.481662
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
 -ret: 0         st: 0 flags:0  ts:-0.920000
++ret: 0         st: 0 flags:1  ts: 2.412505
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 177089 size: 12057
+ ret: 0         st:-1 flags:0  ts: 1.306672
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 124245 size: 11796
+ ret: 0         st:-1 flags:1  ts: 0.200839
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
 -ret: 0         st: 0 flags:1  ts: 2.000000
++ret: 0         st: 0 flags:0  ts:-0.904994
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
 -ret:-1         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1  ts: 1.560000
++ret: 0         st: 0 flags:1  ts: 1.989173
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 177089 size: 12057
+ ret: 0         st:-1 flags:0  ts: 0.883340
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  76694 size: 10792
+ ret:-1         st:-1 flags:1  ts:-0.222493
++ret:-1         st: 0 flags:0  ts: 2.671674
++ret: 0         st: 0 flags:1  ts: 1.565841
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 124245 size: 11796
+ ret: 0         st:-1 flags:0  ts: 0.460008
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  37721 size:  9873
+ ret:-1         st:-1 flags:1  ts:-0.645825
index 0000000,3b0b084..4c83997
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,46 +1,46 @@@
 -ret: 0         st: 0 flags:0  ts: 0.800000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 11817
+ ret: 0         st:-1 flags:0  ts:-1.000000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
+ ret: 0         st:-1 flags:1  ts: 1.894167
+ ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194420 size: 14837
 -ret:-1         st: 0 flags:1  ts:-0.320000
++ret: 0         st: 0 flags:0  ts: 0.788334
+ ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos:  80757 size: 13267
 -ret: 0         st: 0 flags:0  ts: 0.360000
 -ret: 0         st: 0 flags:1 dts: 0.360000 pts: NOPTS    pos:  34797 size: 12009
 -ret:-1         st: 0 flags:1  ts:-0.760000
++ret:-1         st: 0 flags:1  ts:-0.317499
+ ret:-1         st:-1 flags:0  ts: 2.576668
+ ret: 0         st:-1 flags:1  ts: 1.470835
+ ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 133899 size: 14470
 -ret: 0         st: 0 flags:0  ts:-0.040000
++ret: 0         st: 0 flags:0  ts: 0.365002
++ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos:  80757 size: 13267
++ret:-1         st: 0 flags:1  ts:-0.740831
+ ret:-1         st:-1 flags:0  ts: 2.153336
+ ret: 0         st:-1 flags:1  ts: 1.047503
+ ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos:  80757 size: 13267
 -ret: 0         st: 0 flags:1  ts: 2.840000
++ret: 0         st: 0 flags:0  ts:-0.058330
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
 -ret: 0         st: 0 flags:0  ts:-0.480000
++ret: 0         st: 0 flags:1  ts: 2.835837
+ ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194420 size: 14837
+ ret: 0         st:-1 flags:0  ts: 1.730004
+ ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194420 size: 14837
+ ret: 0         st:-1 flags:1  ts: 0.624171
+ ret: 0         st: 0 flags:1 dts: 0.360000 pts: NOPTS    pos:  34797 size: 12009
 -ret: 0         st: 0 flags:1  ts: 2.400000
++ret: 0         st: 0 flags:0  ts:-0.481662
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
 -ret: 0         st: 0 flags:0  ts:-0.920000
++ret: 0         st: 0 flags:1  ts: 2.412505
+ ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194420 size: 14837
+ ret: 0         st:-1 flags:0  ts: 1.306672
+ ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 133899 size: 14470
+ ret: 0         st:-1 flags:1  ts: 0.200839
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
 -ret: 0         st: 0 flags:1  ts: 2.000000
++ret: 0         st: 0 flags:0  ts:-0.904994
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
 -ret:-1         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1  ts: 1.560000
++ret: 0         st: 0 flags:1  ts: 1.989173
+ ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194420 size: 14837
+ ret: 0         st:-1 flags:0  ts: 0.883340
+ ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 133899 size: 14470
+ ret:-1         st:-1 flags:1  ts:-0.222493
++ret:-1         st: 0 flags:0  ts: 2.671674
++ret: 0         st: 0 flags:1  ts: 1.565841
+ ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 133899 size: 14470
+ ret: 0         st:-1 flags:0  ts: 0.460008
+ ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos:  80757 size: 13267
+ ret:-1         st:-1 flags:1  ts:-0.645825
index 0000000,d06b7cb..3b4e1e7
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,46 +1,46 @@@
 -ret: 0         st: 0 flags:0  ts: 0.800000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
+ ret: 0         st:-1 flags:0  ts:-1.000000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
+ ret: 0         st:-1 flags:1  ts: 1.894167
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325162 size: 19936
 -ret:-1         st: 0 flags:1  ts:-0.320000
++ret: 0         st: 0 flags:0  ts: 0.788334
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 200736 size: 22575
 -ret: 0         st: 0 flags:0  ts: 0.360000
++ret:-1         st: 0 flags:1  ts:-0.317499
+ ret:-1         st:-1 flags:0  ts: 2.576668
+ ret: 0         st:-1 flags:1  ts: 1.470835
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 265477 size: 21329
 -ret:-1         st: 0 flags:1  ts:-0.760000
++ret: 0         st: 0 flags:0  ts: 0.365002
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 104454 size: 28984
 -ret: 0         st: 0 flags:0  ts:-0.040000
++ret:-1         st: 0 flags:1  ts:-0.740831
+ ret:-1         st:-1 flags:0  ts: 2.153336
+ ret: 0         st:-1 flags:1  ts: 1.047503
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 200736 size: 22575
 -ret: 0         st: 0 flags:1  ts: 2.840000
++ret: 0         st: 0 flags:0  ts:-0.058330
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
 -ret: 0         st: 0 flags:0  ts:-0.480000
++ret: 0         st: 0 flags:1  ts: 2.835837
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325162 size: 19936
+ ret: 0         st:-1 flags:0  ts: 1.730004
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325162 size: 19936
+ ret: 0         st:-1 flags:1  ts: 0.624171
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 104454 size: 28984
 -ret: 0         st: 0 flags:1  ts: 2.400000
++ret: 0         st: 0 flags:0  ts:-0.481662
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
 -ret: 0         st: 0 flags:0  ts:-0.920000
++ret: 0         st: 0 flags:1  ts: 2.412505
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325162 size: 19936
+ ret: 0         st:-1 flags:0  ts: 1.306672
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 265477 size: 21329
+ ret: 0         st:-1 flags:1  ts: 0.200839
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
 -ret: 0         st: 0 flags:1  ts: 2.000000
++ret: 0         st: 0 flags:0  ts:-0.904994
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 200736 size: 22575
++ret: 0         st: 0 flags:1  ts: 1.989173
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325162 size: 19936
+ ret: 0         st:-1 flags:0  ts: 0.883340
 -ret:-1         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1  ts: 1.560000
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 265477 size: 21329
+ ret:-1         st:-1 flags:1  ts:-0.222493
++ret:-1         st: 0 flags:0  ts: 2.671674
++ret: 0         st: 0 flags:1  ts: 1.565841
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 265477 size: 21329
+ ret: 0         st:-1 flags:0  ts: 0.460008
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 200736 size: 22575
+ ret:-1         st:-1 flags:1  ts:-0.645825
index 0000000,698cedf..b096f6f
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,46 +1,46 @@@
 -ret: 0         st: 0 flags:0  ts: 0.800000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
+ ret: 0         st:-1 flags:0  ts:-1.000000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
+ ret: 0         st:-1 flags:1  ts: 1.894167
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 127925 size: 11918
 -ret:-1         st: 0 flags:1  ts:-0.320000
++ret: 0         st: 0 flags:0  ts: 0.788334
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  79103 size: 10909
 -ret: 0         st: 0 flags:0  ts: 0.360000
++ret:-1         st: 0 flags:1  ts:-0.317499
+ ret:-1         st:-1 flags:0  ts: 2.576668
+ ret: 0         st:-1 flags:1  ts: 1.470835
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 127925 size: 11918
 -ret:-1         st: 0 flags:1  ts:-0.760000
++ret: 0         st: 0 flags:0  ts: 0.365002
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  38992 size:  9985
 -ret: 0         st: 0 flags:0  ts:-0.040000
++ret:-1         st: 0 flags:1  ts:-0.740831
+ ret:-1         st:-1 flags:0  ts: 2.153336
+ ret: 0         st:-1 flags:1  ts: 1.047503
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  79103 size: 10909
 -ret: 0         st: 0 flags:1  ts: 2.840000
++ret: 0         st: 0 flags:0  ts:-0.058330
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
 -ret: 0         st: 0 flags:0  ts:-0.480000
++ret: 0         st: 0 flags:1  ts: 2.835837
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 182138 size: 12183
+ ret: 0         st:-1 flags:0  ts: 1.730004
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 182138 size: 12183
+ ret: 0         st:-1 flags:1  ts: 0.624171
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  38992 size:  9985
 -ret: 0         st: 0 flags:1  ts: 2.400000
++ret: 0         st: 0 flags:0  ts:-0.481662
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
 -ret: 0         st: 0 flags:0  ts:-0.920000
++ret: 0         st: 0 flags:1  ts: 2.412505
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 182138 size: 12183
+ ret: 0         st:-1 flags:0  ts: 1.306672
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 127925 size: 11918
+ ret: 0         st:-1 flags:1  ts: 0.200839
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
 -ret: 0         st: 0 flags:1  ts: 2.000000
++ret: 0         st: 0 flags:0  ts:-0.904994
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
 -ret:-1         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1  ts: 1.560000
++ret: 0         st: 0 flags:1  ts: 1.989173
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 182138 size: 12183
+ ret: 0         st:-1 flags:0  ts: 0.883340
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  79103 size: 10909
+ ret:-1         st:-1 flags:1  ts:-0.222493
++ret:-1         st: 0 flags:0  ts: 2.671674
++ret: 0         st: 0 flags:1  ts: 1.565841
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 127925 size: 11918
+ ret: 0         st:-1 flags:0  ts: 0.460008
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  38992 size:  9985
+ ret:-1         st:-1 flags:1  ts:-0.645825
index 0000000,a2427f3..0708cfd
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,46 +1,46 @@@
 -ret: 0         st: 0 flags:0  ts: 0.800000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ ret: 0         st:-1 flags:0  ts:-1.000000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ ret: 0         st:-1 flags:1  ts: 1.894167
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 132607 size: 11970
 -ret:-1         st: 0 flags:1  ts:-0.320000
++ret: 0         st: 0 flags:0  ts: 0.788334
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  82152 size: 10965
 -ret: 0         st: 0 flags:0  ts: 0.360000
++ret:-1         st: 0 flags:1  ts:-0.317499
+ ret:-1         st:-1 flags:0  ts: 2.576668
+ ret: 0         st:-1 flags:1  ts: 1.470835
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 132607 size: 11970
 -ret:-1         st: 0 flags:1  ts:-0.760000
++ret: 0         st: 0 flags:0  ts: 0.365002
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  40546 size: 10045
 -ret: 0         st: 0 flags:0  ts:-0.040000
++ret:-1         st: 0 flags:1  ts:-0.740831
+ ret:-1         st:-1 flags:0  ts: 2.153336
+ ret: 0         st:-1 flags:1  ts: 1.047503
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  82152 size: 10965
 -ret: 0         st: 0 flags:1  ts: 2.840000
++ret: 0         st: 0 flags:0  ts:-0.058330
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
 -ret: 0         st: 0 flags:0  ts:-0.480000
++ret: 0         st: 0 flags:1  ts: 2.835837
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 188429 size: 12232
+ ret: 0         st:-1 flags:0  ts: 1.730004
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 188429 size: 12232
+ ret: 0         st:-1 flags:1  ts: 0.624171
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  40546 size: 10045
 -ret: 0         st: 0 flags:1  ts: 2.400000
++ret: 0         st: 0 flags:0  ts:-0.481662
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
 -ret: 0         st: 0 flags:0  ts:-0.920000
++ret: 0         st: 0 flags:1  ts: 2.412505
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 188429 size: 12232
+ ret: 0         st:-1 flags:0  ts: 1.306672
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 132607 size: 11970
+ ret: 0         st:-1 flags:1  ts: 0.200839
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
 -ret: 0         st: 0 flags:1  ts: 2.000000
++ret: 0         st: 0 flags:0  ts:-0.904994
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
 -ret:-1         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1  ts: 1.560000
++ret: 0         st: 0 flags:1  ts: 1.989173
+ ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 188429 size: 12232
+ ret: 0         st:-1 flags:0  ts: 0.883340
+ ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  82152 size: 10965
+ ret:-1         st:-1 flags:1  ts:-0.222493
++ret:-1         st: 0 flags:0  ts: 2.671674
++ret: 0         st: 0 flags:1  ts: 1.565841
+ ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 132607 size: 11970
+ ret: 0         st:-1 flags:0  ts: 0.460008
+ ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  40546 size: 10045
+ ret:-1         st:-1 flags:1  ts:-0.645825
index 0000000,9a623c2..330dc16
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,46 +1,46 @@@
 -ret: 0         st: 0 flags:0  ts: 0.800000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
+ ret: 0         st:-1 flags:0  ts:-1.000000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
+ ret: 0         st:-1 flags:1  ts: 1.894167
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
 -ret:-1         st: 0 flags:1  ts:-0.320000
++ret: 0         st: 0 flags:0  ts: 0.788334
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 164167 size: 13921
 -ret: 0         st: 0 flags:0  ts: 0.360000
++ret:-1         st: 0 flags:1  ts:-0.317499
+ ret:-1         st:-1 flags:0  ts: 2.576668
+ ret: 0         st:-1 flags:1  ts: 1.470835
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 196681 size: 13159
 -ret:-1         st: 0 flags:1  ts:-0.760000
++ret: 0         st: 0 flags:0  ts: 0.365002
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  98748 size: 29165
 -ret: 0         st: 0 flags:0  ts:-0.040000
++ret:-1         st: 0 flags:1  ts:-0.740831
+ ret:-1         st:-1 flags:0  ts: 2.153336
+ ret: 0         st:-1 flags:1  ts: 1.047503
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 164167 size: 13921
 -ret: 0         st: 0 flags:1  ts: 2.840000
++ret: 0         st: 0 flags:0  ts:-0.058330
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
 -ret: 0         st: 0 flags:0  ts:-0.480000
++ret: 0         st: 0 flags:1  ts: 2.835837
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
+ ret: 0         st:-1 flags:0  ts: 1.730004
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
+ ret: 0         st:-1 flags:1  ts: 0.624171
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  98748 size: 29165
 -ret: 0         st: 0 flags:1  ts: 2.400000
++ret: 0         st: 0 flags:0  ts:-0.481662
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
 -ret: 0         st: 0 flags:0  ts:-0.920000
++ret: 0         st: 0 flags:1  ts: 2.412505
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
+ ret: 0         st:-1 flags:0  ts: 1.306672
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 196681 size: 13159
+ ret: 0         st:-1 flags:1  ts: 0.200839
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
 -ret: 0         st: 0 flags:1  ts: 2.000000
++ret: 0         st: 0 flags:0  ts:-0.904994
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 164167 size: 13921
++ret: 0         st: 0 flags:1  ts: 1.989173
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
+ ret: 0         st:-1 flags:0  ts: 0.883340
 -ret:-1         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1  ts: 1.560000
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 196681 size: 13159
+ ret:-1         st:-1 flags:1  ts:-0.222493
++ret:-1         st: 0 flags:0  ts: 2.671674
++ret: 0         st: 0 flags:1  ts: 1.565841
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 196681 size: 13159
+ ret: 0         st:-1 flags:0  ts: 0.460008
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 164167 size: 13921
+ ret:-1         st:-1 flags:1  ts:-0.645825
index 0000000,f1909b6..c2f9895
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,46 +1,46 @@@
 -ret: 0         st: 0 flags:0  ts: 0.800000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
+ ret: 0         st:-1 flags:0  ts:-1.000000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
+ ret: 0         st:-1 flags:1  ts: 1.894167
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157678 size: 11930
 -ret:-1         st: 0 flags:1  ts:-0.320000
++ret: 0         st: 0 flags:0  ts: 0.788334
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67723 size: 10791
 -ret: 0         st: 0 flags:0  ts: 0.360000
++ret:-1         st: 0 flags:1  ts:-0.317499
+ ret:-1         st:-1 flags:0  ts: 2.576668
+ ret: 0         st:-1 flags:1  ts: 1.470835
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110080 size: 11697
 -ret:-1         st: 0 flags:1  ts:-0.760000
++ret: 0         st: 0 flags:0  ts: 0.365002
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  30744 size:  9980
 -ret: 0         st: 0 flags:0  ts:-0.040000
++ret:-1         st: 0 flags:1  ts:-0.740831
+ ret:-1         st:-1 flags:0  ts: 2.153336
+ ret: 0         st:-1 flags:1  ts: 1.047503
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67723 size: 10791
 -ret: 0         st: 0 flags:1  ts: 2.840000
++ret: 0         st: 0 flags:0  ts:-0.058330
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
 -ret: 0         st: 0 flags:0  ts:-0.480000
++ret: 0         st: 0 flags:1  ts: 2.835837
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157678 size: 11930
+ ret: 0         st:-1 flags:0  ts: 1.730004
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157678 size: 11930
+ ret: 0         st:-1 flags:1  ts: 0.624171
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  30744 size:  9980
 -ret: 0         st: 0 flags:1  ts: 2.400000
++ret: 0         st: 0 flags:0  ts:-0.481662
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
 -ret: 0         st: 0 flags:0  ts:-0.920000
++ret: 0         st: 0 flags:1  ts: 2.412505
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157678 size: 11930
+ ret: 0         st:-1 flags:0  ts: 1.306672
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110080 size: 11697
+ ret: 0         st:-1 flags:1  ts: 0.200839
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
 -ret: 0         st: 0 flags:1  ts: 2.000000
++ret: 0         st: 0 flags:0  ts:-0.904994
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67723 size: 10791
++ret: 0         st: 0 flags:1  ts: 1.989173
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157678 size: 11930
+ ret: 0         st:-1 flags:0  ts: 0.883340
 -ret:-1         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1  ts: 1.560000
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110080 size: 11697
+ ret:-1         st:-1 flags:1  ts:-0.222493
++ret:-1         st: 0 flags:0  ts: 2.671674
++ret: 0         st: 0 flags:1  ts: 1.565841
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110080 size: 11697
+ ret: 0         st:-1 flags:0  ts: 0.460008
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67723 size: 10791
+ ret:-1         st:-1 flags:1  ts:-0.645825
index 0000000,d8c9e28..24ee04f
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,46 +1,46 @@@
 -ret: 0         st: 0 flags:0  ts: 0.800000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ ret: 0         st:-1 flags:0  ts:-1.000000
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ ret: 0         st:-1 flags:1  ts: 1.894167
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158225 size: 12232
 -ret:-1         st: 0 flags:1  ts:-0.320000
++ret: 0         st: 0 flags:0  ts: 0.788334
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67790 size: 10965
 -ret: 0         st: 0 flags:0  ts: 0.360000
++ret:-1         st: 0 flags:1  ts:-0.317499
+ ret:-1         st:-1 flags:0  ts: 2.576668
+ ret: 0         st:-1 flags:1  ts: 1.470835
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110330 size: 11970
 -ret:-1         st: 0 flags:1  ts:-0.760000
++ret: 0         st: 0 flags:0  ts: 0.365002
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  30747 size: 10045
 -ret: 0         st: 0 flags:0  ts:-0.040000
++ret:-1         st: 0 flags:1  ts:-0.740831
+ ret:-1         st:-1 flags:0  ts: 2.153336
+ ret: 0         st:-1 flags:1  ts: 1.047503
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67790 size: 10965
 -ret: 0         st: 0 flags:1  ts: 2.840000
++ret: 0         st: 0 flags:0  ts:-0.058330
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
 -ret: 0         st: 0 flags:0  ts:-0.480000
++ret: 0         st: 0 flags:1  ts: 2.835837
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158225 size: 12232
+ ret: 0         st:-1 flags:0  ts: 1.730004
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158225 size: 12232
+ ret: 0         st:-1 flags:1  ts: 0.624171
+ ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  30747 size: 10045
 -ret: 0         st: 0 flags:1  ts: 2.400000
++ret: 0         st: 0 flags:0  ts:-0.481662
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
 -ret: 0         st: 0 flags:0  ts:-0.920000
++ret: 0         st: 0 flags:1  ts: 2.412505
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158225 size: 12232
+ ret: 0         st:-1 flags:0  ts: 1.306672
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110330 size: 11970
+ ret: 0         st:-1 flags:1  ts: 0.200839
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
 -ret: 0         st: 0 flags:1  ts: 2.000000
++ret: 0         st: 0 flags:0  ts:-0.904994
+ ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
 -ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67790 size: 10965
++ret: 0         st: 0 flags:1  ts: 1.989173
+ ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158225 size: 12232
+ ret: 0         st:-1 flags:0  ts: 0.883340
 -ret:-1         st: 0 flags:0  ts: 2.680000
 -ret: 0         st: 0 flags:1  ts: 1.560000
++ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110330 size: 11970
+ ret:-1         st:-1 flags:1  ts:-0.222493
++ret:-1         st: 0 flags:0  ts: 2.671674
++ret: 0         st: 0 flags:1  ts: 1.565841
+ ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110330 size: 11970
+ ret: 0         st:-1 flags:0  ts: 0.460008
+ ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67790 size: 10965
+ ret:-1         st:-1 flags:1  ts:-0.645825
@@@ -20,16 -19,10 +20,12 @@@ this="$test.$test_ref
  outfile="$datadir/$test_ref/"
  
  # various files
 -avconv="$target_exec ${target_path}/avconv"
 +ffmpeg="$target_exec ${target_path}/ffmpeg"
- tiny_psnr="tests/tiny_psnr"
  raw_src="${target_path}/$raw_src_dir/%02d.pgm"
  raw_dst="$datadir/$this.out.yuv"
- raw_ref="$datadir/$test_ref.ref.yuv"
  pcm_src="$target_datadir/asynth1.sw"
- pcm_dst="$datadir/$this.out.wav"
- pcm_ref="$datadir/$test_ref.ref.wav"
 +pcm_src_1ch="$target_datadir/asynth-16000-1.wav"
 +pcm_ref_1ch="$datadir/$test_ref-16000-1.ref.wav"
  crcfile="$datadir/$this.crc"
  target_crcfile="$target_datadir/$this.crc"
  
@@@ -65,30 -58,9 +61,24 @@@ do_avconv(
      set -- $* ${target_path}/$f
      run_avconv $*
      do_md5sum $f
-     if [ $f = $raw_dst ] ; then
-         $tiny_psnr $f $raw_ref
-     elif [ $f = $pcm_dst ] ; then
-         $tiny_psnr $f $pcm_ref 2
-     else
-         echo $(wc -c $f)
-     fi
+     echo $(wc -c $f)
  }
  
 +do_avconv_nomd5()
 +{
 +    f="$1"
 +    shift
 +    set -- $* ${target_path}/$f
 +    run_avconv $*
 +    if [ $f = $raw_dst ] ; then
 +        $tiny_psnr $f $raw_ref
 +    elif [ $f = $pcm_dst ] ; then
 +        $tiny_psnr $f $pcm_ref 2
 +    else
 +        echo $(wc -c $f)
 +    fi
 +}
 +
  do_avconv_crc()
  {
      f="$1"
      run_avconv $* -f crc "$target_crcfile"
      echo "$f $(cat $crcfile)"
  }
- do_video_decoding()
- {
-     do_avconv $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS -vsync 0 $2
- }
- do_video_encoding()
- {
-     file=${outfile}$1
-     do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2
- }
 +
- do_audio_encoding()
- {
-     file=${outfile}$1
-     do_avconv $file $DEC_OPTS -ac 2 -ar 44100 -f s16le -i $pcm_src -ab 128k $ENC_OPTS $2
- }
- do_audio_decoding()
- {
-     do_avconv $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav $1
- }
 +do_video_encoding_nomd5()
 +{
 +    file=${outfile}$1
 +    do_avconv_nomd5 $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2
 +}
 +
 +do_audio_decoding_nomd5()
 +{
 +    do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav $1
 +}
Simple merge
diff --cc tests/utils.c
Simple merge
Simple merge