Right now those muxers use the default timebase in all cases(1/90000).
This patch avoid unnecessary rescaling and makes the printed timestamps
more readable.
Also, extend the printed information to include the timebases and packet
pts/duration and align the columns.
Obviously changes the results of all fate tests which use those two
muxers.
---
libavformat/Makefile | 4 +-
libavformat/framecrcenc.c | 5 +-
libavformat/framehash.c | 33 +
libavformat/internal.h | 6 +
libavformat/md5enc.c | 5 +-
tests/ref/fate/4xm-1 | 31 +-
tests/ref/fate/4xm-2 | 349 +-
tests/ref/fate/8bps | 72 +-
tests/ref/fate/aasc | 47 +-
tests/ref/fate/adpcm-ea-mad-ea-r1 | 384 ++--
tests/ref/fate/adpcm-ea-tqi | 104 +-
tests/ref/fate/adpcm-psx-str-v3 | 75 +-
tests/ref/fate/adpcm-thp | 288 +-
tests/ref/fate/alg-mm | 63 +-
tests/ref/fate/amv | 642 ++--
tests/ref/fate/ansi | 35 +-
tests/ref/fate/armovie-escape124 | 210 +-
tests/ref/fate/auravision-v1 | 49 +-
tests/ref/fate/auravision-v2 | 5 +-
tests/ref/fate/bethsoft-vid | 284 +-
tests/ref/fate/bfi | 230 +-
tests/ref/fate/bink-video | 41 +-
tests/ref/fate/bmv | 86 +-
tests/ref/fate/cdgraphics | 601 ++--
tests/ref/fate/cljr | 73 +-
tests/ref/fate/corepng | 76 +-
tests/ref/fate/creatureshock-avs | 186 +-
tests/ref/fate/cscd | 417 ++--
tests/ref/fate/cvid-grayscale | 305 +-
tests/ref/fate/cvid-palette | 113 +-
tests/ref/fate/cvid-partial | 157 +-
tests/ref/fate/cyberia-c93 | 86 +-
tests/ref/fate/cyuv | 301 +-
tests/ref/fate/d-cinema-demux | 9 +-
tests/ref/fate/delphine-cin | 368 ++--
tests/ref/fate/deluxepaint-anm | 247 +-
tests/ref/fate/dfa1 | 51 +-
tests/ref/fate/dfa10 | 17 +-
tests/ref/fate/dfa11 | 19 +-
tests/ref/fate/dfa2 | 35 +-
tests/ref/fate/dfa3 | 21 +-
tests/ref/fate/dfa4 | 27 +-
tests/ref/fate/dfa5 | 31 +-
tests/ref/fate/dfa6 | 25 +-
tests/ref/fate/dfa7 | 25 +-
tests/ref/fate/dfa8 | 73 +-
tests/ref/fate/dfa9 | 13 +-
tests/ref/fate/dpcm-idroq | 756 +++---
tests/ref/fate/dpx | 3 +-
tests/ref/fate/dxa-feeble | 130 +-
tests/ref/fate/dxa-scummvm | 25 +-
tests/ref/fate/dxtory | 4 +-
tests/ref/fate/ea-cmv | 389 ++--
tests/ref/fate/ea-dct | 536 ++--
tests/ref/fate/ea-mad-pcm-planar | 586 ++--
tests/ref/fate/ea-tgq | 557 ++--
tests/ref/fate/ea-tgv-ima-ea-eacs | 190 +-
tests/ref/fate/ea-tgv-ima-ea-sead | 176 +-
tests/ref/fate/ea-vp60 | 267 +-
tests/ref/fate/ea-vp61 | 241 +-
tests/ref/fate/film-cvid-pcm-stereo-8bit | 280 +-
tests/ref/fate/flic-af11-palette-change | 233 +-
tests/ref/fate/flic-af12 | 55 +-
tests/ref/fate/flic-magiccarpet | 85 +-
tests/ref/fate/fraps-v0 | 41 +-
tests/ref/fate/fraps-v1 | 3 +-
tests/ref/fate/fraps-v2 | 21 +-
tests/ref/fate/fraps-v3 | 19 +-
tests/ref/fate/fraps-v4 | 15 +-
tests/ref/fate/fraps-v5 | 117 +-
tests/ref/fate/frwu | 21 +-
tests/ref/fate/g722dec-1 | 335 +-
tests/ref/fate/gsm-ms | 179 +-
tests/ref/fate/gsm-toast | 1001 +++---
tests/ref/fate/h264-conformance-aud_mw_e | 201 +-
tests/ref/fate/h264-conformance-ba1_ft_c | 599 ++--
tests/ref/fate/h264-conformance-ba1_sony_d | 35 +-
tests/ref/fate/h264-conformance-ba2_sony_f | 601 ++--
tests/ref/fate/h264-conformance-ba3_sva_c | 67 +-
tests/ref/fate/h264-conformance-ba_mw_d | 201 +-
tests/ref/fate/h264-conformance-bamq1_jvc_c | 61 +-
tests/ref/fate/h264-conformance-bamq2_jvc_c | 61 +-
tests/ref/fate/h264-conformance-banm_mw_d | 201 +-
tests/ref/fate/h264-conformance-basqp1_sony_c | 9 +-
tests/ref/fate/h264-conformance-caba1_sony_d | 101 +-
tests/ref/fate/h264-conformance-caba1_sva_b | 35 +-
tests/ref/fate/h264-conformance-caba2_sony_e | 601 ++--
tests/ref/fate/h264-conformance-caba2_sva_b | 35 +-
tests/ref/fate/h264-conformance-caba3_sony_c | 601 ++--
tests/ref/fate/h264-conformance-caba3_sva_b | 67 +-
tests/ref/fate/h264-conformance-caba3_toshiba_e | 601 ++--
.../ref/fate/h264-conformance-cabac_mot_fld0_full | 61 +-
.../ref/fate/h264-conformance-cabac_mot_frm0_full | 61 +-
.../fate/h264-conformance-cabac_mot_mbaff0_full | 61 +-
.../fate/h264-conformance-cabac_mot_picaff0_full | 61 +-
tests/ref/fate/h264-conformance-cabaci3_sony_b | 601 ++--
tests/ref/fate/h264-conformance-cabast3_sony_e | 51 +-
tests/ref/fate/h264-conformance-cabastbr3_sony_b | 51 +-
tests/ref/fate/h264-conformance-cabref3_sand_d | 101 +-
tests/ref/fate/h264-conformance-cacqp3_sony_d | 101 +-
tests/ref/fate/h264-conformance-cafi1_sva_c | 67 +-
tests/ref/fate/h264-conformance-cama1_sony_c | 11 +-
tests/ref/fate/h264-conformance-cama1_toshiba_b | 181 +-
tests/ref/fate/h264-conformance-cama1_vtc_c | 9 +-
tests/ref/fate/h264-conformance-cama2_vtc_b | 9 +-
tests/ref/fate/h264-conformance-cama3_sand_e | 101 +-
tests/ref/fate/h264-conformance-cama3_vtc_b | 9 +-
tests/ref/fate/h264-conformance-camaci3_sony_c | 35 +-
tests/ref/fate/h264-conformance-camanl1_toshiba_b | 181 +-
tests/ref/fate/h264-conformance-camanl2_toshiba_b | 181 +-
tests/ref/fate/h264-conformance-camanl3_sand_e | 101 +-
tests/ref/fate/h264-conformance-camasl3_sony_b | 35 +-
tests/ref/fate/h264-conformance-camp_mot_mbaff_l30 | 61 +-
tests/ref/fate/h264-conformance-camp_mot_mbaff_l31 | 61 +-
tests/ref/fate/h264-conformance-canl1_sony_e | 101 +-
tests/ref/fate/h264-conformance-canl1_sva_b | 35 +-
tests/ref/fate/h264-conformance-canl1_toshiba_g | 601 ++--
tests/ref/fate/h264-conformance-canl2_sony_e | 601 ++--
tests/ref/fate/h264-conformance-canl2_sva_b | 35 +-
tests/ref/fate/h264-conformance-canl3_sony_c | 601 ++--
tests/ref/fate/h264-conformance-canl3_sva_b | 35 +-
tests/ref/fate/h264-conformance-canl4_sva_b | 67 +-
tests/ref/fate/h264-conformance-canlma2_sony_c | 35 +-
tests/ref/fate/h264-conformance-canlma3_sony_c | 35 +-
tests/ref/fate/h264-conformance-capa1_toshiba_b | 181 +-
tests/ref/fate/h264-conformance-capama3_sand_f | 101 +-
tests/ref/fate/h264-conformance-capcm1_sand_e | 61 +-
tests/ref/fate/h264-conformance-capcmnl1_sand_e | 61 +-
tests/ref/fate/h264-conformance-capm3_sony_d | 601 ++--
tests/ref/fate/h264-conformance-caqp1_sony_b | 101 +-
.../fate/h264-conformance-cavlc_mot_fld0_full_b | 61 +-
.../fate/h264-conformance-cavlc_mot_frm0_full_b | 61 +-
.../fate/h264-conformance-cavlc_mot_mbaff0_full_b | 61 +-
.../fate/h264-conformance-cavlc_mot_picaff0_full_b | 61 +-
tests/ref/fate/h264-conformance-cawp1_toshiba_e | 181 +-
tests/ref/fate/h264-conformance-cawp5_toshiba_e | 181 +-
tests/ref/fate/h264-conformance-ci1_ft_b | 583 ++--
tests/ref/fate/h264-conformance-ci_mw_d | 201 +-
tests/ref/fate/h264-conformance-cvbs3_sony_c | 601 ++--
tests/ref/fate/h264-conformance-cvcanlma2_sony_c | 35 +-
tests/ref/fate/h264-conformance-cvfi1_sony_d | 35 +-
tests/ref/fate/h264-conformance-cvfi1_sva_c | 15 +-
tests/ref/fate/h264-conformance-cvfi2_sony_h | 35 +-
tests/ref/fate/h264-conformance-cvfi2_sva_c | 27 +-
tests/ref/fate/h264-conformance-cvma1_sony_d | 11 +-
tests/ref/fate/h264-conformance-cvma1_toshiba_b | 181 +-
tests/ref/fate/h264-conformance-cvmanl1_toshiba_b | 181 +-
tests/ref/fate/h264-conformance-cvmanl2_toshiba_b | 181 +-
tests/ref/fate/h264-conformance-cvmapaqp3_sony_e | 17 +-
tests/ref/fate/h264-conformance-cvmaqp2_sony_g | 35 +-
tests/ref/fate/h264-conformance-cvmaqp3_sony_d | 35 +-
tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b | 61 +-
tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b | 61 +-
tests/ref/fate/h264-conformance-cvnlfi1_sony_c | 35 +-
tests/ref/fate/h264-conformance-cvnlfi2_sony_h | 35 +-
tests/ref/fate/h264-conformance-cvpa1_toshiba_b | 181 +-
tests/ref/fate/h264-conformance-cvpcmnl1_sva_c | 61 +-
tests/ref/fate/h264-conformance-cvpcmnl2_sva_c | 5 +-
tests/ref/fate/h264-conformance-cvwp1_toshiba_e | 181 +-
tests/ref/fate/h264-conformance-cvwp2_toshiba_e | 181 +-
tests/ref/fate/h264-conformance-cvwp3_toshiba_e | 181 +-
tests/ref/fate/h264-conformance-cvwp5_toshiba_e | 181 +-
tests/ref/fate/h264-conformance-fi1_sony_e | 35 +-
.../fate/h264-conformance-frext-alphaconformanceg | 87 +-
tests/ref/fate/h264-conformance-frext-bcrm_freh10 | 201 +-
tests/ref/fate/h264-conformance-frext-brcm_freh11 | 201 +-
tests/ref/fate/h264-conformance-frext-brcm_freh3 | 201 +-
tests/ref/fate/h264-conformance-frext-brcm_freh4 | 201 +-
tests/ref/fate/h264-conformance-frext-brcm_freh5 | 201 +-
tests/ref/fate/h264-conformance-frext-brcm_freh8 | 201 +-
tests/ref/fate/h264-conformance-frext-brcm_freh9 | 201 +-
tests/ref/fate/h264-conformance-frext-freh12_b | 201 +-
tests/ref/fate/h264-conformance-frext-freh1_b | 201 +-
tests/ref/fate/h264-conformance-frext-freh2_b | 201 +-
tests/ref/fate/h264-conformance-frext-freh6 | 201 +-
tests/ref/fate/h264-conformance-frext-freh7_b | 201 +-
.../ref/fate/h264-conformance-frext-frext01_jvc_d | 33 +-
.../ref/fate/h264-conformance-frext-frext02_jvc_c | 33 +-
.../fate/h264-conformance-frext-frext1_panasonic_c | 17 +-
.../fate/h264-conformance-frext-frext2_panasonic_b | 31 +-
.../fate/h264-conformance-frext-frext3_panasonic_d | 23 +-
.../fate/h264-conformance-frext-frext4_panasonic_a | 21 +-
.../fate/h264-conformance-frext-frext_mmco4_sony_b | 121 +-
tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b | 21 +-
tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c | 21 +-
tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a | 21 +-
tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a | 21 +-
tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a | 21 +-
.../ref/fate/h264-conformance-frext-hcamff1_hhi_b | 21 +-
tests/ref/fate/h264-conformance-frext-hpca_brcm_c | 601 ++--
.../ref/fate/h264-conformance-frext-hpcadq_brcm_b | 601 ++--
.../ref/fate/h264-conformance-frext-hpcafl_bcrm_c | 601 ++--
.../fate/h264-conformance-frext-hpcaflnl_bcrm_c | 601 ++--
.../ref/fate/h264-conformance-frext-hpcalq_brcm_b | 601 ++--
.../fate/h264-conformance-frext-hpcamapalq_bcrm_b | 601 ++--
.../fate/h264-conformance-frext-hpcamolq_brcm_b | 201 +-
.../ref/fate/h264-conformance-frext-hpcanl_brcm_c | 601 ++--
.../fate/h264-conformance-frext-hpcaq2lq_brcm_b | 201 +-
tests/ref/fate/h264-conformance-frext-hpcv_brcm_a | 601 ++--
.../ref/fate/h264-conformance-frext-hpcvfl_bcrm_a | 601 ++--
.../fate/h264-conformance-frext-hpcvflnl_bcrm_a | 601 ++--
.../fate/h264-conformance-frext-hpcvmolq_brcm_b | 201 +-
.../ref/fate/h264-conformance-frext-hpcvnl_brcm_a | 601 ++--
.../h264-conformance-frext-pph10i1_panasonic_a | 21 +-
.../h264-conformance-frext-pph10i2_panasonic_a | 21 +-
.../h264-conformance-frext-pph10i3_panasonic_a | 21 +-
.../h264-conformance-frext-pph10i4_panasonic_a | 21 +-
.../h264-conformance-frext-pph10i5_panasonic_a | 21 +-
.../h264-conformance-frext-pph10i6_panasonic_a | 21 +-
.../h264-conformance-frext-pph10i7_panasonic_a | 21 +-
tests/ref/fate/h264-conformance-hcbp2_hhi_a | 501 ++--
tests/ref/fate/h264-conformance-hcmp1_hhi_a | 501 ++--
tests/ref/fate/h264-conformance-ls_sva_d | 3401 ++++++++++----------
tests/ref/fate/h264-conformance-midr_mw_d | 201 +-
tests/ref/fate/h264-conformance-mps_mw_a | 301 +-
tests/ref/fate/h264-conformance-mr1_bt_a | 125 +-
tests/ref/fate/h264-conformance-mr1_mw_a | 301 +-
tests/ref/fate/h264-conformance-mr2_mw_a | 601 ++--
tests/ref/fate/h264-conformance-mr2_tandberg_e | 601 ++--
tests/ref/fate/h264-conformance-mr3_tandberg_b | 601 ++--
tests/ref/fate/h264-conformance-mr4_tandberg_c | 601 ++--
tests/ref/fate/h264-conformance-mr5_tandberg_c | 601 ++--
tests/ref/fate/h264-conformance-mr6_bt_b | 121 +-
tests/ref/fate/h264-conformance-mr7_bt_b | 121 +-
tests/ref/fate/h264-conformance-mr8_bt_b | 117 +-
tests/ref/fate/h264-conformance-mr9_bt_b | 117 +-
tests/ref/fate/h264-conformance-mv1_brcm_d | 515 ++--
tests/ref/fate/h264-conformance-nl1_sony_d | 35 +-
tests/ref/fate/h264-conformance-nl2_sony_h | 601 ++--
tests/ref/fate/h264-conformance-nl3_sva_e | 67 +-
tests/ref/fate/h264-conformance-nlmq1_jvc_c | 61 +-
tests/ref/fate/h264-conformance-nlmq2_jvc_c | 61 +-
tests/ref/fate/h264-conformance-nrf_mw_e | 201 +-
tests/ref/fate/h264-conformance-sharp_mp_field_1_b | 31 +-
tests/ref/fate/h264-conformance-sharp_mp_field_2_b | 31 +-
tests/ref/fate/h264-conformance-sharp_mp_field_3_b | 31 +-
tests/ref/fate/h264-conformance-sharp_mp_paff_1r2 | 31 +-
tests/ref/fate/h264-conformance-sharp_mp_paff_2r | 31 +-
tests/ref/fate/h264-conformance-sl1_sva_b | 67 +-
tests/ref/fate/h264-conformance-sva_ba1_b | 35 +-
tests/ref/fate/h264-conformance-sva_ba2_d | 35 +-
tests/ref/fate/h264-conformance-sva_base_b | 35 +-
tests/ref/fate/h264-conformance-sva_cl1_e | 101 +-
tests/ref/fate/h264-conformance-sva_fm1_e | 35 +-
tests/ref/fate/h264-conformance-sva_nl1_b | 35 +-
tests/ref/fate/h264-conformance-sva_nl2_e | 35 +-
tests/ref/fate/h264-extreme-plane-pred | 201 +-
tests/ref/fate/h264-interlace-crop | 7 +-
tests/ref/fate/h264-lossless | 21 +-
tests/ref/fate/id-cin-video | 212 +-
tests/ref/fate/iff-byterun1 | 3 +-
tests/ref/fate/iff-ilbm | 3 +-
tests/ref/fate/indeo2 | 261 +-
tests/ref/fate/indeo3 | 81 +-
tests/ref/fate/indeo4 | 201 +-
tests/ref/fate/indeo5 | 269 +-
tests/ref/fate/interplay-mve-16bit | 260 +-
tests/ref/fate/interplay-mve-8bit | 470 ++--
tests/ref/fate/iv8-demux | 51 +-
tests/ref/fate/kmvc | 151 +-
tests/ref/fate/lmlm4-demux | 432 ++--
tests/ref/fate/loco-rgb | 11 +-
tests/ref/fate/loco-yuy2 | 7 +-
tests/ref/fate/mimic | 153 +-
tests/ref/fate/mjpegb | 21 +-
tests/ref/fate/motionpixels | 223 +-
tests/ref/fate/mpeg2-field-enc | 63 +-
tests/ref/fate/msmpeg4v1 | 101 +-
tests/ref/fate/msrle-8bit | 59 +-
tests/ref/fate/msvideo1-16bit | 61 +-
tests/ref/fate/msvideo1-8bit | 63 +-
tests/ref/fate/mszh | 3 +-
tests/ref/fate/mtv | 272 +-
tests/ref/fate/mxf-demux | 196 +-
tests/ref/fate/nc-demux | 183 +-
tests/ref/fate/nsv-demux | 344 +-
tests/ref/fate/nuv | 56 +-
tests/ref/fate/pcm_dvd | 247 +-
tests/ref/fate/pictor | 3 +-
tests/ref/fate/prores-422 | 5 +-
tests/ref/fate/prores-422_hq | 5 +-
tests/ref/fate/prores-422_lt | 5 +-
tests/ref/fate/prores-422_proxy | 5 +-
tests/ref/fate/prores-alpha | 5 +-
tests/ref/fate/psx-str | 402 ++--
tests/ref/fate/psx-str-v3-mdec | 119 +-
tests/ref/fate/ptx | 3 +-
tests/ref/fate/pva-demux | 52 +-
tests/ref/fate/qpeg | 201 +-
tests/ref/fate/qtrle-16bit | 167 +-
tests/ref/fate/qtrle-1bit | 216 +-
tests/ref/fate/qtrle-24bit | 69 +-
tests/ref/fate/qtrle-2bit | 216 +-
tests/ref/fate/qtrle-32bit | 53 +-
tests/ref/fate/qtrle-4bit | 77 +-
tests/ref/fate/qtrle-8bit | 335 +-
tests/ref/fate/quickdraw | 5 +-
tests/ref/fate/r210 | 7 +-
tests/ref/fate/real-rv40 | 481 ++--
tests/ref/fate/redcode-demux | 12 +-
tests/ref/fate/rl2 | 217 +-
tests/ref/fate/rpza | 61 +-
tests/ref/fate/rv30 | 219 +-
tests/ref/fate/sierra-vmd | 666 ++--
tests/ref/fate/siff | 80 +-
tests/ref/fate/smacker | 374 ++--
tests/ref/fate/smc | 241 +-
tests/ref/fate/smjpeg | 848 +++---
tests/ref/fate/sp5x | 40 +-
tests/ref/fate/sunraster-1bit-raw | 3 +-
tests/ref/fate/sunraster-1bit-rle | 3 +-
tests/ref/fate/sunraster-24bit-raw | 3 +-
tests/ref/fate/sunraster-24bit-rle | 3 +-
tests/ref/fate/sunraster-8bit-raw | 3 +-
tests/ref/fate/sunraster-8bit-rle | 3 +-
tests/ref/fate/svq1 | 301 +-
tests/ref/fate/svq3 | 361 ++--
tests/ref/fate/targa-conformance-CBW8 | 3 +-
tests/ref/fate/targa-conformance-CCM8 | 3 +-
tests/ref/fate/targa-conformance-CTC16 | 3 +-
tests/ref/fate/targa-conformance-CTC24 | 3 +-
tests/ref/fate/targa-conformance-CTC32 | 3 +-
tests/ref/fate/targa-conformance-UBW8 | 3 +-
tests/ref/fate/targa-conformance-UCM8 | 3 +-
tests/ref/fate/targa-conformance-UTC16 | 3 +-
tests/ref/fate/targa-conformance-UTC24 | 3 +-
tests/ref/fate/targa-conformance-UTC32 | 3 +-
tests/ref/fate/targa-top-to-bottom | 3 +-
tests/ref/fate/tiertex-seq | 198 +-
tests/ref/fate/tiff-fax-g3 | 3 +-
tests/ref/fate/tiff-fax-g3s | 3 +-
tests/ref/fate/tmv | 442 ++--
tests/ref/fate/truemotion1-15 | 438 ++--
tests/ref/fate/truemotion1-24 | 88 +-
tests/ref/fate/truemotion2 | 61 +-
tests/ref/fate/tscc-15bit | 482 ++--
tests/ref/fate/tscc-32bit | 313 +-
tests/ref/fate/txd-16bpp | 23 +-
tests/ref/fate/txd-pal8 | 3 +-
tests/ref/fate/ulti | 125 +-
tests/ref/fate/utvideo_rgb_left | 9 +-
tests/ref/fate/utvideo_rgb_median | 11 +-
tests/ref/fate/utvideo_rgba_left | 11 +-
tests/ref/fate/utvideo_rgba_median | 11 +-
tests/ref/fate/utvideo_yuv420_left | 15 +-
tests/ref/fate/utvideo_yuv420_median | 9 +-
tests/ref/fate/utvideo_yuv422_left | 9 +-
tests/ref/fate/utvideo_yuv422_median | 9 +-
tests/ref/fate/v210 | 3 +-
tests/ref/fate/v410dec | 3 +-
tests/ref/fate/vble | 9 +-
tests/ref/fate/vc1-ism | 241 +-
tests/ref/fate/vc1_sa00040 | 31 +-
tests/ref/fate/vc1_sa00050 | 61 +-
tests/ref/fate/vc1_sa10091 | 61 +-
tests/ref/fate/vc1_sa20021 | 121 +-
tests/ref/fate/vcr1 | 257 +-
tests/ref/fate/videoxl | 81 +-
tests/ref/fate/vmnc-16bit | 385 ++--
tests/ref/fate/vmnc-32bit | 99 +-
tests/ref/fate/vp3-coeff-level64 | 17 +-
tests/ref/fate/vp31 | 229 +-
tests/ref/fate/vp5 | 493 ++--
tests/ref/fate/vp6a | 187 +-
tests/ref/fate/vp6f | 349 +-
tests/ref/fate/vp8-sign-bias | 19 +-
tests/ref/fate/vp8-test-vector-001 | 59 +-
tests/ref/fate/vp8-test-vector-002 | 99 +-
tests/ref/fate/vp8-test-vector-003 | 99 +-
tests/ref/fate/vp8-test-vector-004 | 59 +-
tests/ref/fate/vp8-test-vector-005 | 99 +-
tests/ref/fate/vp8-test-vector-006 | 97 +-
tests/ref/fate/vp8-test-vector-007 | 59 +-
tests/ref/fate/vp8-test-vector-008 | 5 +-
tests/ref/fate/vp8-test-vector-009 | 99 +-
tests/ref/fate/vp8-test-vector-010 | 115 +-
tests/ref/fate/vp8-test-vector-011 | 59 +-
tests/ref/fate/vp8-test-vector-012 | 59 +-
tests/ref/fate/vp8-test-vector-013 | 59 +-
tests/ref/fate/vp8-test-vector-014 | 99 +-
tests/ref/fate/vp8-test-vector-015 | 521 ++--
tests/ref/fate/vp8-test-vector-016 | 59 +-
tests/ref/fate/vp8-test-vector-017 | 59 +-
tests/ref/fate/vqa-cc | 158 +-
tests/ref/fate/vqf-demux | 2 +-
tests/ref/fate/wc3movie-xan | 142 +-
tests/ref/fate/wmv8-drm | 261 +-
tests/ref/fate/wmv8-drm-nodec | 302 +-
tests/ref/fate/wnv1 | 173 +-
tests/ref/fate/wtv-demux | 280 +-
tests/ref/fate/xmv-demux | 364 ++--
tests/ref/fate/xxan-wc4 | 43 +-
tests/ref/fate/yop | 15 +-
tests/ref/fate/zlib | 3 +-
tests/ref/fate/zmbv-15bit | 319 +-
tests/ref/fate/zmbv-16bit | 319 +-
tests/ref/fate/zmbv-32bit | 319 +-
tests/ref/fate/zmbv-8bit | 551 ++--
398 files changed, 34088 insertions(+), 33602 deletions(-)
create mode 100644 libavformat/framehash.c
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 06718d2..0d6cb91 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -89,8 +89,8 @@ OBJS-$(CONFIG_FLIC_DEMUXER) += flic.o
OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.o
OBJS-$(CONFIG_FLV_MUXER) += flvenc.o avc.o
OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o
-OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o
-OBJS-$(CONFIG_FRAMEMD5_MUXER) += md5enc.o
+OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o framehash.o
+OBJS-$(CONFIG_FRAMEMD5_MUXER) += md5enc.o framehash.o
OBJS-$(CONFIG_GIF_MUXER) += gif.o
OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o
OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o
diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c
index d845e79..7549afc 100644
--- a/libavformat/framecrcenc.c
+++ b/libavformat/framecrcenc.c
@@ -21,13 +21,15 @@
#include "libavutil/adler32.h"
#include "avformat.h"
+#include "internal.h"
static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
{
uint32_t crc = av_adler32_update(0, pkt->data, pkt->size);
char buf[256];
- snprintf(buf, sizeof(buf), "%d, %"PRId64", %d, 0x%08x\n",
pkt->stream_index, pkt->dts, pkt->size, crc);
+ snprintf(buf, sizeof(buf), "%d, %8"PRId64", %8"PRId64", %8d, %8d,
0x%08x\n",
+ pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size,
crc);
avio_write(s->pb, buf, strlen(buf));
avio_flush(s->pb);
return 0;
@@ -39,6 +41,7 @@ AVOutputFormat ff_framecrc_muxer = {
.extensions = "",
.audio_codec = CODEC_ID_PCM_S16LE,
.video_codec = CODEC_ID_RAWVIDEO,
+ .write_header = ff_framehash_write_header,
.write_packet = framecrc_write_packet,
.flags = AVFMT_VARIABLE_FPS,
};
diff --git a/libavformat/framehash.c b/libavformat/framehash.c
new file mode 100644
index 0000000..28e9e84
--- /dev/null
+++ b/libavformat/framehash.c
@@ -0,0 +1,33 @@
+/*
+ * Common functions for the frame{crc,md5} muxers
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "internal.h"
+
+int ff_framehash_write_header(AVFormatContext *s)
+{
+ int i;
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+ avpriv_set_pts_info(st, 64, st->codec->time_base.num,
st->codec->time_base.den);
+ avio_printf(s->pb, "#tb %d: %d/%d\n", i, st->time_base.num,
st->time_base.den);
+ avio_flush(s->pb);
+ }
+ return 0;
+}
diff --git a/libavformat/internal.h b/libavformat/internal.h
index 559e710..322dff9 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -307,4 +307,10 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels,
uint64_t channel_layout, int32_t sample_rate,
int32_t width, int32_t height);
+/**
+ * Set the timebase for each stream from the corresponding codec timebase and
+ * print it.
+ */
+int ff_framehash_write_header(AVFormatContext *s);
+
#endif /* AVFORMAT_INTERNAL_H */
diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c
index 4509c18..e971e32 100644
--- a/libavformat/md5enc.c
+++ b/libavformat/md5enc.c
@@ -21,6 +21,7 @@
#include "libavutil/md5.h"
#include "avformat.h"
+#include "internal.h"
#define PRIVSIZE 512
@@ -90,7 +91,8 @@ static int framemd5_write_packet(struct AVFormatContext *s,
AVPacket *pkt)
av_md5_init(s->priv_data);
av_md5_update(s->priv_data, pkt->data, pkt->size);
- snprintf(buf, sizeof(buf) - 64, "%d, %"PRId64", %d, ", pkt->stream_index,
pkt->dts, pkt->size);
+ snprintf(buf, sizeof(buf) - 64, "%d, %8"PRId64", %8"PRId64", %8d, %8d, ",
+ pkt->stream_index, pkt->dts, pkt->pts, pkt->duration, pkt->size);
md5_finish(s, buf);
return 0;
}
@@ -102,6 +104,7 @@ AVOutputFormat ff_framemd5_muxer = {
.priv_data_size = PRIVSIZE,
.audio_codec = CODEC_ID_PCM_S16LE,
.video_codec = CODEC_ID_RAWVIDEO,
+ .write_header = ff_framehash_write_header,
.write_packet = framemd5_write_packet,
.flags = AVFMT_VARIABLE_FPS,
};
diff --git a/tests/ref/fate/8bps b/tests/ref/fate/8bps
index 30ec8c5..0bc325f 100644
--- a/tests/ref/fate/8bps
+++ b/tests/ref/fate/8bps
@@ -1,35 +1,37 @@
-0, 0, 259200, 0x7e91df07
-1, 0, 2048, 0x3d042426
-1, 4180, 2048, 0x5bcae456
-0, 7200, 259200, 0x7e91df07
-1, 8359, 2048, 0xb6043655
-1, 12539, 2048, 0x6fdaffad
-0, 14400, 259200, 0xc468c119
-1, 16718, 2048, 0xf86700cb
-1, 20898, 2048, 0x045e46c1
-0, 21600, 259200, 0x0e058930
-1, 25078, 2048, 0x000df0e5
-0, 28800, 259200, 0xa0261310
-1, 29257, 2048, 0x8f5f12fb
-1, 33437, 2048, 0xd516f6b0
-0, 36000, 259200, 0x78ca9aba
-1, 37616, 2048, 0xa1fe2bd3
-1, 41796, 2048, 0x3647087a
-0, 43200, 259200, 0x4971f7b3
-1, 45976, 2048, 0xd2ee584e
-1, 50155, 2048, 0xf132088c
-0, 50400, 259200, 0x7dc2cff7
-1, 54335, 2048, 0x1efc0eb1
-0, 57600, 259200, 0x8cbc53d5
-1, 58514, 2048, 0xeb73f402
-1, 62694, 2048, 0x75cb3d20
-0, 64800, 259200, 0xcccd77e3
-1, 66873, 2048, 0x85a501b6
-1, 71053, 2048, 0xa4eb312d
-0, 72000, 259200, 0x6b3e0fb3
-1, 75233, 2048, 0xf0aaf8c7
-0, 79200, 259200, 0x281dd175
-1, 79412, 2048, 0x65371cda
-1, 83592, 2048, 0x25512cd6
-1, 87771, 2048, 0xc81410e3
-1, 91951, 514, 0x57d77b94
+#tb 0: 2/25
+#tb 1: 1/22050
+0, 0, 0, 1, 259200, 0x7e91df07
+1, 0, 0, 1024, 2048, 0x3d042426
+1, 1024, 1024, 1024, 2048, 0x5bcae456
+0, 1, 1, 1, 259200, 0x7e91df07
+1, 2048, 2048, 1024, 2048, 0xb6043655
+1, 3072, 3072, 1024, 2048, 0x6fdaffad
+0, 2, 2, 1, 259200, 0xc468c119
+1, 4096, 4096, 1024, 2048, 0xf86700cb
+1, 5120, 5120, 1024, 2048, 0x045e46c1
+0, 3, 3, 1, 259200, 0x0e058930
+1, 6144, 6144, 1024, 2048, 0x000df0e5
+0, 4, 4, 1, 259200, 0xa0261310
+1, 7168, 7168, 1024, 2048, 0x8f5f12fb
+1, 8192, 8192, 1024, 2048, 0xd516f6b0
+0, 5, 5, 1, 259200, 0x78ca9aba
+1, 9216, 9216, 1024, 2048, 0xa1fe2bd3
+1, 10240, 10240, 1024, 2048, 0x3647087a
+0, 6, 6, 1, 259200, 0x4971f7b3
+1, 11264, 11264, 1024, 2048, 0xd2ee584e
+1, 12288, 12288, 1024, 2048, 0xf132088c
+0, 7, 7, 1, 259200, 0x7dc2cff7
+1, 13312, 13312, 1024, 2048, 0x1efc0eb1
+0, 8, 8, 1, 259200, 0x8cbc53d5
+1, 14336, 14336, 1024, 2048, 0xeb73f402
+1, 15360, 15360, 1024, 2048, 0x75cb3d20
+0, 9, 9, 1, 259200, 0xcccd77e3
+1, 16384, 16384, 1024, 2048, 0x85a501b6
+1, 17408, 17408, 1024, 2048, 0xa4eb312d
+0, 10, 10, 1, 259200, 0x6b3e0fb3
+1, 18432, 18432, 1024, 2048, 0xf0aaf8c7
+0, 11, 11, 1, 259200, 0x281dd175
+1, 19456, 19456, 1024, 2048, 0x65371cda
+1, 20480, 20480, 1024, 2048, 0x25512cd6
+1, 21504, 21504, 1024, 2048, 0xc81410e3
+1, 22528, 22528, 257, 514, 0x57d77b94
--
1.7.7.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
