summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'Michael Niedermayer2014-07-18
|\ | | | | | | | | | | | | * commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46': avdevice: Give names to anonymously typedeffed structs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avdevice: Give names to anonymously typedeffed structsDiego Biurrun2014-07-18
| | | | | | | | | | Anonymous structs can cause trouble in header files, so try to avoid them altogether as a matter of good style.
* | Merge commit '24af1aa0f70362a66cda04c9d7cd012e019f5572'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | * commit '24af1aa0f70362a66cda04c9d7cd012e019f5572': fft: Convert FFT/MDCT permutation type #defines to enums Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fft: Convert FFT/MDCT permutation type #defines to enumsDiego Biurrun2014-07-18
| |
* | Merge commit '746ad4e0df7faf93329804e412ec53c1d929a75b'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | | | | | | | * commit '746ad4e0df7faf93329804e412ec53c1d929a75b': dct-test: Improve CPU flags struct member name Conflicts: libavcodec/dct-test.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dct-test: Improve CPU flags struct member nameDiego Biurrun2014-07-18
| |
* | Merge commit 'cb44b21da1f59923be577f08c267ec270529be97'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | * commit 'cb44b21da1f59923be577f08c267ec270529be97': dct-test: Move cpu_flags variable out of global scope Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dct-test: Move cpu_flags variable out of global scopeDiego Biurrun2014-07-18
| |
* | fate: Add test for wav Peak Envelope Chunk encoder (levl chunk).Peter B2014-07-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix make checkheaders for libavcodec/proresdsp.h.Carl Eugen Hoyos2014-07-18
| |
* | lavfi/drawtext: add alias "expr_int_format" to expansion function "eif"Andrey Utkin2014-07-18
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | smacker: remove dead codeTimothy Gu2014-07-18
| | | | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | * commit '7e18a727d2c2a19f22fcf68875d1b05fd2eafcef': arm: cosmetics: Consistently use lowercase for shift operators Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: cosmetics: Consistently use lowercase for shift operatorsMartin Storsjö2014-07-18
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | * commit 'fe67f3fbb5f9f6a6b60f837f6bc5e087ac11f3bf': arm: cosmetics: Fix a misaligned asm operand Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * arm: cosmetics: Fix a misaligned asm operandMartin Storsjö2014-07-18
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | alpha/me_cmp: move code out of dsputilJames Almer2014-07-18
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | alpha/idctdsp: move disabled cruft out of dsputilJames Almer2014-07-18
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/a64multienc use av_freep()Michael Niedermayer2014-07-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | a64multienc: remove dead assignmentTimothy Gu2014-07-18
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | kerndeint: remove dead assignmentsTimothy Gu2014-07-18
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5a272190a04666f0fe41be767396b30712638c21'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | | | * commit '5a272190a04666f0fe41be767396b30712638c21': armv6: Accelerate butterflies_float See: 57641410d1a386937bec3fddd6c75119550916ec Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * armv6: Accelerate butterflies_floatBen Avison2014-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I benchmarked the result by measuring the number of gperftools samples that hit anywhere in the AAC decoder (starting from aac_decode_frame()) or specifically in butterflies_float_c() / ff_butterflies_float_vfp() for the same sample AAC stream: Before After Mean StdDev Mean StdDev Confidence Change Audio decode 1542.8 43.7 1470.5 41.5 100.0% +4.9% butterflies_float 130.0 11.9 70.2 12.1 100.0% +85.2% Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5edad2c4a1f46bcc56be755af86ab355c2f1b37f'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | | | * commit '5edad2c4a1f46bcc56be755af86ab355c2f1b37f': armv6: Accelerate vector_fmul_window See: 649c666137f43542b45941f42034ab3f44a31d38 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * armv6: Accelerate vector_fmul_windowBen Avison2014-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I benchmarked the result by measuring the number of gperftools samples that hit anywhere in the AAC decoder (starting from aac_decode_frame()) or specifically in vector_fmul_window_c() / ff_vector_fmul_window_vfp() for the same sample AAC stream: Before After Mean StdDev Mean StdDev Confidence Change Audio decode 1598.2 47.4 1529.2 25.4 100.0% +4.5% vector_fmul_window 244.0 22.1 188.9 22.3 100.0% +29.2% Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '87552d54d3337c3241e8a9e1a05df16eaa821496'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | * commit '87552d54d3337c3241e8a9e1a05df16eaa821496': armv6: Accelerate ff_fft_calc for general case (nbits != 4) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * armv6: Accelerate ff_fft_calc for general case (nbits != 4)Ben Avison2014-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation targeted DTS Coherent Acoustics, which only requires nbits == 4 (fft16()). This case was (and still is) linked directly rather than being indirected through ff_fft_calc_vfp(), but now the full range from radix-4 up to radix-65536 is available. This benefits other codecs such as AAC and AC3. The implementaion is based upon the C version, with each routine larger than radix-16 calling a hierarchy of smaller FFT functions, then performing a post-processing pass. This pass benefits a lot from loop unrolling to counter the long pipelines in the VFP. A relaxed calling standard also reduces the overhead of the call hierarchy, and avoiding the excessive inlining performed by GCC probably helps with I-cache utilisation too. I benchmarked the result by measuring the number of gperftools samples that hit anywhere in the AAC decoder (starting from aac_decode_frame()) or specifically in the FFT routines (fft4() to fft512() and pass()) for the same sample AAC stream: Before After Mean StdDev Mean StdDev Confidence Change Audio decode 2245.5 53.1 1599.6 43.8 100.0% +40.4% FFT routines 940.6 22.0 348.1 20.8 100.0% +170.2% Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | | | * commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497': armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6) See: 42c1cc35b7623ce76c7b55c6bc100f135e17cd4f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)Ben Avison2014-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation targeted DTS Coherent Acoustics, which only requires mdct_bits == 6. This relatively small size lent itself to unrolling the loops a small number of times, and encoding offsets calculated at assembly time within the load/store instructions of each iteration. In the more general case (codecs such as AAC and AC3) much larger arrays are used - mdct_bits == [8, 9, 11]. The old method does not scale for these cases, so more integer registers are used with non-unrolled versions of the loops (and with some stack spillage). The postrotation filter loop is still unrolled by a factor of 2 to permit the double-buffering of some VFP registers to facilitate overlap of neighbouring iterations. I benchmarked the result by measuring the number of gperftools samples that hit anywhere in the AAC decoder (starting from aac_decode_frame()) or specifically in ff_imdct_half_c / ff_imdct_half_vfp, for the same example AAC stream: Before After Mean StdDev Mean StdDev Confidence Change aac_decode_frame 2368.1 35.8 2117.2 35.3 100.0% +11.8% ff_imdct_half_* 457.5 22.4 251.2 16.2 100.0% +82.1% Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/dvenc: clear all dsp contextsMichael Niedermayer2014-07-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/me_cmp: restore author attribution and copyrightsMichael Niedermayer2014-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These where removed by libav in See: git show -C 2d60444331fca1910510038dd3817bea885c2367 diff --git a/libavcodec/dsputil.c b/libavcodec/me_cmp.c similarity index 98% rename from libavcodec/dsputil.c rename to libavcodec/me_cmp.c index ba71a99..9fcc937 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/me_cmp.c @@ -1,8 +1,4 @@ /* - * DSP utils - * Copyright (c) 2000, 2001 Fabrice Bellard - * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> - * * This file is part of Libav. * * Libav is free software; you can redistribute it and/or Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2d60444331fca1910510038dd3817bea885c2367'Michael Niedermayer2014-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dsputil: Split motion estimation compare bits off into their own contextDiego Biurrun2014-07-17
| |
* | Merge commit 'a578b0407dc983aecd72028e1127062689b67089'Michael Niedermayer2014-07-17
|\| | | | | | | | | | | | | * commit 'a578b0407dc983aecd72028e1127062689b67089': configure: Assume runtime cpu detection on arm on --target-os=android as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Assume runtime cpu detection on arm on --target-os=android as wellMartin Storsjö2014-07-17
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c23ce454b3e33634a188d6facfd2b7182af5af93'Michael Niedermayer2014-07-17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'c23ce454b3e33634a188d6facfd2b7182af5af93': x86: dsputil: Coalesce all init files Conflicts: libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_x86.h libavcodec/x86/motion_est.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil: Coalesce all init filesDiego Biurrun2014-07-17
| | | | | | | | This makes the init files match the structure of the dsputil split.
* | lavd/x11grab: reindent after last commit.Nicolas George2014-07-17
| |
* | lavfi: check refcount before merging.Nicolas George2014-07-17
| | | | | | | | | | | | | | | | | | | | When merging the formats around the automatically inserted convert filters, the refcount of the format lists can not be 0. Coverity does not detect it, and suspects a memory leak, because if refcount is 0 the newly allocated lists are not stored anywhere. That gives CIDs 1224282, 1224283 and 1224284. Lists with refcount 0 are used in can_merge_formats(), so the asserts can not be moved inside the merge functions.
* | lavd/x11grab: add an option to disable MIT-SHM.Nicolas George2014-07-17
| | | | | | | | | | | | With remote displays supporting the MIT-SHM extension, the extension is detected and used, but attaching fails asynchronously.
* | lavd/x11grab: check 32-bits color masks.Nicolas George2014-07-17
| | | | | | | | | | | | | | The X11 servers by VNC, at 32-bits depths, has the following masks: R:0x000007ff G:0x003ff800 B:0xffc00000 This is not compatible with AV_PIX_FMT_0RGB32, and the result is success with completely wrong colors.
* | lavd/x11grab: change error code for unsupported visuals.Nicolas George2014-07-17
| |
* | lavd/x11grab: disable drawing mouse without XFixes.Nicolas George2014-07-17
| | | | | | | | | | | | Fix a segfault if the XFixes extension is not available on the X11 server. Can be reproduced using the VNC server.
* | avcodec/resample: Use av_m/realloc_array()Michael Niedermayer2014-07-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/resample2: Use av_malloc(z)_array()Michael Niedermayer2014-07-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: use av_mallocz_array()Michael Niedermayer2014-07-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/segment: set segment end time when the first packet arrivesStefano Sabatini2014-07-17
| | | | | | | | | | | | Avoid negative durations in case there is a single packet in the current segment, since in that case the end time is still set to the previous segment end time.
* | lavf/segment: fix weird indentStefano Sabatini2014-07-17
| |
* | lavf/segment: show incoming packet duration in debug messageStefano Sabatini2014-07-17
| |
* | lavf/segment: only use reference frames for computing the segment end timeStefano Sabatini2014-07-17
| | | | | | | | | | | | | | This avoids a systematic overestimate of the segments duration when there are several streams. Fix trac ticket #3724.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 07:56:02 +0000