]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'eb8a8115994434b548523cf0bca6a4a74784e79c'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 17:19:03 +0000 (14:19 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 17:19:03 +0000 (14:19 -0300)
* commit 'eb8a8115994434b548523cf0bca6a4a74784e79c':
  tests: Convert audio-only lavf tests to non-legacy test scripts

Merged-by: James Almer <jamrial@gmail.com>
24 files changed:
1  2 
tests/Makefile
tests/fate-run.sh
tests/fate/avformat.mak
tests/fate/lavf-audio.mak
tests/fate/seek.mak
tests/lavf-regression.sh
tests/ref/lavf/aiff
tests/ref/lavf/ast
tests/ref/lavf/au
tests/ref/lavf/caf
tests/ref/lavf/ircam
tests/ref/lavf/mka
tests/ref/lavf/mmf
tests/ref/lavf/ogg
tests/ref/lavf/peak.wav
tests/ref/lavf/peak_only.wav
tests/ref/lavf/s16.voc
tests/ref/lavf/tta
tests/ref/lavf/voc
tests/ref/lavf/w64
tests/ref/lavf/wav
tests/ref/lavf/wv
tests/ref/seek/lavf-al
tests/ref/seek/lavf-ul

diff --cc tests/Makefile
Simple merge
index 2d5dbf2f47d67aca725a0576ac2cae2dd8ad5ff0,b20e013d6b66bfbf6f811a0f558c7145b8f12578..e65184ba36d25eb50e3bd69a066cff43ccbb0926
@@@ -209,44 -152,11 +209,45 @@@ enc_dec()
      tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
  }
  
 +transcode(){
 +    src_fmt=$1
 +    srcfile=$2
 +    enc_fmt=$3
 +    enc_opt=$4
 +    final_decode=$5
 +    encfile="${outdir}/${test}.${enc_fmt}"
 +    test "$7" = -keep || cleanfiles="$cleanfiles $encfile"
 +    tsrcfile=$(target_path $srcfile)
 +    tencfile=$(target_path $encfile)
 +    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 $DEC_OPTS -i $encfile $ENC_OPTS $FLAGS $final_decode \
 +        -f framecrc - || return
 +}
 +
 +stream_remux(){
 +    src_fmt=$1
 +    srcfile=$2
 +    enc_fmt=$3
 +    stream_maps=$4
 +    final_decode=$5
 +    encfile="${outdir}/${test}.${enc_fmt}"
 +    test "$7" = -keep || cleanfiles="$cleanfiles $encfile"
 +    tsrcfile=$(target_path $srcfile)
 +    tencfile=$(target_path $encfile)
 +    ffmpeg -f $src_fmt -i $tsrcfile $stream_maps -codec copy $FLAGS \
 +        -f $enc_fmt -y $tencfile || return
 +    ffmpeg $DEC_OPTS -i $encfile $ENC_OPTS $FLAGS $final_decode \
 +        -f framecrc - || return
 +}
 +
  # FIXME: There is a certain duplication between the avconv-related helper
  # functions above and below that should be refactored.
 -avconv2="$target_exec ${target_path}/avconv"
 +ffmpeg2="$target_exec ${target_path}/ffmpeg"
  raw_src="${target_path}/tests/vsynth1/%02d.pgm"
+ pcm_src="${target_path}/tests/data/asynth1.sw"
  crcfile="tests/data/$test.lavf.crc"
  target_crcfile="${target_path}/$crcfile"
  
@@@ -281,6 -189,14 +282,14 @@@ do_avconv_crc()
      echo "$f $(cat $crcfile)"
  }
  
 -    do_avconv $file $DEC_OPTS $1 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $2
+ lavf_audio(){
+     t="${test#lavf-}"
+     outdir="tests/data/lavf"
+     file=${outdir}/lavf.$t
++    do_avconv $file $DEC_OPTS $1 -ar 44100 -f s16le -i $pcm_src "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 $2
+     do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
+ }
  lavf_image2pipe(){
      t="${test#lavf-}"
      t="${t%pipe}"
index a0eaeefbe01cbe9a261d4d4b345ede6021f2108f,d840227914818825ff2a2ed18a293edf7400f201..31d828d0e40df9929cef09eea6d420205bb4c67f
@@@ -1,60 -1,30 +1,40 @@@
- FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AIFF)               += aiff
- FATE_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)           += alaw
 +FATE_LAVF-$(call ENCDEC,  APNG,                  APNG)               += apng
  FATE_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)                += asf
- FATE_LAVF-$(call ENCDEC,  PCM_S16BE_PLANAR,      AST)                += ast
- FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AU)                 += au
  FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)                += avi
  FATE_LAVF-$(call ENCDEC,  BMP,                   IMAGE2)             += bmp
- FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             CAF)                += caf
  FATE_LAVF-$(call ENCDEC,  DPX,                   IMAGE2)             += dpx
  FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)                += dv_fmt
 +FATE_LAVF-$(call ENCDEC,  FITS,                  FITS)               += fits
 +FATE_LAVF-$(call ENCDEC,  RAWVIDEO,              FILMSTRIP)          += flm
  FATE_LAVF-$(call ENCDEC,  FLV,                   FLV)                += flv_fmt
  FATE_LAVF-$(call ENCDEC,  GIF,                   IMAGE2)             += gif
  FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)                += gxf
- FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             IRCAM)              += ircam
  FATE_LAVF-$(call ENCDEC,  MJPEG,                 IMAGE2)             += jpg
- FATE_LAVF-$(call ENCMUX,  TTA,                   MATROSKA_AUDIO)     += mka
  FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)           += mkv
- FATE_LAVF-$(call ENCDEC,  ADPCM_YAMAHA,          MMF)                += mmf
 -FATE_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)                += mov
 +FATE_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)                += mov ismv
  FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
- FATE_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)          += mulaw
  FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)                += mxf
  FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF)        += mxf_d10
 +FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)                += mxf_dv25
 +FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)                += mxf_dvcpro50
 +FATE_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF)     += mxf_opatom
 +FATE_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF)     += mxf_opatom_audio
  FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)                += nut
- FATE_LAVF-$(call ENCDEC,  FLAC,                  OGG)                += ogg
  FATE_LAVF-$(call ENCDEC,  PAM,                   IMAGE2)             += pam
  FATE_LAVF-$(call ENCDEC,  PCX,                   IMAGE2)             += pcx
  FATE_LAVF-$(call ENCDEC,  PGM,                   IMAGE2)             += pgm
  FATE_LAVF-$(call ENCDEC,  PNG,                   IMAGE2)             += png
  FATE_LAVF-$(call ENCDEC,  PPM,                   IMAGE2)             += ppm
  FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
- FATE_LAVF-$(call ENCDEC,  PCM_U8,                RSO)                += rso
  FATE_LAVF-$(call ENCDEC,  SGI,                   IMAGE2)             += sgi
- FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             SOX)                += sox
 +FATE_LAVF-$(call ENCMUX,  MJPEG PCM_S16LE,       SMJPEG)             += smjpeg
  FATE_LAVF-$(call ENCDEC,  SUNRAST,               IMAGE2)             += sunrast
  FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)                += swf
  FATE_LAVF-$(call ENCDEC,  TARGA,                 IMAGE2)             += tga
  FATE_LAVF-$(call ENCDEC,  TIFF,                  IMAGE2)             += tiff
  FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)             += ts
- FATE_LAVF-$(call ENCDEC,  TTA,                   TTA)                += tta
- FATE_LAVF-$(call ENCDEC,  PCM_U8,                VOC)                += voc
- FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             VOC)                += voc_s16
- FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav
- FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav_peak
- FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav_peak_only
- FATE_LAVF-$(call ENCMUX,  PCM_S16LE,             W64)                += w64
 +FATE_LAVF-$(call ENCDEC,  MP2,                   WTV)                += wtv
- FATE_LAVF-$(call ENCDEC,  WAVPACK,               WV)                 += wv
 +FATE_LAVF-$(call ENCDEC,  XBM,                   IMAGE2)             += xbm
  FATE_LAVF-$(call ENCDEC,  XWD,                   IMAGE2)             += xwd
  FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                               += yuv4mpeg
  
index 0000000000000000000000000000000000000000,13440e42a1d6fddacaa5957ffdeb4cd171ffacb7..0be7a3a050110cfd7de8fd8bf053eca76d561552
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,24 +1,38 @@@
+ FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16BE,    AIFF)             += aiff
+ FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_ALAW,     PCM_ALAW)         += al
++FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16BE_PLANAR, AST)          += ast
+ FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16BE,    AU)               += au
++FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16BE,    CAF)              += caf
+ FATE_LAVF_AUDIO-$(call ENCDEC,  ADPCM_YAMAHA, MMF)              += mmf
+ FATE_LAVF_AUDIO-$(call ENCDEC,  FLAC,         OGG)              += ogg
+ FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_U8,       RSO)              += rso
+ FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    SOX)              += sox
+ FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_MULAW,    PCM_MULAW)        += ul
+ FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_U8,       VOC)              += voc
++FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    IRCAM)            += ircam
+ FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    VOC)              += s16.voc
+ FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    WAV)              += wav
++FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    WAV)              += peak.wav
++FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    WAV)              += peak_only.wav
++FATE_LAVF_AUDIO-$(call ENCDEC,  PCM_S16LE,    W64)              += w64
++FATE_LAVF_AUDIO-$(call ENCDEC,  TTA,          TTA)              += tta
++FATE_LAVF_AUDIO-$(call ENCMUX,  TTA,          MATROSKA_AUDIO)   += mka
++FATE_LAVF_AUDIO-$(call ENCDEC,  WAVPACK,      WV)               += wv
+ FATE_LAVF_AUDIO = $(FATE_LAVF_AUDIO-yes:%=fate-lavf-%)
+ $(FATE_LAVF_AUDIO): CMD = lavf_audio
+ $(FATE_LAVF_AUDIO): REF = $(SRC_PATH)/tests/ref/lavf/$(@:fate-lavf-%=%)
+ $(FATE_LAVF_AUDIO): $(AREF)
+ fate-lavf-al fate-lavf-ul: CMD = lavf_audio "" "" "-ar 44100"
+ fate-lavf-ogg: CMD = lavf_audio "" "-c:a flac"
+ fate-lavf-s16.voc: CMD = lavf_audio "-ac 2" "-c:a pcm_s16le"
++fate-lavf-ast: CMD = lavf_audio "-ac 2" "-loopstart 1 -loopend 10"
++fate-lavf-mka: CMD = lavf_audio "" "-c:a tta"
++fate-lavf-voc: CMD = lavf_audio "" "-c:a pcm_u8"
++fate-lavf-peak.wav: CMD = lavf_audio "" "-write_peak on"
++fate-lavf-peak_only.wav: CMD = lavf_audio "" "-write_peak only"
+ FATE_AVCONV += $(FATE_LAVF_AUDIO)
+ fate-lavf-audio fate-lavf: $(FATE_LAVF_AUDIO)
index 6a9f843d828db5cf4003a4e0024b6e9b848e93f1,e232d6af5a49c193cbf4d9e603ba7be366981e23..0df87d8982d70b706c19723fc98800765f204dc2
@@@ -176,13 -159,9 +176,13 @@@ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4
  FATE_SEEK_LAVF-$(call ENCDEC,  ADPCM_YAMAHA,          MMF)         += mmf
  FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)         += mov
  FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
- FATE_SEEK_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)   += mulaw
+ FATE_SEEK_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)   += ul
  FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)         += mxf
  FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
 +FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)         += mxf_dv25
 +FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)         += mxf_dvcpro50
 +FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom
 +FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio
  FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)         += nut
  FATE_SEEK_LAVF-$(call ENCDEC,  FLAC,                  OGG)         += ogg
  FATE_SEEK_LAVF-$(call ENCDEC,  PBM,                   IMAGE2PIPE)  += pbmpipe
@@@ -199,11 -178,10 +199,11 @@@ FATE_SEEK_LAVF-$(call ENCDEC,  TIFF
  FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)      += ts
  FATE_SEEK_LAVF-$(call ENCDEC,  PCM_U8,                VOC)         += voc
  FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)         += wav
 +FATE_SEEK_LAVF-$(call ENCDEC,  MP2,                   WTV)         += wtv
  FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                        += yuv4mpeg
  
- fate-seek-lavf-aiff:     SRC = lavf/lavf.aif
- fate-seek-lavf-alaw:     SRC = lavf/lavf.al
+ fate-seek-lavf-aiff:     SRC = lavf/lavf.aiff
+ fate-seek-lavf-al:       SRC = lavf/lavf.al
  fate-seek-lavf-asf:      SRC = lavf/lavf.asf
  fate-seek-lavf-au:       SRC = lavf/lavf.au
  fate-seek-lavf-avi:      SRC = lavf/lavf.avi
@@@ -217,13 -195,9 +217,13 @@@ fate-seek-lavf-mkv:      SRC = lavf/lav
  fate-seek-lavf-mmf:      SRC = lavf/lavf.mmf
  fate-seek-lavf-mov:      SRC = lavf/lavf.mov
  fate-seek-lavf-mpg:      SRC = lavf/lavf.mpg
- fate-seek-lavf-mulaw:    SRC = lavf/lavf.ul
+ fate-seek-lavf-ul:       SRC = lavf/lavf.ul
  fate-seek-lavf-mxf:      SRC = lavf/lavf.mxf
  fate-seek-lavf-mxf_d10:  SRC = lavf/lavf.mxf_d10
 +fate-seek-lavf-mxf_dv25: SRC = lavf/lavf.mxf_dv25
 +fate-seek-lavf-mxf_dvcpro50: SRC = lavf/lavf.mxf_dvcpro50
 +fate-seek-lavf-mxf_opatom: SRC = lavf/lavf.mxf_opatom
 +fate-seek-lavf-mxf_opatom_audio: SRC = lavf/lavf.mxf_opatom_audio
  fate-seek-lavf-nut:      SRC = lavf/lavf.nut
  fate-seek-lavf-ogg:      SRC = lavf/lavf.ogg
  fate-seek-lavf-pbmpipe:  SRC = lavf/pbmpipe.pbm
index baf2dc76a52f4c8d6575f9a7bc62160f6fd6ccb8,65d28fb29b0304050d536c94daa29269cf7d6765..f5162907226775eb6fc143154300d418d6cabd28
@@@ -50,15 -30,8 +50,8 @@@ do_image_formats(
      echo $(wc -c ${outfile}02.$1)
  }
  
- do_audio_only()
- {
-     file=${outfile}lavf.$1
-     do_avconv $file $DEC_OPTS $2 -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 $3
-     do_avconv_crc $file $DEC_OPTS $4 -i $target_path/$file
- }
  if [ -n "$do_avi" ] ; then
 -do_lavf avi "" "-c:a mp2 -ar 44100"
 +do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k -threads 1"
  fi
  
  if [ -n "$do_asf" ] ; then
@@@ -143,49 -81,11 +136,45 @@@ do_lavf gxf "-ar 48000" "-r 25 -s pal -
  fi
  
  if [ -n "$do_nut" ] ; then
 -do_lavf nut "" "-c:a mp2 -ar 44100"
 +do_lavf nut "" "-acodec mp2 -ab 64k -ar 44100 -threads 1"
  fi
  
- if [ -n "$do_mka" ] ; then
- do_audio_only mka "" "-c:a tta"
- fi
  if [ -n "$do_mkv" ] ; then
 -do_lavf mkv "" "-c:a mp2 -c:v mpeg4 -ar 44100"
 +do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 \
 + -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap -threads 1"
 +do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 -ar 44100 -threads 1"
 +fi
 +
 +if [ -n "$do_mp3" ] ; then
 +do_lavf_fate mp3 "mp3-conformance/he_32khz.bit" "-acodec copy"
 +fi
 +
 +if [ -n "$do_latm" ] ; then
 +do_lavf_fate latm "aac/al04_44.mp4" "-acodec copy"
 +fi
 +
 +if [ -n "$do_ogg_vp3" ] ; then
 +# -idct simple causes different results on different systems
 +DEC_OPTS="$DEC_OPTS -idct auto"
 +do_lavf_fate ogg "vp3/coeff_level64.mkv"
 +fi
 +
 +if [ -n "$do_ogg_vp8" ] ; then
 +do_lavf_fate ogv "vp8/RRSF49-short.webm" "-acodec copy"
 +fi
 +
 +if [ -n "$do_mov_qtrle_mace6" ] ; then
 +DEC_OPTS="$DEC_OPTS -idct auto"
 +do_lavf_fate mov "qtrle/Animation-16Greys.mov"
 +fi
 +
 +if [ -n "$do_avi_cram" ] ; then
 +DEC_OPTS="$DEC_OPTS -idct auto"
 +do_lavf_fate avi "cram/toon.avi"
 +fi
 +
 +if [ -n "$do_wtv" ] ; then
 +do_lavf wtv "" "-acodec mp2 -threads 1"
  fi
  
  
@@@ -305,89 -161,6 +294,10 @@@ if [ -n "$do_sunrast" ] ; the
  do_image_formats sun
  fi
  
- # audio only
- if [ -n "$do_wav" ] ; then
- do_audio_only wav
- fi
- if [ -n "$do_wav_peak" ] ; then
- do_audio_only peak.wav "" "-write_peak on"
- fi
- if [ -n "$do_wav_peak_only" ] ; then
- file=${outfile}lavf.peak_only.wav
- do_avconv $file $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -write_peak only
- fi
- if [ -n "$do_alaw" ] ; then
- do_audio_only al "" "" "-ar 44100"
- fi
- if [ -n "$do_mulaw" ] ; then
- do_audio_only ul "" "" "-ar 44100"
- fi
- if [ -n "$do_au" ] ; then
- do_audio_only au
- fi
- if [ -n "$do_mmf" ] ; then
- do_audio_only mmf
- fi
- if [ -n "$do_aiff" ] ; then
- do_audio_only aif
- fi
- if [ -n "$do_voc" ] ; then
- do_audio_only voc "" "-acodec pcm_u8"
- fi
- if [ -n "$do_voc_s16" ] ; then
- do_audio_only s16.voc "-ac 2" "-acodec pcm_s16le"
- fi
- if [ -n "$do_ogg" ] ; then
- do_audio_only ogg "" "-c:a flac"
- fi
- if [ -n "$do_rso" ] ; then
- do_audio_only rso
- fi
 +if [ -n "$do_smjpeg" ] ; then
 +do_lavf smjpeg "" "-f smjpeg"
 +fi
 +
- if [ -n "$do_sox" ] ; then
- do_audio_only sox
- fi
- if [ -n "$do_tta" ] ; then
- do_audio_only tta
- fi
- if [ -n "$do_caf" ] ; then
- do_audio_only caf
- fi
- if [ -n "$do_ast" ] ; then
- do_audio_only ast "-ac 2" "-loopstart 1 -loopend 10"
- fi
- if [ -n "$do_ircam" ] ; then
- do_audio_only ircam
- fi
- if [ -n "$do_w64" ] ; then
- do_audio_only w64
- fi
- if [ -n "$do_wv" ] ; then
- do_audio_only wv
- fi
  # pix_fmt conversions
  
  if [ -n "$do_pixfmt" ] ; then
index c504c18c4ab2feeb3885d30670a9bf42a1f5b937,479f7d7cea66821b9ed90fa2f63f6550a1be2867..d72ec8515045ca1f5f95df1af94230f64133d85d
@@@ -1,3 -1,3 +1,3 @@@
- 2c129d88acef834e32869145fe792b9c *./tests/data/lavf/lavf.aif
- 88270 ./tests/data/lavf/lavf.aif
- ./tests/data/lavf/lavf.aif CRC=0x3a1da17e
 -9d9e55431800bf6aea46a7d67509da4e *tests/data/lavf/lavf.aiff
 -88254 tests/data/lavf/lavf.aiff
++2c129d88acef834e32869145fe792b9c *tests/data/lavf/lavf.aiff
++88270 tests/data/lavf/lavf.aiff
+ tests/data/lavf/lavf.aiff CRC=0x3a1da17e
index 513c612e765d999f6a535da7156572aae31570e2,0000000000000000000000000000000000000000..2f2e8de46ff80f411d4737591c8a7b6b773c607c
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,3 @@@
- 07f5d23aa8bade984034f7005bd72947 *./tests/data/lavf/lavf.ast
- 177872 ./tests/data/lavf/lavf.ast
- ./tests/data/lavf/lavf.ast CRC=0xe61e3bd0
++07f5d23aa8bade984034f7005bd72947 *tests/data/lavf/lavf.ast
++177872 tests/data/lavf/lavf.ast
++tests/data/lavf/lavf.ast CRC=0xe61e3bd0
index dcd02f335ca3dcf94ce13e63c6a072e2e0bc74bb,49ddd311077385339a63775ef96157ae00deef50..4abedf30955c0d7f021892cc8805630fd3877d6d
@@@ -1,3 -1,3 +1,3 @@@
- 5228ad3783888c45a08dac5ab6118794 *./tests/data/lavf/lavf.au
- 88240 ./tests/data/lavf/lavf.au
- ./tests/data/lavf/lavf.au CRC=0x3a1da17e
 -b9396e3775ea009094e751e7128d614e *tests/data/lavf/lavf.au
 -88224 tests/data/lavf/lavf.au
++5228ad3783888c45a08dac5ab6118794 *tests/data/lavf/lavf.au
++88240 tests/data/lavf/lavf.au
+ tests/data/lavf/lavf.au CRC=0x3a1da17e
index 7b2a67d1c00e2b94345a5367deb02f2f0504bbf5,0000000000000000000000000000000000000000..8488f3fee22a2ea45a18e3fe62ae3c052c8d6ba7
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,3 @@@
- c3c38cba600722c87c0e75bd0688b7fc *./tests/data/lavf/lavf.caf
- 88323 ./tests/data/lavf/lavf.caf
- ./tests/data/lavf/lavf.caf CRC=0x3a1da17e
++c3c38cba600722c87c0e75bd0688b7fc *tests/data/lavf/lavf.caf
++88323 tests/data/lavf/lavf.caf
++tests/data/lavf/lavf.caf CRC=0x3a1da17e
index 47e07098e5e044306674e82aaf2a1aaa82e538ae,0000000000000000000000000000000000000000..7a17fb232bb1394778fb6ae30a9bb537110b6a0e
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,3 @@@
- 45d9a4667030e95d1d8fb6ab012f1aa0 *./tests/data/lavf/lavf.ircam
- 89224 ./tests/data/lavf/lavf.ircam
- ./tests/data/lavf/lavf.ircam CRC=0x3a1da17e
++45d9a4667030e95d1d8fb6ab012f1aa0 *tests/data/lavf/lavf.ircam
++89224 tests/data/lavf/lavf.ircam
++tests/data/lavf/lavf.ircam CRC=0x3a1da17e
index ac0f6cf316f01bd079527aac61dffab1215f3f79,0000000000000000000000000000000000000000..87f5ad8c979e6f5151b687d43d21451cc1e01ab2
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,3 @@@
- 2d9722c0691e140237af0036e3a178b0 *./tests/data/lavf/lavf.mka
- 43684 ./tests/data/lavf/lavf.mka
- ./tests/data/lavf/lavf.mka CRC=0x3a1da17e
++2d9722c0691e140237af0036e3a178b0 *tests/data/lavf/lavf.mka
++43684 tests/data/lavf/lavf.mka
++tests/data/lavf/lavf.mka CRC=0x3a1da17e
index fae95cadd57bbb89bef43de60819bb2174a461a1,fd308a4948b15da6f93aa58ad3c6c780227d9623..36094bc90012d61260433eaa185a875f8cb8d13f
@@@ -1,3 -1,3 +1,3 @@@
- 643fadf7482f6d937ed75ec4f508e4f1 *./tests/data/lavf/lavf.mmf
- 22611 ./tests/data/lavf/lavf.mmf
- ./tests/data/lavf/lavf.mmf CRC=0x8dea1388
 -1a3bbf19a41668c1e928bcafce88ff3e *tests/data/lavf/lavf.mmf
 -22617 tests/data/lavf/lavf.mmf
++643fadf7482f6d937ed75ec4f508e4f1 *tests/data/lavf/lavf.mmf
++22611 tests/data/lavf/lavf.mmf
+ tests/data/lavf/lavf.mmf CRC=0x8dea1388
index a08fb5ed823c88b1a811f0e6f0a095df4967bae3,53724028fa19d33f7a2836d12656d6ecf5f40c22..3ac10e6f7c2267d36c882a6cab780460e49daab7
@@@ -1,3 -1,3 +1,3 @@@
- 81b9366cacb23644c2803585dced9996 *./tests/data/lavf/lavf.ogg
- 13516 ./tests/data/lavf/lavf.ogg
- ./tests/data/lavf/lavf.ogg CRC=0x3a1da17e
 -8ca901bc8d24b80ebe79e387e454d1e9 *tests/data/lavf/lavf.ogg
 -13476 tests/data/lavf/lavf.ogg
++81b9366cacb23644c2803585dced9996 *tests/data/lavf/lavf.ogg
++13516 tests/data/lavf/lavf.ogg
+ tests/data/lavf/lavf.ogg CRC=0x3a1da17e
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..573d53221faab7113c10f3d9ae95dde8aa05dbc1
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,3 @@@
++105805963fb767d00da056f42f32d9f3 *tests/data/lavf/lavf.peak.wav
++89094 tests/data/lavf/lavf.peak.wav
++tests/data/lavf/lavf.peak.wav CRC=0x3a1da17e
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c468731b00c7de2977e5086b19416002b11d3841
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,3 @@@
++f1a8aeeae8069f3992c4d780436c3d23 *tests/data/lavf/lavf.peak_only.wav
++832 tests/data/lavf/lavf.peak_only.wav
++tests/data/lavf/lavf.peak_only.wav
index 0000000000000000000000000000000000000000,6cd6ba914175a4ccb2b08d7f36d6f6ed96db5630..9b17a4c9b92cf49855a89809b57e4618ec7f2bd7
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,3 +1,3 @@@
 -e55a9c632cfeab90bcfb9ff29a71728c *tests/data/lavf/lavf.s16.voc
 -176613 tests/data/lavf/lavf.s16.voc
++db9fa22ff71992bd8b6cc80047223c92 *tests/data/lavf/lavf.s16.voc
++176615 tests/data/lavf/lavf.s16.voc
+ tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0
index d86d097e3db74a6e4f7a3619720dc9312c21e88d,0000000000000000000000000000000000000000..f6fe9d84ff1a212861d2efdfedd674c437e01a24
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,3 @@@
- d86c5cccb2554143d34d1786ab460a31 *./tests/data/lavf/lavf.tta
- 43200 ./tests/data/lavf/lavf.tta
- ./tests/data/lavf/lavf.tta CRC=0x3a1da17e
++d86c5cccb2554143d34d1786ab460a31 *tests/data/lavf/lavf.tta
++43200 tests/data/lavf/lavf.tta
++tests/data/lavf/lavf.tta CRC=0x3a1da17e
index ded8af722752fa2f9808043f351e8739dc355266,2d1fbc73e90e6082e7826a4752b7bfbc533bd05a..0ac933e2f1c09dd0f4788f608c2c5affe69c0319
@@@ -1,3 -1,3 +1,3 @@@
- bb5ad96a5e1b35683d50bf18115db821 *./tests/data/lavf/lavf.voc
- 44305 ./tests/data/lavf/lavf.voc
- ./tests/data/lavf/lavf.voc CRC=0x298fd284
 -ae01db5200e569371d4c27316575344c *tests/data/lavf/lavf.voc
++bb5ad96a5e1b35683d50bf18115db821 *tests/data/lavf/lavf.voc
+ 44305 tests/data/lavf/lavf.voc
+ tests/data/lavf/lavf.voc CRC=0x298fd284
index 26c68688e57a72d7d90be2628abe54903fba149c,0000000000000000000000000000000000000000..2b6bc23aef4a596991a6a75f7ee7f69fe354d904
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,3 @@@
- 82c75c9cb61924fda68d9602ea69c445 *./tests/data/lavf/lavf.w64
- 88304 ./tests/data/lavf/lavf.w64
- ./tests/data/lavf/lavf.w64 CRC=0x3a1da17e
++82c75c9cb61924fda68d9602ea69c445 *tests/data/lavf/lavf.w64
++88304 tests/data/lavf/lavf.w64
++tests/data/lavf/lavf.w64 CRC=0x3a1da17e
index da3bfc24ed80b10c04313b114c9c18fb2a9ab225,e34535e91bf5682e6678872abbcdc8f173a52619..0540eab07cc40aeb3df8e8a5c37b29f855ce98ab
@@@ -1,3 -1,3 +1,3 @@@
- fc958a32b4fca7b1c40cbdaef2d1416e *./tests/data/lavf/lavf.wav
- 88274 ./tests/data/lavf/lavf.wav
- ./tests/data/lavf/lavf.wav CRC=0x3a1da17e
 -41410d9bbe0603740d1c17050746f475 *tests/data/lavf/lavf.wav
 -88246 tests/data/lavf/lavf.wav
++fc958a32b4fca7b1c40cbdaef2d1416e *tests/data/lavf/lavf.wav
++88274 tests/data/lavf/lavf.wav
+ tests/data/lavf/lavf.wav CRC=0x3a1da17e
index 323c5df6d5a725f633f7132cf0c7ab47152da395,0000000000000000000000000000000000000000..07205093f3c31b985d8d3086d3618485b05f21e8
mode 100644,000000..100644
--- /dev/null
@@@ -1,3 -1,0 +1,3 @@@
- 47d9a381d9c3f99b8b059f3b17f1dc11 *./tests/data/lavf/lavf.wv
- 59560 ./tests/data/lavf/lavf.wv
- ./tests/data/lavf/lavf.wv CRC=0x3a1da17e
++47d9a381d9c3f99b8b059f3b17f1dc11 *tests/data/lavf/lavf.wv
++59560 tests/data/lavf/lavf.wv
++tests/data/lavf/lavf.wv CRC=0x3a1da17e
Simple merge
Simple merge