summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Fix spelling errors. aac: Only set sample rate and object type from ADTS if output hasn't been configured. aac: Set SBR and PS to unsignalled during headerless and ADTS initialization. aac: Only output configure if audio was found. avconv: save two levels of indentation in flush_encoders() avconv: factor flushing encoders out of output_packet(). avconv: factor out initializing input streams. avconv: remove -intra option. avconv: reset streamid_map between output files. avconv: make timer_start a local var in transcode(). avconv: cosmetics, move OutputStream. avconv: remove two unused macros. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: remove -intra option.Anton Khirnov2011-08-18
| | | | | | | | It's equivalent to -g 0.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) h264: hide reference frame errors unless requested swscale: split hScale() function pointer into h[cy]Scale(). Move clipd macros to x86util.asm. avconv: reindent. avconv: rescue poor abused start_time global. avconv: rescue poor abused recording_time global. avconv: merge two loops in output_packet(). avconv: fix broken indentation. avconv: get rid of the arbitrary MAX_FILES limit. avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia avconv: add a wrapper for output AVFormatContexts and merge output_opts into it avconv: make itsscale syntax consistent with other options. avconv: factor out adding input streams. avconv: Factorize combining auto vsync with format. avconv: Factorize video resampling. avconv: Don't unnecessarily convert ipts to a double. ffmpeg: remove unsed variable nopts RV3/4 parser: remove unused variable 'off' add XMV demuxer rmdec: parse FPS in RealMedia properly ... Conflicts: avconv.c libavformat/version.h libswscale/swscale.c tests/ref/fate/lmlm4-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: rescue poor abused recording_time global.Anton Khirnov2011-08-17
| | | | | | | | | | Keep a per-OutputFile instance of it, thus making -t work with multiple output files.
| * rmdec: parse FPS in RealMedia properlyKostya Shishkov2011-08-17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Use parsers for RealVideo 3/4 to determine correct PTSKostya Shishkov2011-08-17
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * rmdec: correct DTS calculation in RealMedia container.Kostya Shishkov2011-08-17
| | | | | | | | | | | | | | | | First, container stores only DTS and not PTS as it was believed. Second, multiple frames in a packet store timestamp instead of position after the frame length. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Revert "avconv: use stream copy by default when possible."Anton Khirnov2011-08-16
| | | | | | | | | | | | | | This reverts commit 4f4f33844a7369e5579912cc02f3c5376b1e6872. This commit has some ugly corner cases and needs to be discussed further.
| * avconv: use stream copy by default when possible.Anton Khirnov2011-08-16
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings avconv: remove a write-only variable avconv: remove pointless parameter from new_*_stream(). avconv: cosmetics, move code avconv: cosmetics -- move copy_chapters(). avconv: cosmetics -- move parse_forced_key_frames(). lavc: add audio flag to the 'b' option, deprecate 'ab'. avconv: rename sameq to same_quant doc/avconv: add forgotten end of chapter. Changelog: document avconv incompatibilities with ffmpeg. avconv: replace -vcodec/-acodec/-scodec with a better system. avconv: remove presets. svq3: propagate codec memory allocation failure in context init Conflicts: Changelog avconv.c libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add audio flag to the 'b' option, deprecate 'ab'.Anton Khirnov2011-08-16
| | | | | | | | | | | | Its only reason for its existence was ffmpeg's inability to properly assign AVOptions to streams. Now this is not a problem anymore, so 'ab' should go.
| * avconv: rename sameq to same_quantAnton Khirnov2011-08-16
| | | | | | | | | | It's often mistakenly used as 'same quality', emphasize that it's not true in the manual.
* | fate: more cases of avconv that should be conditionalMichael Niedermayer2011-08-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: some shells parse $11 as ${1}1Michael Niedermayer2011-08-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: allow specifying the tool to use for fate (avconv / ffmpeg)Michael Niedermayer2011-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate-rsync: switch to our server in preparation of h264 4:2:2 testsMichael Niedermayer2011-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-13
|\| | | | | | | | | | | | | | | | | | | * qatar/master: swscale: add dithering to yuv2yuvX_altivec_real rv34: free+allocate buffer instead of reallocating it to preserve alignment h264: add missing brackets. swscale: use 15-bit intermediates for 9/10-bit scaling. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: use 15-bit intermediates for 9/10-bit scaling.Ronald S. Bultje2011-08-12
| |
* | dv: honor timecode in DV muxer.Clément Bœsch2011-08-13
| | | | | | | | This is based on the original work by Baptiste Coudurier.
* | mxf: add cli option in mxfenc to replace GOP timecode parsing.Clément Bœsch2011-08-13
| | | | | | | | This is based on the original work by Baptiste Coudurier.
* | Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'Michael Niedermayer2011-08-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make a copy of ffmpeg under a new name -- avconv.Anton Khirnov2011-08-12
| | | | | | | | | | | | | | It will be further developed with a few incompatible changes. ffmpeg.c will stay as is for some time, so any scripts using it won't be broken.
| * Add weighted motion compensation for RV40 B-framesKostya Shishkov2011-08-11
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-02
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Revert "swscale: use 15-bit intermediates for 9/10-bit scaling." swscale: use 15-bit intermediates for 9/10-bit scaling. dct32: Add SSE2 ASM optimizations Correct chroma vector calculation for RealVideo 3. lavf: Add an option to discard corrupted frames mpegts: Mark wrongly-sized packets as corrupted mpegts: Move scan test to handle_packets mpegts: Mark corrupted packets mpegts: Reset continuity counter on seek mpegts: Fix for continuity counter mpegts: Silence "can't seek" warning on unseekable apichange: add an entry for AV_PKT_FLAG_CORRUPT avpacket: signal possibly corrupted packets mpeg4videodec: remove dead code that would have detected erroneous encoding aac: Remove some suspicious illegal memcpy()s from LTP. bink: Eliminate unnecessary shadow declaration. Conflicts: doc/APIchanges libavcodec/version.h libavformat/avformat.h libavformat/options.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "swscale: use 15-bit intermediates for 9/10-bit scaling."Ronald S. Bultje2011-08-02
| | | | | | | | | | | | This reverts commit ac0fb5934893be554a44d2a1eb7a3bc7bf39da4a. It causes valgrind errors which I'll want to investigate before resubmitting this.
| * swscale: use 15-bit intermediates for 9/10-bit scaling.Ronald S. Bultje2011-08-02
| |
| * Correct chroma vector calculation for RealVideo 3.Kostya Shishkov2011-08-02
| | | | | | | | | | | | | | Old version divided it wrong, which resulted in chroma drift (visible on FATE sample too as dirty trails left by clouds). Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Remove the ffserver test.Anton Khirnov2011-08-01
| | | | | | | | It doesn't work and is therefore useless.
* | Rm lavfi-showfiltfmts on make testclean.Carl Eugen Hoyos2011-08-01
| |
* | lavfi-showfiltfmts: extend output format for specifying audio dataStefano Sabatini2011-07-28
| | | | | | | | This is required for extending lavfi tests to audio filtering.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dnxhddec: optimise dnxhd_decode_dct_block() rtp: remove disabled code eac3enc: use different numbers of blocks per frame to allow higher bitrates dnxhd: add regression test for 10-bit dnxhd: 10-bit support dsputil: update per-arch init funcs for non-h264 high bit depth dsputil: template get_pixels() for different bit depths dsputil: create 16/32-bit dctcoef versions of some functions jfdctint: add 10-bit version mov: add clcp type track as Subtitle stream. mpeg4: add Mpeg4 Profiles names. mpeg4: decode Level Profile for MPEG4 Part 2. ffprobe: display bitstream level. imgconvert: remove unused glue and xglue macros Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dnxhd: add regression test for 10-bitMans Rullgard2011-07-21
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * swscale: mark YUV422P10(LE,BE) as supported for outputJoseph Artsimovich2011-07-21
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-19
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: simple_idct: simplify some ifdeffery simple_idct: remove code for DCTELEM != int16 Remove VLAs in ff_amrwb_lsp2lpc() fate: make vsynth tests depend on only the relevant vref rtsp: remove disabled code dsputil: restore mistakenly removed hunk of disabled code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: make vsynth tests depend on only the relevant vrefMans Rullgard2011-07-18
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: fix some indentation ffmpeg: fix operation with --disable-avfilter simple_idct: remove disabled code motion_est: remove disabled code vc1: remove disabled code fate: separate lavf-mxf_d10 test from lavf-mxf cabac: Move code only used in the cabac test program to cabac.c. ffplay: warn that -pix_fmt is no longer working, suggest alternative ffplay: warn that -s is no longer working, suggest alternative lavf: rename enc variable in utils.c:has_codec_parameters() lavf: use designated initialisers for all (de)muxers. wav: remove a use of deprecated AV_METADATA_ macro rmdec: remove useless ap parameter from rm_read_header_old() dct-test: remove write-only variable des: fix #if conditional around P_shuffle Use LOCAL_ALIGNED in ff_check_alignment() Conflicts: ffmpeg.c libavformat/avidec.c libavformat/matroskaenc.c libavformat/mp3enc.c libavformat/oggenc.c libavformat/utils.c tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: separate lavf-mxf_d10 test from lavf-mxfMans Rullgard2011-07-17
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | ffmpeg: use new avformat_open_* API.Anton Khirnov2011-07-14
| | | | | | | | 8035f429684e368fe54af8ccedc2d4776a2d6154
* | Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'Michael Niedermayer2011-07-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5849f77095439e994b11c25e6063d443b36c228': (21 commits) ac3enc: merge AC3MDCTContext with AC3EncodeContext. ac3enc: prefer passing AC3EncodeContext rather than AVCodecContext ac3enc: fix memleak mpeg1video: add CODEC_CAP_SLICE_THREADS. lavf: fix segfault in av_open_input_stream() mpegtsenc: set Random Access indicator on keyframe start packets lavf: Cleanup try_decode_frame() logic. Replace some gotos that lead to single return statements by direct return. build: move tests/seek_test.c to libavformat and reuse generic build rules mxfenc: include needed header for ff_iso8601_to_unix_time() prototype Add a check for strptime(). lavf: factor out conversion of ISO8601 string to unix time wav: parse 'bext' metadata wav: keep parsing until EOF if the input is seekable and we know the size of the data tag wav: Refactor the tag checking into a switch statement wav: make sure neither data_size nor sample_count is negative. wav: refactor the 'fmt ' tag search and parsing. wav: add an option for writing BEXT chunk ffmpeg: get rid of a pointless limit on number of streams. ffmpeg: remove an unused define. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegtsenc: set Random Access indicator on keyframe start packetsJindrich Makovicka2011-07-13
| | | | | | | | | | Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * build: move tests/seek_test.c to libavformat and reuse generic build rulesDiego Biurrun2011-07-13
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: changelog: misc typo and wording fixes H.264: add filter_mb_fast support for >8-bit decoding doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. lls: use av_lfg instead of rand() in test program build: remove unnecessary dependency on libs from 'all' target H.264: avoid redundant alpha/beta calculations in loopfilter H.264: optimize intra/inter loopfilter decision mpegts: fix Continuity Counter error detection build: remove unnecessary FFLDFLAGS variable vp8/mt: flush worker thread, not application thread context, on seek. mt: proper locking around release_buffer calls. DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e] hwaccel: unbreak build Eliminate FF_COMMON_FRAME macro. Conflicts: Changelog Makefile doc/developer.texi libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: remove unnecessary FFLDFLAGS variableMans Rullgard2011-07-11
| | | | | | | | | | | | | | | | This variable is set to the same value for all directories. Adding the -L flags directly to LDFLAGS is simpler and achieves the same thing. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Revert "lavc: remove a half-working attempt at different defaults for ↵Michael Niedermayer2011-07-11
| | | | | | | | | | | | audio/video codecs." This reverts commit 18c007ba37b2c7dee5bd2f1a3eb3bfee9b6b3d26.
* | Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf': swscale: fix crash with dithering due incorrect offset calculation. matroskadec: fix stupid typo (!= -> ==) build: remove duplicates from order-only directory prerequisite list build: rework rules for things in the tools dir configure: fix --cpu=host with gcc 4.6 ARM: use const macro to define constant data in asm bitdepth: simplify FUNC/FUNCC macros dsputil: remove ff_emulated_edge_mc macro used in one place 9/10-bit: simplify clipping macros matroskadec: reindent matroskadec: defer parsing of cues element until we seek. lavc: add support for codec-specific defaults. lavc: make avcodec_alloc_context3 officially public. lavc: remove a half-working attempt at different defaults for audio/video codecs. ac3dec: add a drc_scale private option lavf: add avformat_find_stream_info() lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: Makefile libavcodec/utils.c libavformat/avformat.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: rework rules for things in the tools dirMans Rullgard2011-07-10
| | | | | | | | | | | | | | | | Declaring tools associated with each library in their respective makefiles allows these tools to easily depend on the correct prerequisites and link against the libs they need. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * lavc: remove a half-working attempt at different defaults for audio/video ↵Anton Khirnov2011-07-10
| | | | | | | | | | | | codecs. It should be replaced with proper per-codec defaults.
| * swscale: fix overflow in 16-bit vertical scaling.Ronald S. Bultje2011-07-08
| | | | | | | | | | | | We operated on 31-bits, but with e.g. lanczos scaling, values can add up to beyond 0x80000000, thus leading to output of zeroes. Drop one bit of precision fixes this.
| * swscale: fix 16-bit horizontal scaling underflow.Ronald S. Bultje2011-07-08
| | | | | | | | | | When using e.g. lanczos scaling, values can drop below 0, so they should never be unsigned.
| * swscale: fix 16-bit scaling when output is 8-bits.Ronald S. Bultje2011-07-08
| | | | | | | | | | We would use the second half of the U plane buffer, rather than the V plane buffer, to output the V plane pixels.