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
2016-10-07Merge commit '32c8359093d1ff4f45ed19518b449b3ac3769d27'Hendrik Leppkes
* commit '32c8359093d1ff4f45ed19518b449b3ac3769d27': lavc: export the timestamps when decoding in AVFrame.pts Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-09-28Merge commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9'James Almer
* commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9': qsvdec: move reading the user-provided session to qsv_decode_init() Conflicts: libavcodec/qsvdec.c Merged-by: James Almer <jamrial@gmail.com>
2016-08-07avcodec/qsvdec: Fix null dereferences in the qsv decoderYuli Khodorkovskiy
This patch fixes the h264_qsv decoder issues mentioned in https://ffmpeg.zeranoe.com/forum/viewtopic.php?t=2962. The patch may be tested by specifying h264_qsv as the decoder to ffplay for an h264 encoded file. ffplay -vcodec h264_qsv foo.mts Signed-off-by: Yuli Khodorkovskiy <ykhodo@gmail.com> Push requested-by: Ivan Uskov Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-07-24Revert "Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'"Ivan Uskov
This reverts commit d30cf57a7b2097b565db02ecfffbdc9c16423d0e, reversing changes made to acc155ac55baa95d1c16c0364b02244bc04d83a8. The commit d30cf57a7b2097b565db02ecfffbdc9c16423d0e provided irrelevant code complexity and decoding slowdown. But the main disadvantage of this commit is a decoder crash. So it should be reverted. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-21lavc: export the timestamps when decoding in AVFrame.ptsAnton Khirnov
Currently it's exported as AVFrame.pkt_pts, which is also the only use for that field. The reason it is done like this is that lavc used to export various codec-specific "timing" information in AVFrame.pts, which is not done anymore. Since it is confusing to the callers to have a separate field which is used only for decoder timestamps and nothing else, deprecate pkt_pts and use just AVFrame.pts everywhere.
2016-06-21qsvdec: support getting the session from an AVHWFramesContextAnton Khirnov
2016-06-21qsvdec: move reading the user-provided session to qsv_decode_init()Anton Khirnov
This is a more appropriate place for it.
2016-04-11Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'Derek Buitenhuis
* commit '3c53627ac17fc6bdea5029be57da1e03b32d265d': qsvdec: store the sync point in heap memory Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-24qsvdec: store the sync point in heap memoryAnton Khirnov
The reasoning is the same as for the corresponding qsvenc patch.
2016-01-04Merge commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f'Hendrik Leppkes
* commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f': qsvdec: properly handle the warning from MFXVideoCORE_SyncOperation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-01-01qsvdec: properly handle the warning from MFXVideoCORE_SyncOperationMaxym Dmytrychenko
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-10-22qsvdec: fix get_format and hwaccel_context handlingHendrik Leppkes
This enables the qsv transcoder to actually get activated
2015-09-29Merge commit '8aecec84021a61b943718ff3d7c2c57fcd4af199'Hendrik Leppkes
* commit '8aecec84021a61b943718ff3d7c2c57fcd4af199': qsvdec: make ff_qsv_decode_init() static Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29Merge commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2'Hendrik Leppkes
* commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2': qsvdec: close the MFX decoder on uninit Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-28qsvdec: make ff_qsv_decode_init() staticAnton Khirnov
It is not used outside of qsvdec.c anymore.
2015-09-28qsvdec: close the MFX decoder on uninitAnton Khirnov
2015-09-07libavcodec/qsvdec.c: correct flush() handler has been implementedIvan Uskov
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-07libavcodec/qsvdec.c: correct handling of dynamic frame size changing has ↵Ivan Uskov
been implemented Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-19libavcodec/qsvdec.c: the ff_get_format() missed at refactoring has been restoredIvan Uskov
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-11libavcodec/qsvdec.c: Extended error messages for MFXVideoDECODE_Init() resultIvan Uskov
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28libavcodec/qsvdec.c delay in 1 microsecond replaced to more appropriate 500 ↵Ivan Uskov
microseconds Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: Consistently prefix input buffer definesVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-26Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'Michael Niedermayer
* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986': lavc: add Intel libmfx-based HEVC decoder. Conflicts: Changelog configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/qsvdec.c libavcodec/qsvdec_h2645.c libavcodec/version.h Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-26Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'Michael Niedermayer
* commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d': qsvdec: fix a memleak of async_fifo Conflicts: libavcodec/qsvdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-26Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'Michael Niedermayer
* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d': qsvdec: avoid an infinite loop with no consumed data and no output Conflicts: libavcodec/qsvdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25lavc: add Intel libmfx-based HEVC decoder.Anton Khirnov
2015-07-25qsvdec: move qsv_process_data() from qsvdec_h264 to the common codeAnton Khirnov
It will be shared with the upcoming mpeg2 and hevc decoders.
2015-07-25qsvdec: fix a memleak of async_fifoAnton Khirnov
init() is called whenever format changes, so current code would leak the fifo in this case.
2015-07-25qsvdec: avoid an infinite loop with no consumed data and no outputAnton Khirnov
This is triggerable with the HEVC decoder. It is unclear yet whether the bug is in the calling code or the MSDK, but it seems better to check for this in any case.
2015-07-24libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of ↵Ivan Uskov
whole packet. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23libavcodec/qsvdec_h264.c: refactoring: functionality of qsv_process_data() ↵Ivan Uskov
has been moved into qsvdec.c Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23libavcodec/qsvdec_h264.c: SPS parsing is now performed by ↵Ivan Uskov
MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() callIvan Uskov
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'Michael Niedermayer
* commit 'f5c4d38c78347b09478e21a661befff4b2d44643': qsvdec: properly handle asynchronous decoding Conflicts: libavcodec/qsvdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19qsvdec: properly handle asynchronous decodingAnton Khirnov
Wait for async_depth frames before syncing.
2015-07-16Refactoring to move common QSV-related code part into libavcodec/qsvdec.cIvan Uskov
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler ↵Ivan Uskov
under linux platform. Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-09Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'Michael Niedermayer
* commit '66acb76bb0492b263215ca9b4d927a7be39ace02': lavc: add Intel libmfx-based HEVC encoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/qsv.c libavcodec/qsvenc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09lavc: add Intel libmfx-based HEVC encoderAnton Khirnov
2015-03-28Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'Michael Niedermayer
* commit '9ba27c2348d26000257e891e40a72facb0d916be': qsvdec: add 'decode' to the non-static function names Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'Michael Niedermayer
* commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791': qsvdec: split off some code that will be shared with the encoder Conflicts: libavcodec/Makefile libavcodec/qsvdec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'Michael Niedermayer
* commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1': qsv: rename to qsvdec Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-27qsvdec: add 'decode' to the non-static function namesAnton Khirnov
2015-03-27qsvdec: split off some code that will be shared with the encoderAnton Khirnov
2015-03-27qsv: rename to qsvdecAnton Khirnov
This is to avoid conflicts with the upcoming QSV encoding support.