Commit Graph

53 Commits

Author SHA1 Message Date
Michael Niedermayer
c55780dcef Merge remote branch 'qatar/master'
* qatar/master: (32 commits)
  libopencore-amr, libvo-amrwbenc: Allow enabling DTX via private AVOptions
  libopencore-amr, libvo-amrwbenc: Only check the bitrate when changed
  libopencore-amr, libvo-amrwbenc: Find the closest matching bitrate
  libvo-*: Fix up the long codec names
  libavcodec: Mark AVCodec->priv_class const
  swscale: Factorize FAST_BGR2YV12 definition.
  libvo-aacenc: Only produce extradata if the global header flag is set
  lavf: postpone removal of public metadata conversion API
  lavc: postpone removal of request_channels
  lavc: postpone removal of audioconvert and sample_fmt wrappers
  lavf: postpone removal of deprecated avio functions
  libopencore-amr: Cosmetics: Rewrap and align
  libopencore-amr, libvo-amrbwenc: Rename variables and functions
  libopencore-amr: Convert commented out debug logging into av_dlog
  libopencore-amr: Remove an unused state variable
  libvo-amrwbenc: Don't explicitly store bitrate modes in the bitrate table
  libopencore-amr: Remove a useless local variable
  libopencore-amr, libvo-amrwbenc: Make the bitrate/mode mapping array static const
  libopencore-amr, libvo-amrwbenc: Return proper error codes in most places
  libopencore-amr: Don't print carriage returns in log messages
  ...

Conflicts:
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/libvo-aacenc.c
	libavcodec/libvo-amrwbenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-14 03:21:38 +02:00
Vitor Sessak
96573c0d76 lavf/utils.c: Order packets with identical PTS by stream index.
This allows for more reproducible results when using multi-threading.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-04-12 19:06:26 -04:00
Anssi Hannula
78431098f9 lavf: inspect more frames for fps when container time base is coarse
As per issue2629, most 23.976fps matroska H.264 files are incorrectly
detected as 24fps, as the matroska timestamps usually have only
millisecond precision.

Fix that by doubling the amount of timestamps inspected for frame rate
for streams that have coarse time base. This also fixes 29.970 detection
in matroska.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 03:18:06 +02:00
Ronald S. Bultje
c56e618b4b Split fate-psx-str-v3 into a video-only and audio-only test. 2011-03-26 16:39:22 -04:00
Mans Rullgard
2a569799a9 fate: update wmv8-drm reference
This updates the wmv8-drm reference after c47d383.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-22 11:07:46 +00:00
Ronald S. Bultje
c47d383502 vc1: make P-frame deblock filter bit-exact. 2011-03-21 21:28:17 -04:00
Peter Ross
e211e255aa bink: prevent overflows within binkidct by using int-sized intermediate array
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-25 15:24:35 -05:00
Justin Ruggles
1108f8998c vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.
There is no need to expand to 16-bits. Just use memcpy() to copy the raw data.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-23 21:52:51 -05:00
Justin Ruggles
9b73f78600 vmdaudio: output audio samples for standalone silent blocks.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-23 21:04:51 -05:00
Mans Rullgard
e63dd5fb04 fate: add h264 test for extreme cases in planar prediction
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-24 22:26:13 +00:00
Mans Rullgard
76edf2c137 fate: add lossless h264 test
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-22 03:08:21 +00:00
Baptiste Coudurier
90603f7c93 Update smc fate ref due to r26310
Originally committed as revision 26342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-14 22:32:26 +00:00
Vitor Sessak
87c1410d11 Add a FATE test for Playstation STR version 3
Originally committed as revision 26231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 19:53:16 +00:00
Aurelien Jacobs
2c77c90684 add SubRip decoder
Originally committed as revision 26119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-28 23:52:53 +00:00
Reimar Döffinger
eb066a4ce9 Discard partial packet of last frame for fate-wmv8-drm to avoid test fails
due to VC-1 decoder overreads resulting in different output.

Originally committed as revision 26055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-18 23:11:31 +00:00
Reimar Döffinger
853395b913 Add test for ASF -cryptokey that tests only demuxing, but both audio and video
to complement the existing video-only decode test.

Originally committed as revision 26054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-18 16:06:56 +00:00
Reimar Döffinger
bf09a01981 Change ASF demuxer to return incomplete last packets.
Whether the behaviour for streams using scrambling makes sense
is unclear.

Originally committed as revision 26053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-18 13:18:52 +00:00
Carl Eugen Hoyos
ad556addfd Fix h264-conformance-frext-frext_mmco4_sony_b conformance test.
This includes a revert of r25840

Originally committed as revision 25842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-29 10:35:57 +00:00
Baptiste Coudurier
79561f0ed4 Update fate h264 test due to r25824, this file has 2 frames delay
Originally committed as revision 25840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-28 23:09:30 +00:00
Vitor Sessak
bbf07bf9b8 Remove now unused file (should have been part of commit r25735)
Originally committed as revision 25736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 20:15:36 +00:00
Vitor Sessak
c51722bf97 Test 4XM decoding (and not only demuxing) in FATE tests
Originally committed as revision 25735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 20:04:41 +00:00
Reimar Döffinger
e61bb0852f Add test for cropping of interlaced H.264.
Originally committed as revision 25677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-04 21:48:54 +00:00
Reimar Döffinger
9fc2b70826 Update 24 bpp TM1 reference for decoder fixes.
Originally committed as revision 25664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03 18:13:09 +00:00
Alexander Strange
e4dccc0d59 Update rv30 FATE reference after last commit
The rm demuxer has timestamp bugs, so this test is sensitive to changes in
timestamp correction. The previous commit did not make output any better or worse
on this test, just different.

See https://roundup.ffmpeg.org/issue2288 for details.

Originally committed as revision 25432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-10 02:20:02 +00:00
Reimar Döffinger
01e4b67598 Rename fate-gsm test to the more accurate fate-gsm-ms
and add a test for regular GSM as fate-gsm.

Fixes a 8kHz sample from issue 113.

Originally committed as revision 25313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 09:56:21 +00:00
Martin Storsjö
fe5f761ab6 Add a FATE test for the G.722 decoder
Originally committed as revision 25104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-11 10:23:02 +00:00
Vitor Sessak
4b7539f1cd SHA fate test
Originally committed as revision 25013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 20:07:38 +00:00
Vitor Sessak
d81db9c7d1 Add RealVideo 3 FATE test
Originally committed as revision 25008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 11:15:04 +00:00
Vitor Sessak
3e41fc623c Add Apple MJPEG-B decoder FATE test
Originally committed as revision 25006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 11:13:14 +00:00
Vitor Sessak
506c47a48e Add FATE test for ScummVM DXA flavor
Originally committed as revision 25005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 11:11:25 +00:00
Vitor Sessak
2d0cdf3cc0 Add fate test for Westwood SND1 codec
Originally committed as revision 24957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-28 14:51:51 +00:00
Vitor Sessak
0a24503d04 Remove CCITT fax G4 tests (partial revert of r24954). This test is
corrupting memory somehow and segfaulting in the BSDs.

Originally committed as revision 24956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-28 14:45:51 +00:00
Vitor Sessak
3b619cab31 CCITT Fax Group compression fate tests
Originally committed as revision 24954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-28 11:46:03 +00:00
Vitor Sessak
4574b815cc VP3 fate test
Originally committed as revision 24928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 17:23:38 +00:00
Vitor Sessak
d21caa952c Renderware TeXture Dictionary FATE test
Originally committed as revision 24911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 20:48:58 +00:00
Vitor Sessak
07862680b5 Add FATE test for WMV8 DRM
Originally committed as revision 24874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 11:46:55 +00:00
Reimar Döffinger
620918e4bf Add truemotion1 tests.
Originally committed as revision 24872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 04:45:36 +00:00
Vitor Sessak
3d6bd1c797 Add FATE test for ANSI/ASCII animation and TTY demuxer
Originally committed as revision 24865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-21 20:57:24 +00:00
Vitor Sessak
a58ed9a2e7 Add VP8 sign bias code regtest. Not tested by the official conformance suite.
Originally committed as revision 24457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-23 10:09:46 +00:00
Vitor Sessak
7c06faf894 Undo my revert at r24260.
This is the only way by now to test this codec.

Originally committed as revision 24286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 10:50:25 +00:00
Måns Rullgård
6441d39d58 fate: update vc1 reference
Originally committed as revision 24263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 12:37:09 +00:00
Vitor Sessak
605014ca33 Revert r24258:
Log:
Add msmpeg4v1 regtest

Added:
   trunk/tests/ref/fate/msmpeg4v1
Modified:
   trunk/tests/fate2.mak

According to Mans, "make test" tests already msmpeg4v1.

Originally committed as revision 24260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 10:19:21 +00:00
Vitor Sessak
58c9c95c75 Add msmpeg4v1 regtest
Originally committed as revision 24258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 10:06:33 +00:00
Vitor Sessak
abc152d78e Add MS-GSM regtest
Originally committed as revision 24257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 09:58:17 +00:00
Måns Rullgård
5ee08c8531 fate: add vp8 bilinear tests
Mike added these some time ago, and I forgot to update here.

Originally committed as revision 24220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-12 20:24:23 +00:00
Vitor Sessak
bb1e597736 Add Pictor/PC Paint PIC regtest
Originally committed as revision 24193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 12:44:32 +00:00
Vitor Sessak
e798dbdd34 Psygnosis YOP demuxer and decoder test
Originally committed as revision 24181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 00:07:31 +00:00
Vitor Sessak
1d9a8c347a Add MPEG2 field encoding fate2 regtest
Originally committed as revision 24175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:57:19 +00:00
Måns Rullgård
27d8806986 fate: add vp8 tests
Originally committed as revision 23763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 22:13:52 +00:00
Måns Rullgård
2661d65a5f FATE: update vc1 reference output
Originally committed as revision 23609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 10:14:19 +00:00