summaryrefslogtreecommitdiffstats
path: root/tests/ref/lavf
Commit message (Collapse)AuthorAgeFilesLines
* dpx: 10 and 12 bit decodingGeorg Lippitsch2012-08-271-1/+1
| | | | | | | | Rewrite 10 bit dpx decoder to decode into GBRP10 color space instead of converting to RGB48. Add 12 bit decoder to decode into GBRP12 color space. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nutenc: Support writing an indexMichael Niedermayer2012-08-261-2/+2
| | | | | | | The seek test improves in accuracy Fixes Ticket877 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Do not discard slightly invalid timestamps.Michael Niedermayer2012-08-121-1/+1
| | | | | | | | | | Fixes Ticket1627 The fate change is due to ffmpeg no longer pushing audio timestamps aggressively up (which is what caused the AV sync issues in the ticket) but leaving them as they are. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-241-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code rtmp: Move the CONFIG_ condition into the if conditions aac: Mention abbreviation as well in long_name build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled doc: Add Git configuration section configure: Add a dependency on https for rtmpts rtp: Only choose static payload types if the sample rate and channels are right Conflicts: doc/git-howto.texi libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: rework checks for the -t option.Nicolas George2012-07-047-21/+21
| | | | | | | | | | | | | | | | | | | | | | This commit is based on libav's implementation and makes sure to compare output timestamps together. It also reduces the differences with avconv. The changes to the test reference files are caused by an additional packet at the end, the timestamp of the frame encoded by this packet is always strictly below the limit stated by the -t option.
* | vocenc: use new header from codec tag 4Michael Niedermayer2012-06-251-2/+2
| | | | | | | | | | | | this matches sox and should fix ticket1119 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vocenc: fix sample rate rounding directionMichael Niedermayer2012-06-252-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | movenc: add timecode track support.Clément Bœsch2012-06-111-4/+4
| |
* | mxfenc: write optional field dominance flag in picture descriptionMatthieu Bouron2012-06-062-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-041-8/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Write chan atom for all audio tracks in mov mode movies. mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing doc/avconv: add some details about the transcoding process. avidec: make scale and rate unsigned. avconv: check output stream recording time before each frame returned from filters avconv: split selecting input file out of transcode(). avconv: split checking for active outputs out of transcode(). avfiltergraph: make some functions static. Conflicts: ffmpeg.c libavfilter/avfiltergraph.c libavfilter/internal.h libavformat/mpegtsenc.c tests/ref/fate/acodec-alac tests/ref/fate/acodec-pcm-s16be tests/ref/fate/acodec-pcm-s24be tests/ref/fate/acodec-pcm-s32be tests/ref/fate/acodec-pcm-s8 tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Write chan atom for all audio tracks in mov mode movies.Alex Converse2012-06-041-2/+2
| |
* | af_aresample: fix rounding that led to sample accumulation in the buffers.Michael Niedermayer2012-05-182-7/+7
| | | | | | | | | | | | | | This fixes a regression that apparently was missed when switching to the in af resampler Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-171-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: pcmenc: set correct bitrate value avprobe: don't print format entry name when only one was requested Conflicts: ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add support for audio filters.Anton Khirnov2012-05-1712-36/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the FATE changes are due to off-by-one different rounding being used (lrintf vs av_rescale_q). Some fate changes are due to 1 audio frame less being encoded (the new variant seems matching what qatar does and according to ffprobe its closer to the requested duration) the mapchan feature sadly is lost in this commit because it depends on resampling being done in ffmpeg.c which is now moved completely into the av filter layer -async is broken after this commit, this will be fixed in subsequent commits the new filter reconfiguration system is flawed and will drop a frame on each parameter change which is why the nelly moser checksums need updating. Conflicts: ffmpeg.c tests/ref/fate/smjpeg
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-162-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: Work around non-standard wc implementations at more places fate: work around non-standard wc implementations x86: rv40: Mark rv40_weight functions as MMX2; they use MMX2 instructions. ac3dsp: simplify x86 versions of ac3_max_msb_abs_int16 fate: use standard diff options tta: Fix comment about channel number; TTA supports >2 channels. avfilter: Move ff_get_ref_perms_string() to where it is used. build: Add 'check' target to run all compile and test targets. indeo3: validate new frame size before resetting decoder indeo3: when freeing buffers, set pointers referencing them to NULL as well indeo3: initialise pixel planes on allocation indeo3: ensure that decoded cell data is in 7-bit range as presumed by decoder fate: rename psx-str-v3-mdec to mdec-v3 fate: convert psx-str to a demuxer test lavf: add mdec to is_intra_only() list Conflicts: doc/developer.texi libavcodec/indeo3.c libavfilter/video.c libavformat/utils.c tests/fate/demux.mak tests/fate/video.mak tests/lavf-regression.sh tests/ref/vsynth1/cljr tests/ref/vsynth1/ffvhuff tests/ref/vsynth2/cljr tests/ref/vsynth2/ffvhuff Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: use standard diff optionsMans Rullgard2012-05-151-1/+1
| | | | | | | | | | | | | | | | | | diff -w is not a standard option. This fixes the reference files to match what the tests actually output and switches to using the standard diff -b which is sufficient to handle different line ending styles. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-251-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: use updated reference for aac-latm_stereo_to_51 avconv: use libavresample Add libavresample FATE: avoid channel mixing in lavf-dv_fmt Conflicts: Changelog Makefile cmdutils.c configure doc/APIchanges ffmpeg.c tests/lavf-regression.sh tests/ref/lavf/dv_fmt tests/ref/seek/lavf_dv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: avoid channel mixing in lavf-dv_fmtJustin Ruggles2012-04-241-3/+3
| | | | | | | | | | | | | | This partially reverts acb1730218f1c614dc8ca3ba45d9de1e05059515 which would only have needed to change the checksums if channel mixing had been properly avoided. This changes the output file size reference and the seek test reference back to the previous values.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-203-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: add a cook parser to get subpacket duration FATE: allow lavf tests to alter input parameters FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test FATE: replace the acodec-g726 test with 4 new encode/decode tests FATE: replace current g722 encoding tests with an encode/decode test FATE: add a pattern rule for generating asynth wav files FATE: optionally write a WAVE header in audiogen avutil: add audio fifo buffer Conflicts: doc/APIchanges libavcodec/version.h libavutil/avutil.h tests/Makefile tests/codec-regression.sh tests/fate/voice.mak tests/lavf-regression.sh tests/ref/acodec/g722 tests/ref/acodec/g726 tests/ref/acodec/pcm_s24daud tests/ref/lavf/dv_fmt tests/ref/lavf/gxf tests/ref/lavf/mxf tests/ref/lavf/mxf_d10 tests/ref/seek/lavf_dv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: allow lavf tests to alter input parametersJustin Ruggles2012-04-204-9/+9
| | | | | | | | Change some lavf tests to avoid resampling and channel mixing.
| * avconv: get output pixel format from lavfi.Anton Khirnov2012-04-151-3/+3
| | | | | | | | | | | | | | This way we don't require a clearly defined corresponding input stream. The result for the xwd test changes because rgb24 is now chosen instead of bgra.
* | fate: gif: change checksum to bgr8 from rgb8 as thats what gets selected nowMichael Niedermayer2012-04-171-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: always call avio_flush in av_write_trailer.Reimar Döffinger2012-04-122-6/+6
| | | | | | | | | | | | | | | | | | | | Otherwise for muxers like e.g. latmenc that never call avio_flush (and do not have a write_trailer function) a part of the data will always be missing. Also update references for the voc muxer, which was also buggy before and did not write out all data. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-101-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) rv40dsp x86: use only one register, for both increment and loop counter rv40dsp: implement prescaled versions for biweight. avconv: use default channel layouts when they are unknown avconv: parse channel layout string nutdec: K&R formatting cosmetics vda: Signal 4 byte NAL headers to the decoder regardless of what's in the extradata mem: Consistently return NULL for av_malloc(0) vf_overlay: implement poll_frame() vf_scale: support named constants for sws flags. lavc doxy: add all installed headers to doxy groups. lavc doxy: add avfft to the main lavc group. lavc doxy: add remaining avcodec.h functions to a misc doxygen group. lavc doxy: add AVPicture functions to a doxy group. lavc doxy: add resampling functions to a doxy group. lavc doxy: replace \ with / lavc doxy: add encoding functions to a doxy group. lavc doxy: add decoding functions to a doxy group. lavc doxy: fix formatting of AV_PKT_DATA_{PARAM_CHANGE,H263_MB_INFO} lavc doxy: add AVPacket-related stuff to a separate doxy group. lavc doxy: add core functions/definitions to a doxy group. ... Conflicts: ffmpeg.c libavcodec/avcodec.h libavcodec/vda.c libavcodec/x86/rv40dsp.asm libavfilter/vf_scale.c libavformat/nutdec.c libavutil/mem.c tests/ref/acodec/pcm_s24daud Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix gif regression test on big-endian.Reimar Döffinger2012-04-091-7/+7
| | | | | | | | | | | | | | Decode output must be converted to rgb24 to avoid CRC difference due to palette being stored in machine endianness. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add gif and xbm regression tests.Reimar Döffinger2012-04-092-0/+24
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add regression test for mov rtp hinting.Reimar Döffinger2012-04-061-0/+3
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | dpxenc: also test 10 and 16 bit formats.Reimar Döffinger2012-04-061-0/+6
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | asfenc: properly write index informationRamiro Polla2012-04-051-2/+2
| | | | | | | | | | | | | | The index must take into account the pre-roll time and must seek backwards, not forwards. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfenc: start at object 1 instead of 0Ramiro Polla2012-04-051-1/+1
| | | | | | | | | | | | This is how it is done in the official muxer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-227-10/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (26 commits) adxenc: use AVCodec.encode2() adxenc: Use the AVFrame in ADXContext for coded_frame indeo4: fix out-of-bounds function call. configure: Restructure help output. configure: Internal-only components should not be command-line selectable. vorbisenc: use AVCodec.encode2() libvorbis: use AVCodec.encode2() libopencore-amrnbenc: use AVCodec.encode2() ra144enc: use AVCodec.encode2() nellymoserenc: use AVCodec.encode2() roqaudioenc: use AVCodec.encode2() libspeex: use AVCodec.encode2() libvo_amrwbenc: use AVCodec.encode2() libvo_aacenc: use AVCodec.encode2() wmaenc: use AVCodec.encode2() mpegaudioenc: use AVCodec.encode2() libmp3lame: use AVCodec.encode2() libgsmenc: use AVCodec.encode2() libfaac: use AVCodec.encode2() g726enc: use AVCodec.encode2() ... Conflicts: configure libavcodec/Makefile libavcodec/ac3enc.c libavcodec/adxenc.c libavcodec/libgsm.c libavcodec/libvorbis.c libavcodec/vorbisenc.c libavcodec/wmaenc.c tests/ref/acodec/g722 tests/ref/lavf/asf tests/ref/lavf/ffm tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_asf tests/ref/seek/lavf_ffm tests/ref/seek/lavf_mkv tests/ref/seek/lavf_mpg tests/ref/seek/lavf_rm tests/ref/seek/lavf_ts Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudioenc: use AVCodec.encode2()Justin Ruggles2012-03-205-10/+10
| | | | | | | | Update FATE references due to encoder delay.
| * ac3enc: update to AVCodec.encode2()Justin Ruggles2012-03-201-1/+1
| | | | | | | | Update FATE references due to encoder delay.
* | Fix type and codetype fields in the MMF header for some phones.Vidar Madsen2012-03-211-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-151-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: stricter reference limit enforcement. h264: increase reference poc list from 16 to 32. xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns. snow: check reference frame indices. snow: reject unsupported chroma shifts. Add ffvhuff encoding and decoding regression test anm: convert to bytestream2 API bytestream: add more unchecked variants for bytestream2 API jvdec: unbreak video decoding jv demux: set video stream duration fate: add pam image regression test Conflicts: libavcodec/adpcm.c libavcodec/anm.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/snowdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: add pam image regression testPaul B Mahol2012-03-141-0/+3
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | lavf: Add system to seperate relative timestamps from absolute ones.Michael Niedermayer2012-03-091-1/+1
| | | | | | | | | | | | | | | | | | With this we can always know if a timestamp is based on added durations from an unknown origin or if it is based on a correct timestamp (and possibly added durations) This should fix some bugs where this distinction was mixed up. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-051-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) cmdutils: use new avcodec_is_decoder/encoder() functions. lavc: make codec_is_decoder/encoder() public. lavc: deprecate AVCodecContext.sub_id. libcdio: add a forgotten AVClass to the private context. swscale: remove "cpu flags" from -sws_flags description. proresenc: give user a possibility to alter some encoding parameters vorbisenc: add output buffer overwrite protection libopencore-amrnbenc: fix end-of-stream handling ra144enc: fix end-of-stream handling nellymoserenc: zero any leftover packet bytes nellymoserenc: use proper MDCT overlap delay qpeg: Use bytestream2 functions to prevent buffer overreads. swscale: make %rep unconditional. vp8: convert simple loopfilter x86 assembly to use named arguments. vp8: convert idct x86 assembly to use named arguments. vp8: convert mc x86 assembly to use named arguments. vp8: convert loopfilter x86 assembly to use cpuflags(). vp8: convert idct/mc x86 assembly to use cpuflags(). swscale: remove now unnecessary hack. x86inc: don't "bake" stack_offset in named arguments. ... Conflicts: cmdutils.c doc/APIchanges libavcodec/mpeg12.c libavcodec/options.c libavcodec/qpeg.c libavcodec/utils.c libavcodec/version.h libavdevice/libcdio.c tests/lavf-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: Add sunrast regression testDerek Buitenhuis2012-03-031-0/+3
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | fate: Add sunrast regression testDerek Buitenhuis2012-03-021-0/+3
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (58 commits) amrnbdec: check frame size before decoding. cscd: use negative error values to indicate decode_init() failures. h264: prevent overreads in intra PCM decoding. FATE: do not decode audio in the nuv test. dxa: set audio stream time base using the sample rate psx-str: do not allow seeking by bytes asfdec: Do not set AVCodecContext.frame_size vqf: set packet parameters after av_new_packet() mpegaudiodec: use DSPUtil.butterflies_float(). FATE: add mp3 test for sample that exhibited false overreads fate: add cdxl test for bit line plane arrangement vmnc: return error on decode_init() failure. libvorbis: add/update error messages libvorbis: use AVFifoBuffer for output packet buffer libvorbis: remove unneeded e_o_s check libvorbis: check return values for functions that can return errors libvorbis: use float input instead of s16 libvorbis: do not flush libvorbis analysis if dsp state was not initialized libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions ... Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/dpxenc.c libavcodec/libvorbis.c libavcodec/vmnc.c libavformat/asfdec.c libavformat/id3v2enc.c libavformat/internal.h libavformat/mp3enc.c libavformat/utils.c libavformat/version.h libswscale/utils.c tests/fate/video.mak tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/lavf/ffm tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dpxenc: Don't include the libavcodec ident if bitexact mode is enabledMartin Storsjö2012-02-291-1/+1
| | | | | | | | | | | | This avoids breaking fate every time the lavc version is bumped. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mpegvideo_enc: add chroma/luma_elim_threshold private options.Anton Khirnov2012-02-291-1/+1
| | | | | | | | Deprecate corresponding AVCodecContext fields.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (34 commits) mlp_parser: fix the channel mask value used for the top surround channel vorbisenc: check all allocations for failure roqaudioenc: return AVERROR codes instead of -1 roqaudioenc: set correct bit rate roqaudioenc: use AVCodecContext.frame_size correctly. roqaudioenc: remove unneeded sample_fmt check ra144enc: use int16_t* for input samples rather than void* ra144enc: set AVCodecContext.coded_frame ra144enc: remove unneeded sample_fmt check nellymoserenc: set AVCodecContext.coded_frame nellymoserenc: improve error checking in encode_init() nellymoserenc: return AVERROR codes instead of -1 libvorbis: improve error checking in oggvorbis_encode_init() mpegaudioenc: return AVERROR codes instead of -1 libfaac: improve error checking and handling in Faac_encode_init() avutil: add AVERROR_UNKNOWN check for coded_frame allocation failure in several audio encoders audio encoders: do not set coded_frame->key_frame. g722enc: check for trellis data allocation error libspeexenc: export encoder delay through AVCodecContext.delay ... Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/fraps.c libavcodec/kgv1dec.c libavcodec/libfaac.c libavcodec/libgsm.c libavcodec/libvorbis.c libavcodec/mlp_parser.c libavcodec/roqaudioenc.c libavcodec/vorbisenc.c libavutil/avutil.h libavutil/error.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Enable already existing rso regression test.Reimar Döffinger2012-02-211-0/+3
| | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * Add regression test for "sox" format muxer/demuxer.Reimar Döffinger2012-02-211-0/+3
| | | | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * Add dpx encoding regression test.Carl Eugen Hoyos2012-02-211-0/+3
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-191-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mov: Use defines for sample flags in fragments mov: Use defines for trun flags mov: Use defines for tfhd flags proresenc: force bitrate not to exceed given limit vc1parse: call vc1_init_common(). wma: don't return 0 on invalid packets. asf: prevent packet_size_left from going negative if hdrlen > pktlen. mjpegb: don't return 0 at the end of frame decoding. rtpdec: Identify incorrectly signalled H263 vp8dsp: split long line. aiff: don't skip block_align==0 check on COMM-after-SSND files. dpcm: ignore extra unpaired bytes in stereo streams. mp3on4: require a minimum framesize. mpc7: assign an error level + context to av_log() msg. huffyuv: error out on bit overrun. dct-test: Add the missing ff_ prefix to the altivec functions dct-test: Remove a stray declaration of a nonexistent function movenc: Write the unknown duration as 64 bit fields in ismv movenc: Write track durations with all bits set if duration is unknown Conflicts: libavcodec/dct-test.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rawenc: switch to encode2().Anton Khirnov2012-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * avconv: rework -t handling for encoding.Anton Khirnov2012-02-079-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | Current code compares the desired recording time with InputStream.pts, which has a very unclear meaning. Change the code to use actual timestamps of the frames passed to the encoder. In several tests, one less frame is encoded, which is more correct. In the idroq test one more frame is encoded, which is again more correct. Behavior with stream copy should be unchanged.
OpenPOWER on IntegriCloud