summaryrefslogtreecommitdiff
path: root/libavcodec/qsvdec.c
Commit message (Collapse)AuthorAge
* Merge commit '32c8359093d1ff4f45ed19518b449b3ac3769d27'Hendrik Leppkes2016-10-07
|\ | | | | | | | | | | | | * commit '32c8359093d1ff4f45ed19518b449b3ac3769d27': lavc: export the timestamps when decoding in AVFrame.pts Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: export the timestamps when decoding in AVFrame.ptsAnton Khirnov2016-06-21
| | | | | | | | | | | | | | | | | | | | | | 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.
| * qsvdec: support getting the session from an AVHWFramesContextAnton Khirnov2016-06-21
| |
* | Merge commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9'James Almer2016-09-28
|\| | | | | | | | | | | | | | | | | | | * commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9': qsvdec: move reading the user-provided session to qsv_decode_init() Conflicts: libavcodec/qsvdec.c Merged-by: James Almer <jamrial@gmail.com>
| * qsvdec: move reading the user-provided session to qsv_decode_init()Anton Khirnov2016-06-21
| | | | | | | | This is a more appropriate place for it.
* | avcodec/qsvdec: Fix null dereferences in the qsv decoderYuli Khodorkovskiy2016-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Revert "Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'"Ivan Uskov2016-07-24
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'Derek Buitenhuis2016-04-11
|\| | | | | | | | | | | | | * commit '3c53627ac17fc6bdea5029be57da1e03b32d265d': qsvdec: store the sync point in heap memory Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsvdec: store the sync point in heap memoryAnton Khirnov2016-02-24
| | | | | | | | The reasoning is the same as for the corresponding qsvenc patch.
* | Merge commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f'Hendrik Leppkes2016-01-04
|\| | | | | | | | | | | | | * commit '3b6473b43eb69fc3faaf69f7fd0b83b51db7607f': qsvdec: properly handle the warning from MFXVideoCORE_SyncOperation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: properly handle the warning from MFXVideoCORE_SyncOperationMaxym Dmytrychenko2016-01-01
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | qsvdec: fix get_format and hwaccel_context handlingHendrik Leppkes2015-10-22
| | | | | | | | This enables the qsv transcoder to actually get activated
* | Merge commit '8aecec84021a61b943718ff3d7c2c57fcd4af199'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '8aecec84021a61b943718ff3d7c2c57fcd4af199': qsvdec: make ff_qsv_decode_init() static Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: make ff_qsv_decode_init() staticAnton Khirnov2015-09-28
| | | | | | | | It is not used outside of qsvdec.c anymore.
* | Merge commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2': qsvdec: close the MFX decoder on uninit Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: close the MFX decoder on uninitAnton Khirnov2015-09-28
| |
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-27
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | libavcodec/qsvdec.c: correct flush() handler has been implementedIvan Uskov2015-09-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvdec.c: correct handling of dynamic frame size changing has ↵Ivan Uskov2015-09-07
| | | | | | | | | | | | been implemented Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvdec.c: the ff_get_format() missed at refactoring has been restoredIvan Uskov2015-08-19
| | | | | | | | | | Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvdec.c: Extended error messages for MFXVideoDECODE_Init() resultIvan Uskov2015-08-11
| | | | | | | | | | Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvdec.c delay in 1 microsecond replaced to more appropriate 500 ↵Ivan Uskov2015-07-28
| | | | | | | | | | | | microseconds Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'Michael Niedermayer2015-07-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: add Intel libmfx-based HEVC decoder.Anton Khirnov2015-07-25
| |
| * qsvdec: move qsv_process_data() from qsvdec_h264 to the common codeAnton Khirnov2015-07-25
| | | | | | | | It will be shared with the upcoming mpeg2 and hevc decoders.
* | Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'Michael Niedermayer2015-07-25
|\| | | | | | | | | | | | | | | | | | | * commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d': qsvdec: fix a memleak of async_fifo Conflicts: libavcodec/qsvdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * qsvdec: fix a memleak of async_fifoAnton Khirnov2015-07-25
| | | | | | | | | | init() is called whenever format changes, so current code would leak the fifo in this case.
* | Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'Michael Niedermayer2015-07-25
|\| | | | | | | | | | | | | | | | | | | * 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>
| * qsvdec: avoid an infinite loop with no consumed data and no outputAnton Khirnov2015-07-25
| | | | | | | | | | | | 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.
* | libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of ↵Ivan Uskov2015-07-24
| | | | | | | | | | | | whole packet. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvdec_h264.c: refactoring: functionality of qsv_process_data() ↵Ivan Uskov2015-07-23
| | | | | | | | | | | | has been moved into qsvdec.c Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvdec_h264.c: SPS parsing is now performed by ↵Ivan Uskov2015-07-23
| | | | | | | | | | | | MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() callIvan Uskov2015-07-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | * commit 'f5c4d38c78347b09478e21a661befff4b2d44643': qsvdec: properly handle asynchronous decoding Conflicts: libavcodec/qsvdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * qsvdec: properly handle asynchronous decodingAnton Khirnov2015-07-19
| | | | | | | | Wait for async_depth frames before syncing.
* | Refactoring to move common QSV-related code part into libavcodec/qsvdec.cIvan Uskov2015-07-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler ↵Ivan Uskov2015-07-14
| | | | | | | | | | | | | | under linux platform. Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'Michael Niedermayer2015-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: add Intel libmfx-based HEVC encoderAnton Khirnov2015-07-08
| |
* | Merge commit '9ba27c2348d26000257e891e40a72facb0d916be'Michael Niedermayer2015-03-28
|\| | | | | | | | | | | | | * commit '9ba27c2348d26000257e891e40a72facb0d916be': qsvdec: add 'decode' to the non-static function names Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qsvdec: add 'decode' to the non-static function namesAnton Khirnov2015-03-27
| |
* | Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'Michael Niedermayer2015-03-28
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * qsvdec: split off some code that will be shared with the encoderAnton Khirnov2015-03-27
| |
* | Merge commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1'Michael Niedermayer2015-03-28
|/ | | | | | | | | | * commit 'b04d009b0e1a34b717f3d3bbf407aef0c742aff1': qsv: rename to qsvdec Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* qsv: rename to qsvdecAnton Khirnov2015-03-27
This is to avoid conflicts with the upcoming QSV encoding support.