summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
...
| * x86: dsputil: ff_h263_*_loop_filter declarations to a more suitable placeDiego Biurrun2013-04-121-5/+3
| |
* | Merge commit 'a89c05500f68d94a0269e68bc522abfd420c5497'Michael Niedermayer2013-04-122-6/+9
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a89c05500f68d94a0269e68bc522abfd420c5497': x86: h264qpel: int --> ptrdiff_t for some line_size parameters Conflicts: libavcodec/x86/qpelbase.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264qpel: int --> ptrdiff_t for some line_size parametersDiego Biurrun2013-04-122-6/+9
| |
* | avcodec: rename prores encodersMichael Niedermayer2013-04-115-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the first names of authors sounds somewhat unprofessional and might be considered offensive which is not intended. The new names use the initials of the authors due to simplicity and the possibility to apply it consistently without the need to find political correct names for each future case where alternative codecs might exist. Also its shorter ... If someone has a better idea, like maybe 2 random letters and people prefer it then iam happy to switch to that ... Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libshine fixed point MP3 encoding supportPaul B Mahol2013-04-113-0/+151
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-115-22/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Move misplaced file author information where it belongs Conflicts: libavcodec/adpcm.c libavcodec/adpcmenc.c libavcodec/gif.c libavcodec/x86/dsputilenc_mmx.c libavcodec/x86/fmtconvert_init.c libavformat/au.c libavformat/gif.c libavformat/mov.c libavformat/nsvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move misplaced file author information where it belongsDiego Biurrun2013-04-115-22/+22
| |
* | Merge commit '9de9b828ef005dec37052548c195a6b4f18fc701'Michael Niedermayer2013-04-111-5/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '9de9b828ef005dec37052548c195a6b4f18fc701': lavc: don't overwrite display dimensions with coded dimensions. lavc: extend / update the [coded_]{width,height} doxy Conflicts: libavcodec/avcodec.h libavcodec/utils.c The change to the w/h handling is not merged as it breaks lowres Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: don't overwrite display dimensions with coded dimensions.Anton Khirnov2013-04-101-1/+1
| |
| * lavc: extend / update the [coded_]{width,height} doxyAnton Khirnov2013-04-101-5/+9
| |
* | Merge commit '20429ba96e55db17ac57f6c0e330914287f1f614'Michael Niedermayer2013-04-114-7/+14
|\ \ | |/ | | | | | | | | | | * commit '20429ba96e55db17ac57f6c0e330914287f1f614': h261: Move encoder/decoder shared table init to common code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h261: Move encoder/decoder shared table init to common codeDiego Biurrun2013-04-104-7/+14
| |
* | Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'Michael Niedermayer2013-04-116-52/+22
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a': h261: Move shared data tables from a header to a proper C file Conflicts: libavcodec/Makefile libavcodec/h261data.c libavcodec/h261dec.c libavcodec/h261enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h261: Move shared data tables from a header to a proper C fileDiego Biurrun2013-04-105-38/+47
| |
* | mss4: make code independent of sizeof(AVFrame)Paul B Mahol2013-04-111-17/+22
| | | | | | | | | | | | Also fixes #2455. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mss4: use init_get_bits8()Paul B Mahol2013-04-111-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-114-14/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dsputil: Make dsputil selectable Conflicts: configure libavcodec/Makefile libavcodec/x86/Makefile libavcodec/x86/constants.c libavcodec/x86/dsputil_mmx.c libavcodec/x86/dsputil_mmx.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Make dsputil selectableRonald S. Bultje2013-04-109-54/+64
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a'Michael Niedermayer2013-04-111-5/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a': h264: Only initialize dsputil if error resilience is enabled Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Only initialize dsputil if error resilience is enabledRonald S. Bultje2013-04-101-2/+4
| | | | | | | | | | | | | | It is only used for error resilience. This allows building the h264 decoder without dsputil, if error resilience is disabled. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'Michael Niedermayer2013-04-113-15/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '62844c3fd66940c7747e9b2bb7804e265319f43f': h264: Integrate clear_blocks calls with IDCT Conflicts: libavcodec/arm/h264idct_neon.S libavcodec/h264idct_template.c libavcodec/x86/h264_idct.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Integrate clear_blocks calls with IDCTRonald S. Bultje2013-04-1013-77/+209
| | | | | | | | | | | | | | | | | | The non-intra-pcm branch in hl_decode_mb (simple, 8bpp) goes from 700 to 672 cycles, and the complete loop of decode_mb_cabac and hl_decode_mb (in the decode_slice loop) goes from 1759 to 1733 cycles on the clip tested (cathedral), i.e. almost 30 cycles per mb faster. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80'Michael Niedermayer2013-04-111-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e8cafd2773bc56455c8816593cbd9368f2d69a80': h264: Clear the mb members via memset instead of using dsputil Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Clear the mb members via memset instead of using dsputilMartin Storsjö2013-04-101-2/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6d25c9db11e87ec58652de6588448225137b0c57'Michael Niedermayer2013-04-111-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '6d25c9db11e87ec58652de6588448225137b0c57': dsputil: Make square put/avg_pixels functions local to h264qpel Conflicts: libavcodec/dsputil.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Make square put/avg_pixels functions local to h264qpelRonald S. Bultje2013-04-104-49/+24
| | | | | | | | | | | | | | Put a copy of the 8bit functions only in dsputil, where they are used for some other things (e.g. mpeg4qpel, mspel, cavsqpel). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'Michael Niedermayer2013-04-101-7/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'b439c992c23f3e0f3832fffd2a34a664b236c525': lavfi: switch to an AVOptions-based system. dfa: implement missing TDLT coding method Conflicts: libavcodec/dfa.c libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dfa: implement missing TDLT coding methodKostya Shishkov2013-04-091-4/+21
| |
| * h264pred: Add a few missing const declarations for ff_cropTbl derived pointersMartin Storsjö2013-04-081-3/+3
| | | | | | | | | | | | | | | | The pointers that get assigned ff_cropTbl were made const in 9e0f14f1, but other variables that transitively are assigned based on these variables were missed. Signed-off-by: Martin Storsjö <martin@martin.st>
* | x86: sbrdsp: implement SSE2 qmf_pre_shuffleChristophe Gisquet2013-04-102-0/+32
| | | | | | | | | | | | | | From 253 to 51 cycles on Arrandale and Win64. 44 cycles on SandyBridge. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: wait for missing slices only on framesMichael Niedermayer2013-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | The EC code does not support fields currently thus it makes no sense to wait for these cases (which also the check doesnt handle correctly) Fixes Ticket 2454 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/ass: use bprint API in ff_ass_add_rect().Clément Bœsch2013-04-091-19/+26
| |
* | msmpeg4: ignore negative DC overflowMichael Niedermayer2013-04-091-1/+0
| | | | | | | | | | | | Fixes second half of Ticket2414 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | msmpeg4: fix asm code in ff_msmpeg4_pred_dc()Michael Niedermayer2013-04-091-3/+3
| | | | | | | | | | | | Fixes first half of Ticket2414 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-081-10/+12
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables Conflicts: libavcodec/mathtables.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtablesRonald S. Bultje2013-04-083-19/+36
| | | | | | | | | | | | | | | | | | These are widely used throughout libavcodec, nothing dsputil-specific. Change ff_cropTbl to a statically initialized table, to avoid initializing it with a function call. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'Michael Niedermayer2013-04-0810-28/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '9e0f14f16cfc9456a691655fda7d01090bffe47e': lavc: Make pointers to ff_cropTbl const vp3: Embed idct_permutation array directly in VP3DecoderContext Conflicts: libavcodec/bit_depth_template.c libavcodec/vp3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Make pointers to ff_cropTbl constMartin Storsjö2013-04-0815-44/+44
| | | | | | | | | | | | There's no point in these pointers not being const. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vp3: Embed idct_permutation array directly in VP3DecoderContextRonald S. Bultje2013-04-081-3/+5
| | | | | | | | | | | | | | This makes the vp3 decoder less dependent on dsputil, and will aid in making it (eventually) dsputil-independent. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9'Michael Niedermayer2013-04-081-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9': x86: qpel: Move fullpel and l2 functions to a separate file bfin: Make vp3 functions static Conflicts: libavcodec/bfin/vp3_bfin.c libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: qpel: Move fullpel and l2 functions to a separate fileRonald S. Bultje2013-04-084-233/+257
| | | | | | | | | | | | | | This way, they can be shared between mpeg4qpel and h264qpel without requiring either one to be compiled unconditionally. Signed-off-by: Martin Storsjö <martin@martin.st>
| * bfin: Make vp3 functions staticMartin Storsjö2013-04-082-6/+4
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5'Michael Niedermayer2013-04-081-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5': bfin: Don't use the vp3 idct functions if bitexact behaviour is expected Conflicts: libavcodec/bfin/vp3_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bfin: Don't use the vp3 idct functions if bitexact behaviour is expectedMartin Storsjö2013-04-081-2/+4
| | | | | | | | | | | | | | | | In the non-bitexact mode, vp3 currently decodes to the same frame crcs as before 28f9ab702 (and the output visually looks correct). Signed-off-by: Martin Storsjö <martin@martin.st>
* | x86: sbrdsp: implement SSE qmf_deint_bflyChristophe Gisquet2013-04-082-0/+49
| | | | | | | | | | | | | | | | | | | | | | From 312 to 89/68 (sse/sse2) cycles on Arrandale and Win64. Sandybridge: 68/47 cycles. Having a loop counter is a 7 cycle gain. Unrolling is another 7 cycle gain. Working in reverse scan is another 6 cycles. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dfa: implement tdlt chunk decodingPaul B Mahol2013-04-071-4/+19
| | | | | | | | | | | | Sample & pseudo code provided by Vladimir "VAG" Gneushev. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | dpxdec: Fix decoding of RGBA10Michael Niedermayer2013-04-071-1/+2
| | | | | | | | | | | | Fixes Ticket2392 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: fix recoded subtitles end.Nicolas George2013-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | Text subtitles packets are not 0-terminated (and if they are, it is handled by the recoding process since 0 is a valid Unicode code point). The terminating 0 would overwrite the last payload octet. OTOH, packets must be 0-padded. Fix a problem reported in trac ticket #2431.
* | sbrdsp: unroll and use integer operationsChristophe Gisquet2013-04-061-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | This patch can be controversial, by assuming floats are IEEE-754 and particular behaviour of the FPU will get in the way. Timing on Arrandale and Win32 (thus, x87 FPU is used in the reference). sbr_qmf_pre_shuffle_c: 115 to 76 sbr_neg_odd_64_c: 84 to 55 sbr_qmf_post_shuffle_c: 112 to 83 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sbrdsp: unroll sbr_autocorrelate_cChristophe Gisquet2013-04-061-0/+25
| | | | | | | | | | | | 1410 cycles to 1148 on Arrandale/Win64. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud