summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-0424-95/+90
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavr: fix handling of custom mix matrices fate: force pix_fmt in lagarith-rgb32 test fate: add tests for lagarith lossless video codec. ARMv6: vp8: fix stack allocation with Apple's assembler ARM: vp56: allow inline asm to build with clang fft: 3dnow: fix register name typo in DECL_IMDCT macro x86: dct32: port to cpuflags x86: build: replace mmx2 by mmxext Revert "wmapro: prevent division by zero when sample rate is unspecified" wmapro: prevent division by zero when sample rate is unspecified lagarith: fix color plane inversion for YUY2 output. lagarith: pad RGB buffer by 1 byte. dsputil: make add_hfyu_left_prediction_sse4() support unaligned src. Conflicts: doc/APIchanges libavcodec/lagarith.c libavfilter/x86/gradfun.c libavutil/cpu.h libavutil/version.h libswscale/utils.c libswscale/version.h libswscale/x86/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ARMv6: vp8: fix stack allocation with Apple's assemblerMans Rullgard2012-08-041-1/+7
| | | | | | | | | | | | | | | | In the GNU assembler, a relational expression, bizarrely, has the value -1 if true, whereas in Apple's it is +1. This patch makes sure the correct expression is used in both cases. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ARM: vp56: allow inline asm to build with clangMans Rullgard2012-08-041-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clang integrated assembler does not support pre-UAL syntax, while gcc requires pre-UAL syntax for ARM code. A patch[1] for clang to support the old syntax as well has been ignored since January. This patch chooses the syntax appropriate for each compiler, allowing both to build the code. Notably, this change allows building for iphone with the latest Apple Xcode update. [1] http://llvm.org/bugs/show_bug.cgi?id=11855 Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fft: 3dnow: fix register name typo in DECL_IMDCT macroRonald S. Bultje2012-08-041-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * x86: dct32: port to cpuflagsDiego Biurrun2012-08-031-49/+25
| |
| * x86: build: replace mmx2 by mmxextDiego Biurrun2012-08-0319-33/+32
| | | | | | | | | | | | | | Refactoring mmx2/mmxext YASM code with cpuflags will force renames. So switching to a consistent naming scheme beforehand is sensible. The name "mmxext" is more official and widespread and also the name of the CPU flag, as reported e.g. by the Linux kernel.
| * Revert "wmapro: prevent division by zero when sample rate is unspecified"Ronald S. Bultje2012-08-031-5/+0
| | | | | | | | | | This reverts commit 36936080239ba9e162f9f5d0f722ce579cb606cf. It was already applied; no idea why it didn't error out while re-applying it.
| * wmapro: prevent division by zero when sample rate is unspecifiedSean McGovern2012-08-031-0/+5
| | | | | | | | | | | | This fixes Bugzilla #327: Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * lagarith: fix color plane inversion for YUY2 output.Ronald S. Bultje2012-08-031-3/+3
| |
| * lagarith: pad RGB buffer by 1 byte.Ronald S. Bultje2012-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | For left HFYU prediction, we predict from the buffer buf+1 using 8- or 16-byte reads. This means that aligning the buffer by 16 bytes is in itself not sufficient, because if the width itself is 16- or 8-byte aligned, the buffer will not be padded, and thus a read of size 16 at buf+1 will overflow boundaries at the right edge. Padding the buffer by 1 byte is sufficient to not overflow its boundaries. Fixes bug 342.
| * dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.Ronald S. Bultje2012-08-031-7/+13
| | | | | | | | | | | | | | | | | | | | This makes add_hfyu_left_prediction_sse4() handle sources that are not 16-byte aligned in its own function rather than by proxying the call to add_hfyu_left_prediction_ssse3(). This fixes a crash on Win64, since the sse4 version clobberes xmm6, but the ssse3 version (which uses MMX regs) does not restore it, thus leading to XMM clobbering and RSP being off. Fixes bug 342.
* | Merge remote-tracking branch 'dwbuiten/master'Michael Niedermayer2012-08-041-18/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | * dwbuiten/master: zerocodec: Fix memleak in decode_frame zerocodec: Cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | zerocodec: Fix memleak in decode_frameDerek Buitenhuis2012-08-041-5/+6
| | | | | | | | | | | | | | | | | | | | | If there was a failure inflating, or reinitializing the zstream, the current frame's buffer would be lost. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * | zerocodec: CosmeticsDerek Buitenhuis2012-08-041-14/+13
| | | | | | | | | | | | | | | | | | Be consistent with error messages and code formatting. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | | movtextenc: Remove dangling reference to movtext.hPhilip Langdale2012-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | This is a reference that leaked in from my future work to support styling. Signed-off-by: Philip Langdale <philipl@overt.org>
* | | movtextenc: 3GPP TS 26.245 Timed Text Encoder.Philip Langdale2012-08-044-2/+165
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces a basic encoder for 3GPP Timed Text subtitles, also known as TX3G, Quicktime subtitles, or "movtext" in the existing code. This initial change doesn't attempt to write styling information, and just writes the plain text of the subtitles. I intend to add support for styles eventually, but it's challenging due to a lack of existing players that support them. Note that an additional change is required to the mov/mp4 muxer to write empty subtitle packets to indicate subtitle duration. Signed-off-by: Philip Langdale <philipl@overt.org>
* | h264: print num_reorder_frames in debug outputMichael Niedermayer2012-08-041-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | motion_est_template: switch to av_assertMichael Niedermayer2012-08-041-22/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dvdec: switch to av_assertMichael Niedermayer2012-08-041-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g732_1: reduce difference to qatarMichael Niedermayer2012-08-031-17/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-0311-304/+329
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vc1dec: Remove separate scaling function for interlaced field MVs vc1dec: Invoke edge_emulation regardless of MV precision x86: Use consistent 3dnowext function and macro name suffixes g723_1: scale output as supposed for the case with postfilter disabled g723_1: increase excitation storage by 4 g723_1: fix upper bound parameter from inverse maximum autocorrelation g723_1: make scale_vector() behave like the reference g723_1: fix off-by-one error in normalize_bits() g723_1: save/restore excitation with offset to store LPC history wmapro: prevent division by zero when sample rate is unspecified x86: proresdsp: improve SIGNEXTEND macro comments x86: h264dsp: K&R formatting cosmetics LICENSE: Document all GPL files Conflicts: libavcodec/g723_1.c libavcodec/wmaprodec.c libavcodec/x86/h264dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1dec: Remove separate scaling function for interlaced field MVsMashiat Sarker Shakkhar2012-08-031-22/+8
| | | | | | | | | | | | | | The scaling process for obtaining direct MVs from co-located field MVs is the same for interlaced field and progressive pictures. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * vc1dec: Invoke edge_emulation regardless of MV precisionMashiat Sarker Shakkhar2012-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | In VC-1 interlaced field pictures, chroma motion vectors can extend beyond picture boundary even if luma vectors are bounded. The problem shows up only for hpel interpolated MVs, and may be due to the way motion vectors are scaled / cropped. Thanks to Konstantin Shishkov for suggesting the fix. This fixes long-known segfaults in MC-VC1.ts from videolan streams archive. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * x86: Use consistent 3dnowext function and macro name suffixesDiego Biurrun2012-08-036-43/+45
| | | | | | | | | | | | Currently there is a wild mix of 3dn2/3dnow2/3dnowext. Switching to "3dnowext", which is a more common name of the CPU flag, as reported e.g. by the Linux kernel, unifies this.
| * g723_1: scale output as supposed for the case with postfilter disabledKostya Shishkov2012-08-031-4/+10
| |
| * g723_1: increase excitation storage by 4Kostya Shishkov2012-08-031-1/+1
| | | | | | | | | | | | Fixed codebook mode in 5300 rate may write up to SUBFRAME_LEN + 4 and that is considered normal by the reference decoder. Without that additional padding it might overwrite first elements of LPC history.
| * g723_1: fix upper bound parameter from inverse maximum autocorrelationKostya Shishkov2012-08-031-1/+4
| |
| * g723_1: make scale_vector() behave like the referenceKostya Shishkov2012-08-031-2/+3
| |
| * g723_1: fix off-by-one error in normalize_bits()Kostya Shishkov2012-08-031-1/+1
| |
| * g723_1: save/restore excitation with offset to store LPC historyKostya Shishkov2012-08-031-2/+2
| | | | | | | | | | The same buffer with saved data is used later in LPC reconstruction, so it should have some head space for LPC history.
| * wmapro: prevent division by zero when sample rate is unspecifiedSean McGovern2012-08-031-0/+5
| | | | | | | | | | | | This fixes Bugzilla #327: Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * x86: proresdsp: improve SIGNEXTEND macro commentsDiego Biurrun2012-08-021-3/+3
| |
| * x86: h264dsp: K&R formatting cosmeticsDiego Biurrun2012-08-021-225/+247
| |
* | libopenjpegdec: increase max lowres from 5 to 31Michael Bradshaw2012-08-031-1/+1
| | | | | | | | | | | | | | OpenJPEG doesn't have a particular limit Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/utils: rename ff_init_buffer_info() pic parameter to frameStefano Sabatini2012-08-032-17/+17
| | | | | | | | | | The new name is more expressive, given that the frame is not necessarily a picture but may be an audio frame.
* | lavc/utils: generalize ff_init_buffer_info() and use it when seems feasibleStefano Sabatini2012-08-031-36/+17
| | | | | | | | | | | | | | Extend ff_init_buffer_info() to init audio frames as well as video frames. Avoid code duplication.
* | Fix misc swapped dot and carriage returns in av_log calls.Clément Bœsch2012-08-031-1/+1
| |
* | cllc: fix typo in the error messagePiotr Bandurski2012-08-031-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-026-24/+30
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: fft: fix imdct_half() for AVX rtmppkt: Add missing libavcodec/bytestream.h include. rtmp: add functions for reading AMF values vc1dec: remove useless #include simple_idct.h dct-test: always link with aandcttab.o vp8: pack struct VP8ThreadData more efficiently x86: remove libmpeg2 mmx(ext) idct functions eamad: Use dsputils instead of a custom bswap16_buf Canopus Lossless decoder Conflicts: Changelog LICENSE libavcodec/avcodec.h libavcodec/cllc.c libavcodec/eamad.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: fft: fix imdct_half() for AVXRonald S. Bultje2012-08-021-3/+10
| | | | | | | | | | | | | | | | | | Some calculations were changed in b6a3849 to use mmsize, which was not correct for the AVX version, which uses INIT_YMM and therefore has mmsize == 32. Fixes Bug 341. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * vc1dec: remove useless #include simple_idct.hMans Rullgard2012-08-021-1/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dct-test: always link with aandcttab.oMans Rullgard2012-08-021-1/+1
| | | | | | | | | | | | | | | | This allows building dct-test even if aandcttab.o is not pulled in by any enabled codec. The DCT with which these tables are used does not use them directly, so building it without the tables is possible. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * vp8: pack struct VP8ThreadData more efficientlyMans Rullgard2012-08-021-17/+17
| | | | | | | | | | | | | | | | Reordering the members in this struct reduces the holes required to maintain alignment. With this order, the only remaining, and unavoidable, hole is 3 bytes following left_nnz. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * x86: remove libmpeg2 mmx(ext) idct functionsMans Rullgard2012-08-025-680/+0
| | | | | | | | | | | | | | | | These functions are not faster than other mmx implementations on any hardware I have been able to test on, and they are horribly inaccurate. There is thus no reason to ever use them. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * eamad: Use dsputils instead of a custom bswap16_bufDerek Buitenhuis2012-08-011-8/+1
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * Canopus Lossless decoderDerek Buitenhuis2012-08-015-2/+289
| | | | | | | | | | | | At the moment it only does BGR24, but I plan to add the rest after. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.Ronald S. Bultje2012-08-024-226/+168
| | | | | | | | | | 64-bit CPUs always have SSE available, thus there is no need to compile in the 3dnow functions. This results in smaller binaries.
* | eamad: Use dsputils instead of its own bswap16_bufDerek Buitenhuis2012-08-021-8/+1
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flacenc: switch to av_assertMichael Niedermayer2012-08-021-4/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flacdec: switch to av_assertMichael Niedermayer2012-08-021-4/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>