Unified · Split
| @@ -20,6 +20,16 @@ do_lavf() · 19 unmodified lines | ||
| 20 | 20 | do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3 |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | +do_lavf_timecode_nodrop() { do_lavf $1 "$2 -timecode 02:56:14:13"; } | |
| 24 | +do_lavf_timecode_drop() { do_lavf $1 "$2 -timecode 02:56:14.13 -r 30000/1001"; } | |
| 25 | + | |
| 26 | +do_lavf_timecode() | |
| 27 | +{ | |
| 28 | + do_lavf_timecode_nodrop "$@" | |
| 29 | + do_lavf_timecode_drop "$@" | |
| 30 | + do_lavf "$@" | |
| 31 | +} | |
| 32 | + | |
| 23 | 33 | do_streamed_images() |
| 24 | 34 | { |
| 25 | 35 | file=${outfile}${1}pipe.$1 |
| @@ -61,11 +71,11 @@ do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 441 · 35 unmodified lines | ||
| 61 | 71 | fi |
| 62 | 72 | |
| 63 | 73 | if [ -n "$do_mpg" ] ; then |
| 64 | −do_lavf mpg "-ab 64k" | |
| 74 | +do_lavf_timecode mpg "-ab 64k" | |
| 65 | 75 | fi |
| 66 | 76 | |
| 67 | 77 | if [ -n "$do_mxf" ] ; then |
| 68 | −do_lavf mxf "-ar 48000 -bf 2 -timecode 02:56:14:13" | |
| 78 | +do_lavf_timecode mxf "-ar 48000 -bf 2" | |
| 69 | 79 | fi |
| 70 | 80 | |
| 71 | 81 | if [ -n "$do_mxf_d10" ]; then |
| @@ -89,14 +99,18 @@ do_lavf flv -an · 17 unmodified lines | ||
| 89 | 99 | fi |
| 90 | 100 | |
| 91 | 101 | if [ -n "$do_mov" ] ; then |
| 92 | −do_lavf mov "-acodec pcm_alaw -vcodec mpeg4" | |
| 102 | +do_lavf_timecode mov "-acodec pcm_alaw -vcodec mpeg4" | |
| 93 | 103 | fi |
| 94 | 104 | |
| 95 | 105 | if [ -n "$do_dv_fmt" ] ; then |
| 106 | +do_lavf_timecode_nodrop dv "-ar 48000 -r 25 -s pal -ac 2" | |
| 107 | +do_lavf_timecode_drop dv "-ar 48000 -pix_fmt yuv411p -s ntsc -ac 2" | |
| 96 | 108 | do_lavf dv "-ar 48000 -r 25 -s pal -ac 2" |
| 97 | 109 | fi |
| 98 | 110 | |
| 99 | 111 | if [ -n "$do_gxf" ] ; then |
| 112 | +do_lavf_timecode_nodrop gxf "-ar 48000 -r 25 -s pal -ac 1" | |
| 113 | +do_lavf_timecode_drop gxf "-ar 48000 -s ntsc -ac 1" | |
| 100 | 114 | do_lavf gxf "-ar 48000 -r 25 -s pal -ac 1" |
| 101 | 115 | fi |
| 102 | 116 | |
| @@ -1,3 +1,9 @@ | ||
| 1 | +6f9cfff48f536fa727696f2f9fb3ac08 *./tests/data/lavf/lavf.dv | |
| 2 | +3600000 ./tests/data/lavf/lavf.dv | |
| 3 | +./tests/data/lavf/lavf.dv CRC=0x5ce4e5e4 | |
| 4 | +cc33ae4f9e6828914dea0f09d1241b7e *./tests/data/lavf/lavf.dv | |
| 5 | +3480000 ./tests/data/lavf/lavf.dv | |
| 6 | +./tests/data/lavf/lavf.dv CRC=0x8d5e9e8f | |
| 1 | 7 | 3a6a9163a67b729b4a6b5d972ccceb97 *./tests/data/lavf/lavf.dv |
| 2 | 8 | 3600000 ./tests/data/lavf/lavf.dv |
| 3 | 9 | ./tests/data/lavf/lavf.dv CRC=0x5ce4e5e4 |
| @@ -1,3 +1,9 @@ | ||
| 1 | +befc1a39c37a4ecd9264942a3e34b3f6 *./tests/data/lavf/lavf.gxf | |
| 2 | +796392 ./tests/data/lavf/lavf.gxf | |
| 3 | +./tests/data/lavf/lavf.gxf CRC=0x102918fd | |
| 4 | +267d2b2b6e357209d76c366302cf35c3 *./tests/data/lavf/lavf.gxf | |
| 5 | +794572 ./tests/data/lavf/lavf.gxf | |
| 6 | +./tests/data/lavf/lavf.gxf CRC=0xab47d02d | |
| 1 | 7 | 1c1693cf2358025f1e37ac76e1da925a *./tests/data/lavf/lavf.gxf |
| 2 | 8 | 796392 ./tests/data/lavf/lavf.gxf |
| 3 | 9 | ./tests/data/lavf/lavf.gxf CRC=0x102918fd |
| @@ -1,3 +1,9 @@ | ||
| 1 | 1 | 9a0b239ff596da58debcf210dece3985 *./tests/data/lavf/lavf.mov |
| 2 | 2 | 357821 ./tests/data/lavf/lavf.mov |
| 3 | 3 | ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 |
| 4 | +cea874222a6d40b1761d75ea11ebe681 *./tests/data/lavf/lavf.mov | |
| 5 | +367251 ./tests/data/lavf/lavf.mov | |
| 6 | +./tests/data/lavf/lavf.mov CRC=0xab307eb9 | |
| 7 | +9a0b239ff596da58debcf210dece3985 *./tests/data/lavf/lavf.mov | |
| 8 | +357821 ./tests/data/lavf/lavf.mov | |
| 9 | +./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 | |
| @@ -1,3 +1,9 @@ | ||
| 1 | +6103dbae73aec6c9bf05bbbc6ea35f89 *./tests/data/lavf/lavf.mpg | |
| 2 | +372736 ./tests/data/lavf/lavf.mpg | |
| 3 | +./tests/data/lavf/lavf.mpg CRC=0xf361ed74 | |
| 4 | +91b42dd3352e21dd0dee57f6a7241ca2 *./tests/data/lavf/lavf.mpg | |
| 5 | +387072 ./tests/data/lavf/lavf.mpg | |
| 6 | +./tests/data/lavf/lavf.mpg CRC=0x3d6ddf56 | |
| 1 | 7 | dd60652c2193670abffb8c2a123a820e *./tests/data/lavf/lavf.mpg |
| 2 | 8 | 372736 ./tests/data/lavf/lavf.mpg |
| 3 | 9 | ./tests/data/lavf/lavf.mpg CRC=0xf361ed74 |
| @@ -1,3 +1,9 @@ | ||
| 1 | 1 | 785e38ddd2466046f30aa36399b8f8fa *./tests/data/lavf/lavf.mxf |
| 2 | 2 | 525881 ./tests/data/lavf/lavf.mxf |
| 3 | −./tests/data/lavf/lavf.mxf CRC=0x4ace0849 | |
| 3 | +./tests/data/lavf/lavf.mxf CRC=0x4ace0849 | |
| 4 | +ccaa42c75e653f71604fd28c7c83722d *./tests/data/lavf/lavf.mxf | |
| 5 | +537657 ./tests/data/lavf/lavf.mxf | |
| 6 | +./tests/data/lavf/lavf.mxf CRC=0x9b928d6b | |
| 7 | +c78207030d57b48295b089916849d50d *./tests/data/lavf/lavf.mxf | |
| 8 | +525881 ./tests/data/lavf/lavf.mxf | |
| 9 | +./tests/data/lavf/lavf.mxf CRC=0x4ace0849 | |