summaryrefslogtreecommitdiffstats
path: root/libavcodec/qsv_internal.h
Commit message (Collapse)AuthorAgeFilesLines
* qsv: Add ability to create a session from a deviceMark Thompson2017-06-141-3/+6
| | | | (cherry picked from commit 4936a48b1e6fc2147599541f8b25f43a8a9d1f16)
* Merge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'Mark Thompson2017-03-301-1/+12
|\ | | | | | | | | | | | | * 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-071-1/+12
| | | | | | | | | | | | | | 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-301-2/+8
|\ \ | |/ | | | | | | | | | | * 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-071-2/+8
| | | | | | | | | | | | | | 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-301-3/+2
|\ \ | |/ | | | | | | | | | | | | | | * 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-071-3/+2
| | | | | | | | | | | | | | | | 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 '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4'Mark Thompson2017-03-121-0/+3
|\ \ | |/ | | | | | | | | | | * commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4': qsvenc: print warnings from encode/init Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsvenc: print warnings from encode/initAnton Khirnov2016-07-221-0/+3
| |
* | Merge commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49'Mark Thompson2017-03-121-1/+4
|\ \ | |/ | | | | | | | | | | * commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49': qsv: print more complete error messages Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv: print more complete error messagesAnton Khirnov2016-07-221-1/+4
| | | | | | | | Include the libmfx error code and its description
* | Merge commit '536bb17e9659c5ed7576a218d4085cdd6d5742fa'Hendrik Leppkes2016-11-141-0/+2
|\ \ | |/ | | | | | | | | | | * 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-031-0/+2
| | | | | | | | | | | | | | Stop hardcoding NV12. Also, move this function to the shared code, it will be used by the encoder as well.
| * qsvdec: support getting the session from an AVHWFramesContextAnton Khirnov2016-06-211-0/+11
| |
* | qsv: Merge libav implementationMark Thompson2016-10-311-26/+14
| | | | | | | | | | | | | | 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 '9c0bc1e980a99106d6749ec632f166b87275871e'Derek Buitenhuis2016-02-241-0/+2
|\ \ | |/ | | | | | | | | | | * commit '9c0bc1e980a99106d6749ec632f166b87275871e': qsv: add a missing #include Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsv: add a missing #includeAnton Khirnov2016-02-181-0/+2
| | | | | | | | Needed for enum AVCodecID
* | qsvenc: write a53 caption data to SEIWill Kelleher2015-11-301-0/+3
| | | | | | | | | | | | Signed-off-by: Will Kelleher <wkelleher@gogoair.com> Previous version reviewed-by: Ivan Uskov <ivan.uskov@nablet.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'Michael Niedermayer2015-07-191-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-191-0/+2
| | | | | | | | Wait for async_depth frames before syncing.
* | libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler ↵Ivan Uskov2015-07-141-1/+10
| | | | | | | | | | | | | | 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-091-1/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-081-1/+6
| |
* | avcodec/qsv: Extending QSV/MFX session initialization for the linux platform ↵Ivan Uskov2015-07-021-1/+16
| | | | | | | | | | | | | | | | | | where a display handle is required. Now ff_qsv_init_internal_session() is able to find appropriate display handle under linux using VAAPI. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/qsv_internal: Fix project nameMichael Niedermayer2015-03-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'Michael Niedermayer2015-03-281-0/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2': lavc: add Intel libmfx-based H.264 encoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add Intel libmfx-based H.264 encoderAnton Khirnov2015-03-271-0/+13
| |
* | Merge commit 'd0a63d8b989647ffdb5f40da8e1feaffe1a8e791'Michael Niedermayer2015-03-281-0/+38
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-271-0/+38
|/
* qsv: rename to qsvdecAnton Khirnov2015-03-271-86/+0
| | | | This is to avoid conflicts with the upcoming QSV encoding support.
* lavc: add an Intel libmfx-based H.264 decoderAnton Khirnov2015-02-191-0/+86
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori Yamazoe <drocon11@gmail.com>.
OpenPOWER on IntegriCloud