summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo_enc.c
Commit message (Collapse)AuthorAge
* mpegvideo_enc: disable optimized huffman coding with AMV or slice threadsRostislav Pehlivanov2017-04-09
| | | | | | Doesn't work yet with slice threading and won't work with AMV. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Revert "mjpegenc: disable huffman coding with AMV"Michael Niedermayer2017-04-09
| | | | | | This was the wrong patch This reverts commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8.
* mjpegenc: disable huffman coding with AMVRostislav Pehlivanov2017-04-09
| | | | | | Isn't supported. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* Merge commit '68811a41c70f019bde6df2a4f289674228c48958'Clément Bœsch2017-03-21
|\ | | | | | | | | | | | | * commit '68811a41c70f019bde6df2a4f289674228c48958': mpegvideo_enc: use the new encoding API for b_strategy=2 Merged-by: Clément Bœsch <u@pkh.me>
| * mpegvideo_enc: use the new encoding API for b_strategy=2Anton Khirnov2016-09-28
| |
* | Merge commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9': mpegvideo_enc: handle encoding errors with b_strategy=2 Merged-by: Clément Bœsch <u@pkh.me>
| * mpegvideo_enc: handle encoding errors with b_strategy=2Anton Khirnov2016-09-28
| |
* | Merge commit '6f733ecab6faff2a16534f2ce7d2ffd41c07846b'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit '6f733ecab6faff2a16534f2ce7d2ffd41c07846b': mpegvideo_enc: add const to the AVCodec instance Merged-by: Clément Bœsch <u@pkh.me>
| * mpegvideo_enc: add const to the AVCodec instanceAnton Khirnov2016-09-28
| |
* | avcodec/mjpegenc: Bypass the 2 pass encoding when optimal tables are not ↵Michael Niedermayer2017-02-10
| | | | | | | | | | | | | | | | | | | | requested This limits the bugs, speedloss and extra memory allocation to the case when optimal tables are needed. Fixes regressions with slice multi-threading Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Implement optimal huffman encoding for (M)JPEG.Jerry Jiang2017-02-08
| | | | | | | | | | | | | | > seems to break > make fate-vsynth1-mjpeg-444 Fixed.
* | Merge commit 'd639dcdae022130078c9c84b7b691c5e9694786c'Clément Bœsch2017-02-01
|\| | | | | | | | | | | | | * commit 'd639dcdae022130078c9c84b7b691c5e9694786c': ratecontrol: Move Xvid-related functions to the place they are actually used Merged-by: Clément Bœsch <u@pkh.me>
| * ratecontrol: Move Xvid-related functions to the place they are actually usedVittorio Giovara2016-07-20
| | | | | | | | This will simplify the de-MpegEncContextualization.
| * ratecontrol: Move mpegenc-only function where it is usedVittorio Giovara2016-07-20
| |
* | avcodec/mpegvideo: Fix edge emu buffer overlap with interlaced mpeg4Michael Niedermayer2016-11-17
| | | | | | | | | | | | | | Fixes Ticket5936 Regression since c5fc8ae12622a507d7b9ee30ddcd3734e6de6b1d Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpegvideo_enc: Add missing emms_c() to clear MMX state after SIMD useMichael Niedermayer2016-10-22
| | | | | | | | | | | | Fixes undefined behavior due to calling libc allocation with unclean FPU state Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpegvideo_enc: Clear mmx state in ff_mpv_reallocate_putbitbuffer()Michael Niedermayer2016-10-21
| | | | | | | | | | | | | | This function must be called from the mb or slice encoding loop and MMX state may not be clean there Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpegvideo_enc: fix memory leakTimo Rothenpieler2016-09-26
| | | | | | | | | | | | | | When the input frames contain side data, it will accumulate endlessly in the coded frame, as av_frame_copy_props will append any new side data. Fixes ticket #5799.
* | Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376': Reduce the scope of some variables Merged-by: Clément Bœsch <u@pkh.me>
| * Reduce the scope of some variablesDiego Biurrun2016-05-11
| | | | | | | | | | This avoids unused variable warnings after the next version bump. Also drop a trace level av_log() call that is in the way.
* | Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'Derek Buitenhuis2016-04-11
|\| | | | | | | | | | | | | * commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b': mpegvideo_enc: use avcodec_free_context() instead of av_free() Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpegvideo_enc: use avcodec_free_context() instead of av_free()Anton Khirnov2016-02-26
| |
* | Merge commit '0e9c4fe254073b209970df3e3cb84531bc388e99'Derek Buitenhuis2016-02-03
|\| | | | | | | | | | | | | * commit '0e9c4fe254073b209970df3e3cb84531bc388e99': lavc: Move pre_me to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move pre_me to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpegvideoenc. It is a very codec-specific option, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607'Derek Buitenhuis2016-02-03
|\| | | | | | | | | | | | | * commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607': lavc: Move me_penalty_compensation to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move me_penalty_compensation to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpegvideoenc. It is a very codec-specific options, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '2862b63783b5556f7f3fb2d097629bc6879f833a'Derek Buitenhuis2016-02-03
|\| | | | | | | | | | | | | * commit '2862b63783b5556f7f3fb2d097629bc6879f833a': lavc: Move prediction_method to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move prediction_method to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | | | | | | | This options is only used by huffyuv, ffvhuv, jpegls, mjpeg, mpegvideoenc, png, utvideo. It is a very codec-specific options, so deprecate the global variant. Set proper limits to the maximum allowed values, and update utvideoenc tests to use the new option name. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'Derek Buitenhuis2016-01-31
|\| | | | | | | | | | | | | * commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd': lavc: Move rtp_payload_size to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move rtp_payload_size to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | | | | | | | This option is only used by mpegvideoenc and openh264. It is a very codec-specific option, so deprecate the global variant. The openh264 option is dropped altogether since it is just a fallback for -max_nal_size anyway. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '12b49769223234673db1003d9c43e7483ceb0282'Derek Buitenhuis2016-01-28
|\| | | | | | | | | | | | | * commit '12b49769223234673db1003d9c43e7483ceb0282': lavc: Move mpeg_quant to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move mpeg_quant to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpegvideoenc, and xvid. It is a very codec-specific option, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '1482aff2048511b821ff9feac19426113cc641a2'Derek Buitenhuis2016-01-28
|\| | | | | | | | | | | | | * commit '1482aff2048511b821ff9feac19426113cc641a2': lavc: Move noise_reduction to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move noise_reduction to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpegvideoenc, x264, xavs, and vpx. It is a very codec-specific option, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d'Derek Buitenhuis2016-01-28
|\| | | | | | | | | | | | | * commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d': lavc: Move scenechange_threshold to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move scenechange_threshold to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpegvideoenc, x264, and xavs. It is a very codec-specific option, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7'Derek Buitenhuis2016-01-28
|\| | | | | | | | | | | | | * commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7': lavc: Move frame_skip_* to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move frame_skip_* to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These options are only used by mpegvideoenc and vpx. They are very codec-specific options, so deprecate the global variants. Add an allowed value to the private options for frame_skip_cmp which seems to have been forgotten, but perfectly working. The libvpx frame dropping feature uses one of such option (frame_skip_threshold) without the other three. For this reason rename the option to something more consistent with the other libvpx variables. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '84c4714f397c9c50eb9d49008cc1c08385f68f31'Derek Buitenhuis2016-01-28
|\| | | | | | | | | | | | | * commit '84c4714f397c9c50eb9d49008cc1c08385f68f31': lavc: Move brd_scale to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move brd_scale to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | | | This option is only used by mpegvideoenc, It is a very codec-specific option, so deprecate the global variant. Set proper limits to the maximum allowed values. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'Derek Buitenhuis2016-01-27
|\| | | | | | | | | | | | | * commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92' lavc: Move b_frame_strategy and b_sensitivity to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move b_frame_strategy and b_sensitivity to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | | | | | | | The b_frame_strategy option is only used by mpegvideoenc, qsv, x264, and xavs, while b_sensitivity is only used by mpegvideoenc. These are very codec-specific options, so deprecate the global variants. Set proper limits to the maximum allowed values. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/mpegvideo_enc: Check for integer overflow in ↵Michael Niedermayer2016-01-21
| | | | | | | | | | | | | | | | | | | | ff_mpv_reallocate_putbitbuffer() Fixes assertion failure Fixes: 6568d187979ce17878b6fe5fbbb89142/signal_sigabrt_7ffff6ae7cb7_7176_564bbc6741bdcf907f5c4e685c9a77a2.mpg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpeg4video: Check time_incrMichael Niedermayer2016-01-12
| | | | | | | | | | | | | | | | | | | | Fixes assertion failure Fixes out of memory access Fixes: test_casex.ivf Found-by: Tyson Smith <twsmith@mozilla.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpegvideo_enc: Clip bits_per_raw_sample within valid rangeMichael Niedermayer2016-01-07
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: test_case-mdc.264 (b47be15a120979f5a1a945c938cbef33) Found-by: Tyson Smith <twsmith@mozilla.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/motion_est: Fix mv_penalty table sizeMichael Niedermayer2016-01-05
| | | | | | | | | | | | | | Fixes out of array read Found-by: Tyson Smith <twsmith@mozilla.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3'Hendrik Leppkes2015-12-18
|\| | | | | | | | | | | | | * commit '458e53f51fc75d08df884f8e9eb3d7ded23e97b3': mpegvideo_enc: actually add the side data with vbv_delay to the packet Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * mpegvideo_enc: actually add the side data with vbv_delay to the packetAnton Khirnov2015-12-12
| | | | | | | | Fixes 2507b5dd674834be7261772996f47ae3b95cca69