summaryrefslogtreecommitdiff
path: root/libavcodec/qsvdec.c
Commit message (Collapse)AuthorAge
* Merge commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726'James Almer2018-09-02
|\ | | | | | | | | | | | | * commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726': avcodec/qsv: fix async support Merged-by: James Almer <jamrial@gmail.com>
| * avcodec/qsv: fix async supportDmitry Rogozhkin2018-07-26
| | | | | | | | | | | | | | | | | | | | | | Current implementations of qsv components incorrectly work with async level, they actually try to work in async+1 level stepping into MFX_WRN_DEVICE_BUSY and polling loop. This change address this misbehaviour. Signed-off-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com> Cc: Maxym Dmytrychenko <maxim.d33@gmail.com> Cc: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit '54307b35311e9a871b3d8ecb2b2eecfc16de0163'James Almer2018-04-13
|\| | | | | | | | | | | | | * commit '54307b35311e9a871b3d8ecb2b2eecfc16de0163': lavc/qsvdec: set complete_frame flags for progressive picture Merged-by: James Almer <jamrial@gmail.com>
| * lavc/qsvdec: set complete_frame flags for progressive pictureZhong Li2018-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the flag MFX_BITSTREAM_COMPLETE_FRAME when it is a progressive picture. This can fix vc1 decoding segment fault issues because can't set the start code correctly. See: ./avconv -hwaccel qsv -c:v vc1_qsv -i /fate-suite/vc1/SA00040.vc1 -vf "hwdownload, format=nv12" -f rawvideo /dev/null v2: fix some h264 interlaced clips regression a. field_order of some h264 interlaced video (e.g: cama3_vtc_b.avc) is marked as AV_FIELD_UNKNOWN in h264_parser.c. This is not a completed frames. So only set the MFX_BITSTREAM_COMPLETE_FRAME when it is progressive. b. some clips have both progressive and interlaced frames (e.g.CAPAMA3_Sand_F.264), the parsed field_order maybe changed druing the decoding progress. This patch has been verified for other codecs(mpeg2/hevc/vp8). Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit '52ed83fa1a7f5170447eff6fad0b6c57119596e9'James Almer2018-04-13
|\| | | | | | | | | | | | | * commit '52ed83fa1a7f5170447eff6fad0b6c57119596e9': lavc/qsvdec: expose frame pic_type and key_frame Merged-by: James Almer <jamrial@gmail.com>
| * lavc/qsvdec: expose frame pic_type and key_frameZhong Li2018-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently pict_type and key_frame are unset. Add an extra param to fetch the picture type from qsv decoder The judgement “key frame is equal to IDR frame” only suitable for H264. For HEVC, all IRAP frames are key frames, and other codecs have no IDR frame. Signed-off-by: ChaoX A Liu <chaox.a.liu@intel.com> Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit '6829a079444e10818a847e153121fb458cc5c0a8'James Almer2018-02-11
|\| | | | | | | | | | | | | * commit '6829a079444e10818a847e153121fb458cc5c0a8': qsvdec: Relax the surface vs coded dimension check Merged-by: James Almer <jamrial@gmail.com>
| * qsvdec: Relax the surface vs coded dimension checkZhong Li2018-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a common vp8 decoding failure. Many vp8 clips cannot decode if hw_frames_ctx is enabled, reporting "Error during QSV decoding.: incompatible video parameters (-14)". It is due to mfx.FrameInfo.Width/Height not matching coded_w/coded_h. See: avconv -hwaccel qsv -init_hw_device qsv -c:v vp8_qsv -i vp8-test-vectors-r1/vp80-00-comprehensive-001.ivf -vf "hwdownload,format=nv12" -pix_fmt yuv420p -f md5 - Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'cbe28bc069dde1d53d937ee10700bb123279c7c8'Mark Thompson2018-01-16
|\| | | | | | | | | | | | | * commit 'cbe28bc069dde1d53d937ee10700bb123279c7c8': qsv: better to use alignment by 16 and HEVC 10b requires alignment by 32 Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv: better to use alignment by 16 and HEVC 10b requires alignment by 32Maxym Dmytrychenko2018-01-08
| |
| * lavc: Add hardware config metadata for decoders supporting hardware outputMark Thompson2017-12-19
| | | | | | | | | | | | | | | | | | This includes a pointer to the associated hwaccel for decoders using hwaccels - these will be used later to implement the hwaccel setup without needing a global list. Also added is a new file listing all hwaccels as external declarations - this will be used later to generate the hwaccel list at configure time.
| * qsvdec: Allow use of hw_device_ctx to make the internal sessionMark Thompson2017-04-02
| |
| * qsv: Add ability to create a session from a deviceMark Thompson2017-04-02
| |
* | lavc: Add hardware config metadata for decoders supporting hardware outputMark Thompson2017-11-26
| | | | | | | | | | | | | | | | | | This includes a pointer to the associated hwaccel for decoders using hwaccels - these will be used later to implement the hwaccel setup without needing a global list. Also added is a new file listing all hwaccels as external declarations - this will be used later to generate the hwaccel list at configure time.
* | qsvdec: Allow use of hw_device_ctx to make the internal sessionMark Thompson2017-06-14
| | | | | | | | (cherry picked from commit 8848ba0bd6b035af77d4f13aa0d8aaaad9806fe8)
* | qsv: Add ability to create a session from a deviceMark Thompson2017-06-14
| | | | | | | | (cherry picked from commit 4936a48b1e6fc2147599541f8b25f43a8a9d1f16)
* | Merge commit 'b68e353136db6f963212c457281d9716516cdc59'Clément Bœsch2017-05-05
|\| | | | | | | | | | | | | * commit 'b68e353136db6f963212c457281d9716516cdc59': qsvdec: do not sync PIX_FMT_QSV surfaces Merged-by: Clément Bœsch <cboesch@gopro.com>
| * qsvdec: do not sync PIX_FMT_QSV surfacesAnton Khirnov2017-01-12
| | | | | | | | | | | | | | | | | | | | Introducing enforced sync points in arbitrary places is bad for performance. Since the vast majority of receiving code (QSV VPP or encoders, retrieving frames through hwcontext) will do the syncing, this change should not be visible to most callers. But bumping micro just in case. This is also consistent with what VAAPI hwaccel does.
| * qsvdec: Fix memory leak on errorTimothy Gu2016-12-08
| | | | | | | | | | Bug-Id: CID 1396851 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb'Clément Bœsch2017-04-01
|\| | | | | | | | | | | | | * commit '76167140a91c081a0cf9d0abcaa4da18d1bacadb': qsvdec: Drop stray extra braces around initializer Merged-by: Clément Bœsch <u@pkh.me>
| * qsvdec: Drop stray extra braces around initializerDiego Biurrun2016-11-17
| | | | | | | | libavcodec/qsvdec.c:93:5: warning: braces around scalar initializer
* | Merge commit '0940b748bdba36c4894fc8ea6be631d821fdf578'James Almer2017-03-31
|\| | | | | | | | | | | | | * commit '0940b748bdba36c4894fc8ea6be631d821fdf578': qsvdec: Only warn about unconsumed data if it happens more than once Merged-by: James Almer <jamrial@gmail.com>
| * qsvdec: Only warn about unconsumed data if it happens more than onceMark Thompson2016-11-14
| |
| * qsvdec: Pass field order information to libmfxMark Thompson2016-11-14
| | | | | | | | The VC-1 decoder fails to initialise if this is not set.
| * qsvdec: Pass the correct profile to libmfxMark Thompson2016-11-14
| | | | | | | | | | | | | | | | | | This was correct for H.26[45], because libmfx uses the same values derived from profile_idc and the constraint_set flags, but it is wrong for other codecs. Also avoid passing FF_LEVEL_UNKNOWN (-99) as the level, as this is certainly invalid.
* | Merge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'Mark Thompson2017-03-30
|\| | | | | | | | | | | | | * commit '4ab61cd983b539749bd621ea271624ddb5196a8e': qsv{enc,dec}: extend the internal frame allocator Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv{enc,dec}: extend the internal frame allocatorAnton Khirnov2016-11-07
| | | | | | | | | | | | | | Handle the internal frame requests, which is required by the HEVC encoding plugin. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit '00aeedd84105a17f414185bd33ecadebeddb3a27'Mark Thompson2017-03-30
|\| | | | | | | | | | | | | * commit '00aeedd84105a17f414185bd33ecadebeddb3a27': qsv{dec,enc}: use a struct as a memory id with internal memory allocator Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv{dec,enc}: use a struct as a memory id with internal memory allocatorAnton Khirnov2016-11-07
| | | | | | | | | | | | | | This will allow implementing the allocator more fully, which is needed by the HEVC encoder plugin with video memory input. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'Mark Thompson2017-03-30
|\| | | | | | | | | | | | | | | | | * commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c': qsv{dec,enc}: always use an internal mfxFrameSurface1 Minor fixups for differences in the QSV encoder because of a53cc. Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv{dec,enc}: always use an internal mfxFrameSurface1Anton Khirnov2016-11-07
| | | | | | | | | | | | | | | | For encoding, this avoids modifying the input surface, which we are not allowed to do. This will also be useful in the following commits. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit '801ac7156d3efb8e088fb6024f568eb36a293887'Clément Bœsch2017-03-27
|\| | | | | | | | | | | | | * commit '801ac7156d3efb8e088fb6024f568eb36a293887': qsv: Be informative when reporting that no data has been consumed Merged-by: Clément Bœsch <u@pkh.me>
| * qsv: Be informative when reporting that no data has been consumedLuca Barbato2016-10-30
| |
* | Merge commit 'e328178da90f44690e0076f4dbfd16da9175f441'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit 'e328178da90f44690e0076f4dbfd16da9175f441': qsvdec: only access hwaccel_context is the pixel format is QSV Merged-by: Clément Bœsch <u@pkh.me>
| * qsvdec: only access hwaccel_context is the pixel format is QSVAnton Khirnov2016-07-31
| | | | | | | | | | | | | | We do not strictly specify that hwaccel_context must be cleared if no hwaccel is used. Reported-By: wm4 <nfxjfg@googlemail.com>
* | Merge commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49'Mark Thompson2017-03-12
|\| | | | | | | | | | | | | * commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49': qsv: print more complete error messages Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv: print more complete error messagesAnton Khirnov2016-07-22
| | | | | | | | Include the libmfx error code and its description
* | qsvdec: Fix memory leakTimothy Gu2016-12-06
| | | | | | | | Fixes CID1396851.
* | Merge commit '924e2ecd2b7d51cca60c79351ef16b04dd4245c3'Hendrik Leppkes2016-11-14
|\| | | | | | | | | | | | | * commit '924e2ecd2b7d51cca60c79351ef16b04dd4245c3': qsvdec: when a frames ctx is supplied, use its frame dimensions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: when a frames ctx is supplied, use its frame dimensionsAnton Khirnov2016-07-03
| | | | | | | | The allocated frame size may be larger than the coded dimensions.
* | Merge commit '92736c74fb1633e36f7134a880422a9b7db14d3f'Hendrik Leppkes2016-11-14
|\| | | | | | | | | | | | | * commit '92736c74fb1633e36f7134a880422a9b7db14d3f': qsvdec: add support for P010 (10-bit 420) decoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: add support for P010 (10-bit 420) decodingAnton Khirnov2016-07-03
| |
* | Merge commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991'Hendrik Leppkes2016-11-14
|\| | | | | | | | | | | | | * commit 'ce320cf1c4daab3e2e3726ed7d2e879d10f7b991': qsvdec: use the same mfxFrameInfo for allocating frames that was passed to DECODE_Init Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: use the same mfxFrameInfo for allocating frames that was passed to ↵Anton Khirnov2016-07-03
| | | | | | | | | | | | DECODE_Init Stop duplicating this information.
* | Merge commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa'Hendrik Leppkes2016-11-14
|\| | | | | | | | | | | | | * commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa': qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as well Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvdec: make ff_qsv_map_pixfmt() return a MFX fourcc as wellAnton Khirnov2016-07-03
| | | | | | | | | | | | | | Stop hardcoding NV12. Also, move this function to the shared code, it will be used by the encoder as well.
* | qsv: Merge libav implementationMark Thompson2016-10-31
| | | | | | | | | | | | | | 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.
* | 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
| |