Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-27Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'Michael Niedermayer
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b': Alias PIX image encoder and decoder Conflicts: Changelog libavcodec/allcodecs.c libavcodec/version.h libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27Alias PIX image encoder and decoderVittorio Giovara
2014-03-27Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: truehd: add hand-scheduled ARM asm version of ff_mlp_pack_output. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit 'fcf5fc444522d24caa9907225802817ae788f511'Michael Niedermayer
* commit 'fcf5fc444522d24caa9907225802817ae788f511': truehd: tune VLC decoding for ARM. Conflicts: libavcodec/mlpdec.c See: e555e1bc39ea71d46a07d0bb847fb426c2dd4d80 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26truehd: break out part of output_data into platform-specific callback.Ben Avison
Verified with profiling that this doesn't have a measurable effect upon overall performance. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.Ben Avison
Profiling results for overall audio decode and the rematrix_channels function in particular are as follows: Before After Mean StdDev Mean StdDev Confidence Change 6:2 total 370.8 17.0 348.8 20.1 99.9% +6.3% 6:2 function 46.4 8.4 45.8 6.6 18.0% +1.2% (insignificant) 8:2 total 343.2 19.0 339.1 15.4 54.7% +1.2% (insignificant) 8:2 function 38.9 3.9 40.2 6.9 52.4% -3.2% (insignificant) 6:6 total 658.4 15.7 604.6 20.8 100.0% +8.9% 6:6 function 109.0 8.7 59.5 5.4 100.0% +83.3% 8:8 total 896.2 24.5 766.4 17.6 100.0% +16.9% 8:8 function 223.4 12.8 93.8 5.0 100.0% +138.3% The assembly version has also been tested with a fuzz tester to ensure that any combinations of inputs not exercised by my available test streams still generate mathematically identical results to the C version. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26truehd: break out part of rematrix_channels into platform-specific callback.Ben Avison
Verified with profiling that this doesn't have a measurable effect upon overall performance. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3'Michael Niedermayer
* commit '15a29c39d9ef15b0783c04b3228e1c55f6701ee3': truehd: add hand-scheduled ARM asm version of mlp_filter_channel. Conflicts: libavcodec/arm/Makefile libavcodec/arm/mlpdsp_init_arm.c See: 87b128d5ef6aeb01cc8bba167c929c74cbf2e7c7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26truehd: add hand-scheduled ARM asm version of mlp_filter_channel.Ben Avison
Profiling results for overall audio decode and the mlp_filter_channel(_arm) function in particular are as follows: Before After Mean StdDev Mean StdDev Confidence Change 6:2 total 380.4 22.0 370.8 17.0 87.4% +2.6% (insignificant) 6:2 function 60.7 7.2 36.6 8.1 100.0% +65.8% 8:2 total 357.0 17.5 343.2 19.0 97.8% +4.0% (insignificant) 8:2 function 60.3 8.8 37.3 3.8 100.0% +61.8% 6:6 total 717.2 23.2 658.4 15.7 100.0% +8.9% 6:6 function 140.4 12.9 81.5 9.2 100.0% +72.4% 8:8 total 981.9 16.2 896.2 24.5 100.0% +9.6% 8:8 function 193.4 15.0 103.3 11.5 100.0% +87.2% Experiments with adding preload instructions to this function yielded no useful benefit, so these have not been included. The assembly version has also been tested with a fuzz tester to ensure that any combinations of inputs not exercised by my available test streams still generate mathematically identical results to the C version. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26truehd: add hand-scheduled ARM asm version of ff_mlp_pack_output.Ben Avison
Profiling results for overall decode and the output_data function in particular are as follows: Before After Mean StdDev Mean StdDev Confidence Change 6:2 total 339.6 15.1 329.3 16.0 95.8% +3.1% (insignificant) 6:2 function 24.6 6.0 9.9 3.1 100.0% +148.5% 8:2 total 324.5 15.5 323.6 14.3 15.2% +0.3% (insignificant) 8:2 function 20.4 3.9 9.9 3.4 100.0% +104.7% 6:6 total 572.8 20.6 539.9 24.2 100.0% +6.1% 6:6 function 54.5 5.6 16.0 3.8 100.0% +240.9% 8:8 total 741.5 21.2 702.5 18.5 100.0% +5.6% 8:8 function 63.9 7.6 18.4 4.8 100.0% +247.3% The assembly version has also been tested with a fuzz tester to ensure that any combinations of inputs not exercised by my available test streams still generate mathematically identical results to the C version. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-26truehd: break out part of output_data into platform-specific callback.Ben Avison
Verified with profiling that this doesn't have a measurable effect upon overall performance. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-26truehd: tune VLC decoding for ARM.Ben Avison
Profiling on a Raspberry Pi revealed the best performance to correspond with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function in particular are as follows: Before After Mean StdDev Mean StdDev Confidence Change 6:2 total 348.8 20.1 339.6 15.1 88.8% +2.7% (insignificant) 6:2 function 38.1 8.1 26.4 4.1 100.0% +44.5% 8:2 total 339.1 15.4 324.5 15.5 99.4% +4.5% 8:2 function 33.8 7.0 27.3 5.6 99.7% +23.6% 6:6 total 604.6 20.8 572.8 20.6 100.0% +5.6% 6:6 function 95.8 8.4 68.9 8.2 100.0% +39.1% 8:8 total 766.4 17.6 741.5 21.2 100.0% +3.4% 8:8 function 106.0 11.4 86.1 9.9 100.0% +23.1% Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-26truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.Ben Avison
Profiling results for overall audio decode and the rematrix_channels function in particular are as follows: Before After Mean StdDev Mean StdDev Confidence Change 6:2 total 370.8 17.0 348.8 20.1 99.9% +6.3% 6:2 function 46.4 8.4 45.8 6.6 18.0% +1.2% (insignificant) 8:2 total 343.2 19.0 339.1 15.4 54.7% +1.2% (insignificant) 8:2 function 38.9 3.9 40.2 6.9 52.4% -3.2% (insignificant) 6:6 total 658.4 15.7 604.6 20.8 100.0% +8.9% 6:6 function 109.0 8.7 59.5 5.4 100.0% +83.3% 8:8 total 896.2 24.5 766.4 17.6 100.0% +16.9% 8:8 function 223.4 12.8 93.8 5.0 100.0% +138.3% The assembly version has also been tested with a fuzz tester to ensure that any combinations of inputs not exercised by my available test streams still generate mathematically identical results to the C version. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-26truehd: break out part of rematrix_channels into platform-specific callback.Ben Avison
Verified with profiling that this doesn't have a measurable effect upon overall performance. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-26truehd: add hand-scheduled ARM asm version of mlp_filter_channel.Ben Avison
Profiling results for overall audio decode and the mlp_filter_channel(_arm) function in particular are as follows: Before After Mean StdDev Mean StdDev Confidence Change 6:2 total 380.4 22.0 370.8 17.0 87.4% +2.6% (insignificant) 6:2 function 60.7 7.2 36.6 8.1 100.0% +65.8% 8:2 total 357.0 17.5 343.2 19.0 97.8% +4.0% (insignificant) 8:2 function 60.3 8.8 37.3 3.8 100.0% +61.8% 6:6 total 717.2 23.2 658.4 15.7 100.0% +8.9% 6:6 function 140.4 12.9 81.5 9.2 100.0% +72.4% 8:8 total 981.9 16.2 896.2 24.5 100.0% +9.6% 8:8 function 193.4 15.0 103.3 11.5 100.0% +87.2% Experiments with adding preload instructions to this function yielded no useful benefit, so these have not been included. The assembly version has also been tested with a fuzz tester to ensure that any combinations of inputs not exercised by my available test streams still generate mathematically identical results to the C version. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-26avcodec/h264_mp4toannexb_bsf: prepend global headers before any in stream ↵Michael Niedermayer
parameter sets Fixes h264_mp4toannexb_bsf_failure.mkv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_init Conflicts: libavcodec/x86/rnd_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6'Michael Niedermayer
* commit '55d7f26e7bcf1dfb69ee986aa9fc21c62e0b3ae6': hpeldsp_template: Move content to hpeldsp Conflicts: libavcodec/hpeldsp_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75'Michael Niedermayer
* commit '09d4389de10b03ea65a84eaf3d6c4b7a7538ad75': hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit '92ba965103d3884609730ba9bf293772dc78a9ef'Michael Niedermayer
* commit '92ba965103d3884609730ba9bf293772dc78a9ef': dsputil: Move draw_edges and clear_block* out of dsputil_template Conflicts: libavcodec/dsputil.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit 'da5be235250a61d6994408b054e3e3acf2e0f90f'Michael Niedermayer
* commit 'da5be235250a61d6994408b054e3e3acf2e0f90f': dsputil: Move RV40-specific bits into rv40dsp Conflicts: libavcodec/dsputil.c libavcodec/rv40dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed'Michael Niedermayer
* commit '8011ac911b3f282b9fb64a0fc15404f8bfc7b7ed': hpeldsp_template: Detemplatize the code Conflicts: libavcodec/hpeldsp_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit '2c01ad8b206d326700974438f7193f22be416eb1'Michael Niedermayer
* commit '2c01ad8b206d326700974438f7193f22be416eb1': dsputil_template: Detemplatize the code Conflicts: libavcodec/dsputil.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f'Michael Niedermayer
* commit 'aba70bb5387f12dfa5e6cd8cb861c9c7e668151f': Add missing headers to make template files compile (more) standalone Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit 'e7373585f827d4ec05d952daa3877e8decfe3c08'Michael Niedermayer
* commit 'e7373585f827d4ec05d952daa3877e8decfe3c08': dsputil_template: Move bits that are used templatized into separate file Conflicts: libavcodec/dsputil_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f'Michael Niedermayer
* commit 'd3c3c1664a958923f234283e66fbcbfe69a6927f': dsputil: Move hpel_template #include out of dsputil_template Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26x86: hpeldsp: Keep all rnd_template instantiations in hpeldsp_initDiego Biurrun
There is no point in having a separate file just for the instantiation that provides the public functions.
2014-03-26hpeldsp_template: Move content to hpeldspDiego Biurrun
There is no point in having this separate; it is not used as a template.
2014-03-26hpeldsp_template: Drop av_unused attribute from *_no_rnd_pixels16_8_c functionsDiego Biurrun
2014-03-26dsputil: Move draw_edges and clear_block* out of dsputil_templateDiego Biurrun
The functions are not used templatized.
2014-03-26dsputil: Move RV40-specific bits into rv40dspDiego Biurrun
2014-03-26hpeldsp_template: Detemplatize the codeDiego Biurrun
The indirection makes no sense without multiple instantiation.
2014-03-26dsputil_template: Detemplatize the codeDiego Biurrun
The indirection makes no sense without multiple instantiation.
2014-03-26Add missing headers to make template files compile (more) standaloneDiego Biurrun
2014-03-26dsputil_template: Move bits that are used templatized into separate fileDiego Biurrun
This allows detemplatizing the bits that are not instantiated twice.
2014-03-26dsputil: Move hpel_template #include out of dsputil_templateDiego Biurrun
Multiple inclusion makes no sense as it is only used in the 8-bit case.
2014-03-26x86: h264_qpel: Fix typo in CALL_2X_PIXELS macro invocationDiego Biurrun
This fixes FATE with mmxext CPUFLAGS set.
2014-03-26avcodec/h261: move b_stride/b_xy under the if() where they are usedMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26avcodec/hevc: Export picture typeMichael Niedermayer
This only uses the first slice, improvement here is welcome analyzing all slices the trivial way would interfere with threads Fixes Ticket3185 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26avcodec/h261dec: fix motion vector vissualizationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avcodec: add missing includes Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25libavcodec/*/vp8dsp_init: indentPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25On2 VP7 decoderPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: BBB previous patch reviewed by jason Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25avcodec/vp8: vp8_find_free_bufferPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25avcodec: add missing includesVittorio Giovara
2014-03-25avcodec/svq1enc: fix undefined pointer operationMichael Niedermayer
Fixes Ticket3152 This also removes the dependance on ff_init_block_index/ff_update_block_index() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25avcodec/x86/mpegvideoenc_template: fix integer overflowMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'Michael Niedermayer
* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834': build: Add config option for CABAC code Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24avcodec/h264: use ff_h264_set_erpic() instead of memsetMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24libx265: Only use one memcpy for headersDerek Buitenhuis
They're guaranteed by the x265 API to be contiguous in memory. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>