Mark Thompson
ff821fdfce
Merge commit ' 4ab61cd983'
...
* commit '4ab61cd983
2017-03-30 22:07:57 +01:00
Mark Thompson
c0f2a8eac1
Merge commit ' 00aeedd841'
...
* commit '00aeedd841
2017-03-30 22:06:03 +01:00
Mark Thompson
2f18e452f8
Merge commit ' 404e51478e'
...
* commit '404e51478e
2017-03-30 22:00:03 +01:00
Mark Thompson
a7434ef195
Merge commit ' 8e07c22e50'
...
* commit '8e07c22e50
2017-03-12 15:21:41 +00:00
Mark Thompson
15887a410c
Merge commit ' 95414eb2dc'
...
* commit '95414eb2dc
2017-03-12 15:19:05 +00:00
Hendrik Leppkes
1bc6cdf2fc
Merge commit ' 536bb17e96'
...
* commit '536bb17e96
2016-11-14 15:19:43 +01:00
Anton Khirnov
4ab61cd983
qsv{enc,dec}: extend the internal frame allocator
...
Handle the internal frame requests, which is required by the HEVC
encoding plugin.
Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
2016-11-07 12:48:00 +01:00
Anton Khirnov
00aeedd841
qsv{dec,enc}: use a struct as a memory id with internal memory allocator
...
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>
2016-11-07 12:47:54 +01:00
Anton Khirnov
404e51478e
qsv{dec,enc}: always use an internal mfxFrameSurface1
...
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>
2016-11-07 12:47:46 +01:00
Mark Thompson
1f26a231bb
qsv: Merge libav implementation
...
Merged as-at libav 398f01504b17ff130e1f1
2016-10-31 19:23:40 +00:00
Anton Khirnov
8e07c22e50
qsvenc: print warnings from encode/init
2016-07-22 19:08:13 +02:00
Anton Khirnov
95414eb2dc
qsv: print more complete error messages
...
Include the libmfx error code and its description
2016-07-22 19:08:13 +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
a0524d9b1e
qsvdec: support getting the session from an AVHWFramesContext
2016-06-21 19:53:38 +02:00
Derek Buitenhuis
0d4c0240af
Merge commit ' 9c0bc1e980'
...
* commit '9c0bc1e980
2016-02-24 17:22:43 +00:00
Anton Khirnov
9c0bc1e980
qsv: add a missing #include
...
Needed for enum AVCodecID
2016-02-18 08:47:33 +01:00
Will Kelleher
0eac93da0f
qsvenc: write a53 caption data to SEI
...
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>
2015-11-30 23:31:12 +01:00
Michael Niedermayer
f929081f2e
Merge commit ' f5c4d38c78'
...
* commit 'f5c4d38c78
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
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
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
Ivan Uskov
db89f45535
avcodec/qsv: Extending QSV/MFX session initialization for the linux platform 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>
2015-07-02 15:05:56 +02:00
Michael Niedermayer
048b6331e0
avcodec/qsv_internal: Fix project name
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28 03:44:19 +01:00
Michael Niedermayer
0a731e4596
Merge commit ' 72b7441a10'
...
* commit '72b7441a10
2015-03-28 01:33:27 +01:00
Michael Niedermayer
b12eacb383
Merge commit ' d0a63d8b98'
...
* commit 'd0a63d8b98
2015-03-28 01:16:21 +01:00
Anton Khirnov
72b7441a10
lavc: add Intel libmfx-based H.264 encoder
2015-03-27 22:02:10 +01:00
Anton Khirnov
d0a63d8b98
qsvdec: split off some code that will be shared with the encoder
2015-03-27 21:57:28 +01:00
Anton Khirnov
b04d009b0e
qsv: rename to qsvdec
...
This is to avoid conflicts with the upcoming QSV encoding support.
2015-03-27 21:56:36 +01:00
Anton Khirnov
4e08c82110
lavc: add an Intel libmfx-based H.264 decoder
...
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.
2015-02-19 15:08:49 +01:00
