[FFmpeg-cvslog] rawenc: switch to encode2().

Anton Khirnov git at videolan.org
Fri Feb 10 01:47:52 CET 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Feb  1 15:33:51 2012 +0100| [cd1ad18a6539bd7fc2dc4c1740fbcbd498c0c0a2] | committer: Anton Khirnov

rawenc: switch to encode2().

This changes a number of FATE results, since before this commit, the
timestamps in all tests using rawenc were made up by lavf.

In most cases, the previous timestamps were completely bogus.

In some other cases -- raw formats, mostly h264 -- the new timestamps
are bogus as well. The only difference is that timestamps invented by
the muxer are replaced by timestamps invented by the demuxer.

cscd     -- avconv sets output codec timebase from r_frame_rate
and r_frame_rate is in this case some guessed number 31.42 (377/12),
which is not accurate enough to represent all timestamps. This results
in some frames having duplicate pts. Therefore, vsync 0 needs to be
changed to vsync 2 and avconv drops two frames. A proper fix in the
future would be to set output timebase to something saner in avconv.

nuv      -- previous timestamps for video were wrong AND the cscd
comment applies, one frame is dropped.

vp8-signbias -- the file contains two frames with identical timestamps,
so -vsync 0 needs to be removed/changed to -vsync 2 and avconv drops one
frame.

vc1-ism -- apparrently either the demuxer lies about timestamps or the
file is broken, since dts == pts on all packets, but reordering clearly
takes place.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd1ad18a6539bd7fc2dc4c1740fbcbd498c0c0a2
---

 libavcodec/rawenc.c                                |   25 +-
 tests/fate/screen.mak                              |    3 +-
 tests/fate/video.mak                               |    3 +-
 tests/fate/vpx.mak                                 |    4 +-
 tests/ref/fate/bethsoft-vid                        |  140 +++---
 tests/ref/fate/cscd                                |  328 ++++++------
 tests/ref/fate/deluxepaint-anm                     |  106 ++--
 tests/ref/fate/dfa4                                |   16 +-
 tests/ref/fate/ea-cmv                              |  388 +++++++-------
 tests/ref/fate/film-cvid-pcm-stereo-8bit           |  218 ++++----
 .../ref/fate/h264-conformance-cabac_mot_fld0_full  |   60 +-
 .../fate/h264-conformance-cabac_mot_picaff0_full   |   60 +-
 tests/ref/fate/h264-conformance-cabref3_sand_d     |  100 ++--
 tests/ref/fate/h264-conformance-cafi1_sva_c        |   66 ++--
 tests/ref/fate/h264-conformance-cama1_vtc_c        |    8 +-
 tests/ref/fate/h264-conformance-cama2_vtc_b        |    8 +-
 tests/ref/fate/h264-conformance-cama3_vtc_b        |    8 +-
 tests/ref/fate/h264-conformance-capa1_toshiba_b    |  180 +++---
 tests/ref/fate/h264-conformance-capama3_sand_f     |  100 ++--
 .../fate/h264-conformance-cavlc_mot_fld0_full_b    |   60 +-
 .../fate/h264-conformance-cavlc_mot_picaff0_full_b |   60 +-
 tests/ref/fate/h264-conformance-cvfi1_sony_d       |   34 +-
 tests/ref/fate/h264-conformance-cvfi1_sva_c        |   14 +-
 tests/ref/fate/h264-conformance-cvfi2_sony_h       |   34 +-
 tests/ref/fate/h264-conformance-cvfi2_sva_c        |   26 +-
 tests/ref/fate/h264-conformance-cvmapaqp3_sony_e   |   16 +-
 tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b |   60 +-
 tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b |   60 +-
 tests/ref/fate/h264-conformance-cvnlfi1_sony_c     |   34 +-
 tests/ref/fate/h264-conformance-cvnlfi2_sony_h     |   34 +-
 tests/ref/fate/h264-conformance-cvpa1_toshiba_b    |  180 +++---
 tests/ref/fate/h264-conformance-fi1_sony_e         |   34 +-
 tests/ref/fate/h264-conformance-frext-bcrm_freh10  |  200 ++++----
 tests/ref/fate/h264-conformance-frext-brcm_freh11  |  200 ++++----
 tests/ref/fate/h264-conformance-frext-brcm_freh4   |  200 ++++----
 tests/ref/fate/h264-conformance-frext-freh6        |  200 ++++----
 tests/ref/fate/h264-conformance-frext-freh7_b      |  200 ++++----
 .../fate/h264-conformance-frext-frext2_panasonic_b |   30 +-
 .../fate/h264-conformance-frext-frext4_panasonic_a |   20 +-
 tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b |   20 +-
 .../ref/fate/h264-conformance-frext-hpcafl_bcrm_c  |  600 ++++++++++----------
 .../fate/h264-conformance-frext-hpcaflnl_bcrm_c    |  600 ++++++++++----------
 .../fate/h264-conformance-frext-hpcamapalq_bcrm_b  |  600 ++++++++++----------
 .../ref/fate/h264-conformance-frext-hpcvfl_bcrm_a  |  600 ++++++++++----------
 .../fate/h264-conformance-frext-hpcvflnl_bcrm_a    |  600 ++++++++++----------
 tests/ref/fate/h264-conformance-mr3_tandberg_b     |  582 ++++++++++----------
 tests/ref/fate/h264-conformance-mr6_bt_b           |  120 ++--
 tests/ref/fate/h264-conformance-mr7_bt_b           |  100 ++--
 tests/ref/fate/h264-conformance-mr8_bt_b           |  116 ++--
 tests/ref/fate/h264-conformance-mr9_bt_b           |   96 ++--
 tests/ref/fate/h264-conformance-sharp_mp_field_1_b |   30 +-
 tests/ref/fate/h264-conformance-sharp_mp_field_2_b |   30 +-
 tests/ref/fate/h264-conformance-sharp_mp_field_3_b |   30 +-
 tests/ref/fate/h264-conformance-sharp_mp_paff_1r2  |   30 +-
 tests/ref/fate/h264-conformance-sharp_mp_paff_2r   |   30 +-
 tests/ref/fate/mimic                               |  150 +++---
 tests/ref/fate/mpeg2-field-enc                     |   62 +-
 tests/ref/fate/nuv                                 |   17 +-
 tests/ref/fate/quickdraw                           |    2 +-
 tests/ref/fate/real-rv40                           |    2 +-
 tests/ref/fate/sierra-vmd                          |  126 ++--
 tests/ref/fate/tiertex-seq                         |   40 +-
 tests/ref/fate/tscc-32bit                          |  166 +++---
 tests/ref/fate/vc1-ism                             |  238 ++++----
 tests/ref/fate/vc1_sa00040                         |   14 +-
 tests/ref/fate/vc1_sa00050                         |   30 +-
 tests/ref/fate/vc1_sa10091                         |   26 +-
 tests/ref/fate/vc1_sa20021                         |   62 +-
 tests/ref/fate/vmnc-32bit                          |   88 ++--
 tests/ref/fate/vp8-sign-bias                       |   13 +-
 tests/ref/fate/wmv8-drm                            |  258 +++++-----
 tests/ref/lavf/gxf                                 |    2 +-
 72 files changed, 4504 insertions(+), 4493 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commitdiff;h=cd1ad18a6539bd7fc2dc4c1740fbcbd498c0c0a2


More information about the ffmpeg-cvslog mailing list