summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/wmapro: redone stream selection for XMA1/2Paul B Mahol2017-01-19
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lavc/h264: simplify find_unused_picture()Clément Bœsch2017-01-19
|
* avformat/caf: add 'aacl' codec tagPiotr Bandurski2017-01-19
| | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: pass output stream duration as a hint to the muxerTobias Rapp2017-01-19
| | | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/wmaprodec: >2 channel support for XMAPaul B Mahol2017-01-19
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter:vf_drawtext: add new line space size set parameterSteven Liu2017-01-19
| | | | | | | | add line_spacing parameter to set the space between two lines Based on an idea by: Leandro Santiago <leandrosansilva@gmail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avformat/hlsenc: fix bug of hlsenc http delete old segmentsSteven Liu2017-01-19
| | | | | | | | when push hls to http server, the old segemnts can not delete by hls formats. so add the http option into hls_delete_old_segments Reported-by: Yin Jiaoyuan <yinjiaoyuan@163.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* lavc/h264dec: remove flush goto in decode callbackClément Bœsch2017-01-18
|
* avformat/hlsenc: remove debug message used error level logSteven Liu2017-01-18
| | | | Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* hwcontext_vdpau: Fix missing subscriptsMark Thompson2017-01-17
| | | | | | Also remove the redundant casts which were hiding the error here. (cherry picked from commit 7081620aca36e616ea96f71fd71d2703e3abae09)
* lavc: Remove old vaapi decode infrastructureMark Thompson2017-01-17
| | | | | | | Deprecates struct vaapi_context and the installed header vaapi.h, to be removed at the next version bump. (cherry picked from commit 851960f6f8cf1f946fe42fa36cf6598fac68072c)
* ffmpeg_vaapi: Convert to use hw_frames_ctx onlyMark Thompson2017-01-17
| | | | | | Most of the functionality here has moved into lavc. (cherry picked from commit 3e8651a7ccd8e89cc2f162cf614a3c9f7f4d9fcf)
* vaapi_vp9: Convert to use the new VAAPI hwaccel codeMark Thompson2017-01-17
|
* vaapi_hevc: Convert to use the new VAAPI hwaccel codeAnton Khirnov2017-01-17
| | | | | (cherry picked from commit ea8b730d8e67152107d7fcdd5590bbb51ec236b1) Signed-off-by: Mark Thompson <sw@jkqxz.net>
* vaapi_mpeg4: Convert to use the new VAAPI hwaccel codeMark Thompson2017-01-17
| | | | (cherry picked from commit ccd0316f7cab760a93052206e8150f6b178c1e39)
* vaapi_vc1: Convert to use the new VAAPI hwaccel codeMark Thompson2017-01-17
| | | | (cherry picked from commit 520fb77285ff0e7da1449d2b60742865b0b43ae8)
* vaapi_mpeg2: Convert to use the new VAAPI hwaccel codeMark Thompson2017-01-17
| | | | (cherry picked from commit 102e13c353de43aa0cb1aa1843804d195c2a9164)
* vaapi_h264: Convert to use the new VAAPI hwaccel codeMark Thompson2017-01-17
| | | | (cherry picked from commit 2fe93244ab9465ef19c756a41524cbbf0580ee48)
* lavc: Rewrite VAAPI decode infrastructureMark Thompson2017-01-17
| | | | | | | | | | Moves much of the setup logic for VAAPI decoding into lavc; the user now need only provide the hw_frames_ctx. (cherry picked from commit 123ccd07c55ccf075cc5daf5581237fbccb86bdb) (cherry picked from commit 5e879b54a3a46817ea6c8a95a9aecab1176418b9) (cherry picked from commit 0aec37e625821040c103641eec9c1e7a1efa2952) (cherry picked from commit cfa4eb4fba782f3f37a33be997b27a91a07053c9)
* vaapi_vc1: Remove redundant version checkMark Thompson2017-01-17
| | | | | | | The lowest supported VAAPI version is 0.34 (checked at configure time), so this test is no longer needed. (cherry picked from commit 5a667322f5cb0e77c15891fc06725c19d8f3314f)
* vaapi_vc1: Constify pointersMark Thompson2017-01-17
| | | | (cherry picked from commit 01d6f84f49a55fd591aa120960fce2b9dba92d0d)
* vaapi_mpeg2: Constify pointersMark Thompson2017-01-17
| | | | (cherry picked from commit ee9061293e925916fe2e0b7c08fbbd1f981b1d29)
* vaapi_h264: Constify pointersMark Thompson2017-01-17
| | | | (cherry picked from commit 03adfe913062c6995136eb1ca51152b6d596c0f4)
* libavformat/mpegtsenc: support hevc with missing in stream headers like h.264Michael Niedermayer2017-01-17
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: Don't disable SSA Optimizer on MSVC v19.00.24218+.Kacper Michajłow2017-01-17
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'f450cc7bc595155bacdb9f5d2414a076ccf81b4a'Matthieu Bouron2017-01-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f450cc7bc595155bacdb9f5d2414a076ccf81b4a': h264: eliminate decode_postinit() Also includes fixes from 1f7b4f9abc and e344e65109. Original patch replace H264Context.next_output_pic (H264Picture *) by H264Context.output_frame (AVFrame *). This change is discarded as it is incompatible with the frame reconstruction and motion vectors display code which needs the extra information from the H264Picture. Merged-by: Clément Bœsch <u@pkh.me> Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
| * h264: eliminate decode_postinit()Anton Khirnov2016-07-15
| | | | | | | | | | | | | | | | This function's purpose is not very well defined. Currently it does two (only marginally related) things: selecting the next output frame and calling ff_thread_finish_setup() for frame threading. The first of those more properly belongs under field_start(), while the second can be called directly from decode_nal_units().
* | avutil/tests: add aes_ctr, audio_fifo and imgutils to .gitignoreMatthieu Bouron2017-01-17
| |
* | configure: Fix standalone compilation of aiff and caf muxers.Carl Eugen Hoyos2017-01-16
| |
* | lavc/h264dec: reconstruct and debug flush frames as wellClément Bœsch2017-01-16
| |
* | lavc/h264_slice: drop redundant current_slice resetClément Bœsch2017-01-16
| | | | | | | | It is done unconditionally in ff_h264_field_end()
* | lavc/pthread_frame: protect read state access in setup finish functionClément Bœsch2017-01-16
| |
* | avformat/aadec: use avio_get_str()Paul B Mahol2017-01-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/aadec: stop ignoring file metadataPaul B Mahol2017-01-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec: add SIPR parserPaul B Mahol2017-01-16
| | | | | | | | | | | | Fixes #2056. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | dxva2: allow an empty array of ID3D11VideoDecoderOutputViewSteve Lhomme2017-01-16
| | | | | | | | | | | | | | | | | | We can pick the correct slice index directly from the ID3D11VideoDecoderOutputView casted from data[3]. Also added myself as maintainer for DXVA2 and D3D11VA. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dxva2: get the slice number directly from the surface in D3D11VASteve Lhomme2017-01-16
| | | | | | | | | | | | | | | | | | No need to loop through the known surfaces, we'll use the requested surface anyway. The loop is only done for DXVA2. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dxva2: use a single macro to test if the DXVA context is validSteve Lhomme2017-01-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libopenmpt: add missing avio_read return value checkAndreas Cadhalpun2017-01-16
| | | | | | | | | | | | | | | | | | This fixes heap-buffer-overflows in libopenmpt caused by interpreting the negative size value as unsigned size_t. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Reviewed-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dcaenc: Implementation of Huffman codes for DCA encoderDaniil Cherednik2017-01-15
| | | | | | | | Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | dcaenc: Reverse data layout to prevent data copies during Huffman encoding ↵Daniil Cherednik2017-01-15
| | | | | | | | | | | | introduction Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | matroskaenc: remove unofficial compliance on color informationRostislav Pehlivanov2017-01-15
| | | | | | | | | | | | | | | | | | | | When support for this was added the details weren't yet finalized. This is no longer the case. Fixes writing of mkv/webm files with HDR. Reported-by: Kagami Hiiragi <kagami@genshiken.org> Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com> Reviewed-by: James Almer <jamrial@gmail.com>
* | aarch64: vp9mc: Fix a comment to refer to a register with the right nameMartin Storsjö2017-01-14
| | | | | | | | | | | | | | This is cherrypicked from libav commit 85ad5ea72ce3983947a3b07e4b35c66cb16dfaba. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | aarch64: vp9dsp: Fix vertical alignment in the init fileMartin Storsjö2017-01-14
| | | | | | | | | | | | | | This is cherrypicked from libav commit 65074791e8f8397600aacc9801efdd17777eb6e3. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | arm: vp9mc: Fix vertical alignment of operandsMartin Storsjö2017-01-14
| | | | | | | | | | | | | | This is cherrypicked from libav commit c536e5e8698110c139b1c17938998a5547550aa3. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | aarch64: vp9itxfm: Skip empty slices in the first pass of idct_idct 16x16 ↵Martin Storsjö2017-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and 32x32 This work is sponsored by, and copyright, Google. Previously all subpartitions except the eob=1 (DC) case ran with the same runtime: vp9_inv_dct_dct_16x16_sub16_add_neon: 1373.2 vp9_inv_dct_dct_32x32_sub32_add_neon: 8089.0 By skipping individual 8x16 or 8x32 pixel slices in the first pass, we reduce the runtime of these functions like this: vp9_inv_dct_dct_16x16_sub1_add_neon: 235.3 vp9_inv_dct_dct_16x16_sub2_add_neon: 1036.7 vp9_inv_dct_dct_16x16_sub4_add_neon: 1036.7 vp9_inv_dct_dct_16x16_sub8_add_neon: 1036.7 vp9_inv_dct_dct_16x16_sub12_add_neon: 1372.1 vp9_inv_dct_dct_16x16_sub16_add_neon: 1372.1 vp9_inv_dct_dct_32x32_sub1_add_neon: 555.1 vp9_inv_dct_dct_32x32_sub2_add_neon: 5190.2 vp9_inv_dct_dct_32x32_sub4_add_neon: 5180.0 vp9_inv_dct_dct_32x32_sub8_add_neon: 5183.1 vp9_inv_dct_dct_32x32_sub12_add_neon: 6161.5 vp9_inv_dct_dct_32x32_sub16_add_neon: 6155.5 vp9_inv_dct_dct_32x32_sub20_add_neon: 7136.3 vp9_inv_dct_dct_32x32_sub24_add_neon: 7128.4 vp9_inv_dct_dct_32x32_sub28_add_neon: 8098.9 vp9_inv_dct_dct_32x32_sub32_add_neon: 8098.8 I.e. in general a very minor overhead for the full subpartition case due to the additional cmps, but a significant speedup for the cases when we only need to process a small part of the actual input data. This is cherrypicked from libav commits cad42fadcd2c2ae1b3676bb398844a1f521a2d7b and a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | arm: vp9itxfm: Skip empty slices in the first pass of idct_idct 16x16 and 32x32Martin Storsjö2017-01-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This work is sponsored by, and copyright, Google. Previously all subpartitions except the eob=1 (DC) case ran with the same runtime: Cortex A7 A8 A9 A53 vp9_inv_dct_dct_16x16_sub16_add_neon: 3188.1 2435.4 2499.0 1969.0 vp9_inv_dct_dct_32x32_sub32_add_neon: 18531.7 16582.3 14207.6 12000.3 By skipping individual 4x16 or 4x32 pixel slices in the first pass, we reduce the runtime of these functions like this: vp9_inv_dct_dct_16x16_sub1_add_neon: 274.6 189.5 211.7 235.8 vp9_inv_dct_dct_16x16_sub2_add_neon: 2064.0 1534.8 1719.4 1248.7 vp9_inv_dct_dct_16x16_sub4_add_neon: 2135.0 1477.2 1736.3 1249.5 vp9_inv_dct_dct_16x16_sub8_add_neon: 2446.7 1828.7 1993.6 1494.7 vp9_inv_dct_dct_16x16_sub12_add_neon: 2832.4 2118.3 2266.5 1735.1 vp9_inv_dct_dct_16x16_sub16_add_neon: 3211.7 2475.3 2523.5 1983.1 vp9_inv_dct_dct_32x32_sub1_add_neon: 756.2 456.7 862.0 553.9 vp9_inv_dct_dct_32x32_sub2_add_neon: 10682.2 8190.4 8539.2 6762.5 vp9_inv_dct_dct_32x32_sub4_add_neon: 10813.5 8014.9 8518.3 6762.8 vp9_inv_dct_dct_32x32_sub8_add_neon: 11859.6 9313.0 9347.4 7514.5 vp9_inv_dct_dct_32x32_sub12_add_neon: 12946.6 10752.4 10192.2 8280.2 vp9_inv_dct_dct_32x32_sub16_add_neon: 14074.6 11946.5 11001.4 9008.6 vp9_inv_dct_dct_32x32_sub20_add_neon: 15269.9 13662.7 11816.1 9762.6 vp9_inv_dct_dct_32x32_sub24_add_neon: 16327.9 14940.1 12626.7 10516.0 vp9_inv_dct_dct_32x32_sub28_add_neon: 17462.7 15776.1 13446.2 11264.7 vp9_inv_dct_dct_32x32_sub32_add_neon: 18575.5 17157.0 14249.3 12015.1 I.e. in general a very minor overhead for the full subpartition case due to the additional loads and cmps, but a significant speedup for the cases when we only need to process a small part of the actual input data. In common VP9 content in a few inspected clips, 70-90% of the non-dc-only 16x16 and 32x32 IDCTs only have nonzero coefficients in the upper left 8x8 or 16x16 subpartitions respectively. This is cherrypicked from libav commit 9c8bc74c2b40537b0997f646c87c008042d788c2. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | arm: vp9itxfm: Only reload the idct coeffs for the iadst_idct combinationMartin Storsjö2017-01-14
| | | | | | | | | | | | | | | | | | | | | | | | This avoids reloading them if they haven't been clobbered, if the first pass also was idct. This is similar to what was done in the aarch64 version. This is cherrypicked from libav commit 3c87039a404c5659ae9bf7454a04e186532eb40b. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | aarch64: vp9itxfm: Don't repeatedly set x9 when nothing overwrites itMartin Storsjö2017-01-14
| | | | | | | | | | | | | | This is cherrypicked from libav commit 2f99117f6ff24ce5be2abb9e014cb8b86c2aa0e0. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | arm: vp9itxfm: Rename a macro parameter to fit betterMartin Storsjö2017-01-14
| | | | | | | | | | | | | | | | | | | | | | | | Since the same parameter is used for both input and output, the name inout is more fitting. This matches the naming used below in the dmbutterfly macro. This is cherrypicked from libav commit 79566ec8c77969d5f9be533de04b1349834cca62. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>