Timothy Gu
b6f80b16d1
qsvdec: Fix memory leak
...
Fixes CID1396851.
2016-12-06 13:21:08 -08:00
Hendrik Leppkes
68b0d7e0be
Merge commit ' 924e2ecd2b'
...
* commit '924e2ecd2b ':
qsvdec: when a frames ctx is supplied, use its frame dimensions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:20:09 +01:00
Hendrik Leppkes
3c81fa9a9c
Merge commit ' 92736c74fb'
...
* commit '92736c74fb ':
qsvdec: add support for P010 (10-bit 420) decoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:20:00 +01:00
Hendrik Leppkes
220e773915
Merge commit ' ce320cf1c4'
...
* commit 'ce320cf1c4 ':
qsvdec: use the same mfxFrameInfo for allocating frames that was passed to DECODE_Init
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:19:51 +01:00
Hendrik Leppkes
1bc6cdf2fc
Merge commit ' 536bb17e96'
...
* commit '536bb17e96 ':
qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as well
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-11-14 15:19:43 +01:00
Mark Thompson
1f26a231bb
qsv: Merge libav implementation
...
Merged as-at libav 398f015 , and therefore includes outstanding
skipped merges 04b17ff and 130e1f1 .
All features not in libav are preserved, and no options change.
2016-10-31 19:23:40 +00:00
Hendrik Leppkes
3f9137c57d
Merge commit ' 32c8359093'
...
* commit '32c8359093 ':
lavc: export the timestamps when decoding in AVFrame.pts
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-10-07 13:03:36 +02:00
James Almer
e9a5fc9678
Merge commit ' 6f19bbcf85'
...
* commit '6f19bbcf85 ':
qsvdec: move reading the user-provided session to qsv_decode_init()
Conflicts:
libavcodec/qsvdec.c
Merged-by: James Almer <jamrial@gmail.com>
2016-09-28 13:26:12 -03:00
Yuli Khodorkovskiy
f0adb99d06
avcodec/qsvdec: Fix null dereferences in the qsv decoder
...
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-08-07 19:16:24 +02:00
Ivan Uskov
b4054100f6
Revert "Merge commit ' 3c53627ac1'"
...
This reverts commit d30cf57a7b , reversing changes made to
acc155ac55 . The commit d30cf57a7b
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-07-24 18:36:26 +02:00
Anton Khirnov
924e2ecd2b
qsvdec: when a frames ctx is supplied, use its frame dimensions
...
The allocated frame size may be larger than the coded dimensions.
2016-07-03 09:13:29 +02:00
Anton Khirnov
92736c74fb
qsvdec: add support for P010 (10-bit 420) decoding
2016-07-03 09:13:29 +02:00
Anton Khirnov
ce320cf1c4
qsvdec: use the same mfxFrameInfo for allocating frames that was passed to DECODE_Init
...
Stop duplicating this information.
2016-07-03 09:13:29 +02:00
Anton Khirnov
536bb17e96
qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as well
...
Stop hardcoding NV12.
Also, move this function to the shared code, it will be used by the
encoder as well.
2016-07-03 09:13:29 +02:00
Anton Khirnov
32c8359093
lavc: export the timestamps when decoding in AVFrame.pts
...
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-21 19:54:42 +02:00
Anton Khirnov
a0524d9b1e
qsvdec: support getting the session from an AVHWFramesContext
2016-06-21 19:53:38 +02:00
Anton Khirnov
6f19bbcf85
qsvdec: move reading the user-provided session to qsv_decode_init()
...
This is a more appropriate place for it.
2016-06-21 19:52:19 +02:00
Derek Buitenhuis
d30cf57a7b
Merge commit ' 3c53627ac1'
...
* commit '3c53627ac1 ':
qsvdec: store the sync point in heap memory
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-11 14:56:27 +01:00
Anton Khirnov
3c53627ac1
qsvdec: store the sync point in heap memory
...
The reasoning is the same as for the corresponding qsvenc patch.
2016-02-24 10:41:45 +01:00
Hendrik Leppkes
9507f68deb
Merge commit ' 3b6473b43e'
...
* commit '3b6473b43e ':
qsvdec: properly handle the warning from MFXVideoCORE_SyncOperation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-01-04 11:31:43 +01:00
Maxym Dmytrychenko
3b6473b43e
qsvdec: properly handle the warning from MFXVideoCORE_SyncOperation
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-01-01 16:09:14 +01:00
Hendrik Leppkes
b54d645116
qsvdec: fix get_format and hwaccel_context handling
...
This enables the qsv transcoder to actually get activated
2015-10-22 17:01:13 +02:00
Hendrik Leppkes
27673f1bea
Merge commit ' 8aecec8402'
...
* commit '8aecec8402 ':
qsvdec: make ff_qsv_decode_init() static
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:20:05 +02:00
Hendrik Leppkes
9457a11a22
Merge commit ' 2c32eace5e'
...
* commit '2c32eace5e ':
qsvdec: close the MFX decoder on uninit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:17:09 +02:00
Anton Khirnov
8aecec8402
qsvdec: make ff_qsv_decode_init() static
...
It is not used outside of qsvdec.c anymore.
2015-09-28 15:46:58 +02:00
Anton Khirnov
2c32eace5e
qsvdec: close the MFX decoder on uninit
2015-09-28 15:45:17 +02:00
Ivan Uskov
3f8e2e9953
libavcodec/qsvdec.c: correct flush() handler has been implemented
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-07 22:04:02 +02:00
Ivan Uskov
cc167f7e55
libavcodec/qsvdec.c: correct handling of dynamic frame size changing has been implemented
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-07 22:04:02 +02:00
Ivan Uskov
fffae8e605
libavcodec/qsvdec.c: the ff_get_format() missed at refactoring has been restored
...
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-19 14:20:24 +02:00
Ivan Uskov
44857e7a36
libavcodec/qsvdec.c: Extended error messages for MFXVideoDECODE_Init() result
...
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-11 14:18:43 +02:00
Ivan Uskov
9f543e01af
libavcodec/qsvdec.c delay in 1 microsecond replaced to more appropriate 500 microseconds
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28 20:55:17 +02:00
Vittorio Giovara
059a934806
lavc: Consistently prefix input buffer defines
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:59 +01:00
Michael Niedermayer
508b79e6c1
Merge commit ' 41d47ea85f'
...
* commit '41d47ea85f ':
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-26 01:20:46 +02:00
Michael Niedermayer
c3413a712a
Merge commit ' 22522d9c2c'
...
* commit '22522d9c2c ':
qsvdec: fix a memleak of async_fifo
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 23:28:39 +02:00
Michael Niedermayer
ef2a85ac53
Merge commit ' aa9d15d89b'
...
* commit 'aa9d15d89b ':
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-25 23:10:14 +02:00
Anton Khirnov
41d47ea85f
lavc: add Intel libmfx-based HEVC decoder.
2015-07-25 17:37:01 +02:00
Anton Khirnov
96dca089b1
qsvdec: move qsv_process_data() from qsvdec_h264 to the common code
...
It will be shared with the upcoming mpeg2 and hevc decoders.
2015-07-25 17:24:25 +02:00
Anton Khirnov
22522d9c2c
qsvdec: fix a memleak of async_fifo
...
init() is called whenever format changes, so current code would leak the
fifo in this case.
2015-07-25 17:23:46 +02:00
Anton Khirnov
aa9d15d89b
qsvdec: avoid an infinite loop with no consumed data and no output
...
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-25 17:23:29 +02:00
Ivan Uskov
c90dbc67ed
libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of whole packet.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 12:46:55 +02:00
Ivan Uskov
d50ab820da
libavcodec/qsvdec_h264.c: refactoring: functionality of qsv_process_data() has been moved into qsvdec.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 17:10:39 +02:00
Ivan Uskov
1acb19d12b
libavcodec/qsvdec_h264.c: SPS parsing is now performed by MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 03:48:00 +02:00
Ivan Uskov
264ba3d847
libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() call
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 19:57:57 +02:00
Michael Niedermayer
f929081f2e
Merge commit ' f5c4d38c78'
...
* commit 'f5c4d38c78 ':
qsvdec: properly handle asynchronous decoding
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19 16:13:35 +02:00
Anton Khirnov
f5c4d38c78
qsvdec: properly handle asynchronous decoding
...
Wait for async_depth frames before syncing.
2015-07-19 09:47:45 +02:00
Ivan Uskov
6e127990fa
Refactoring to move common QSV-related code part into libavcodec/qsvdec.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-16 21:30:45 +02:00
Ivan Uskov
ce91bab70f
libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler under linux platform.
...
Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-14 02:02:55 +02:00
Michael Niedermayer
7871eb4361
Merge commit ' 66acb76bb0'
...
* commit '66acb76bb0 ':
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-09 11:53:14 +02:00
Anton Khirnov
66acb76bb0
lavc: add Intel libmfx-based HEVC encoder
2015-07-08 23:40:11 +02:00
Michael Niedermayer
d985976e54
Merge commit ' 9ba27c2348'
...
* commit '9ba27c2348 ':
qsvdec: add 'decode' to the non-static function names
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28 01:25:20 +01:00