Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-09 03:10:08 +00:00
Code Issues Projects Releases Packages Wiki Activity
87105 commits 38 branches 415 tags 286 MiB
Commit graph

78 commits

Author SHA1 Message Date
Mark Thompson
8aa3c2df1a qsvdec: Allow use of hw_device_ctx to make the internal session 
(cherry picked from commit 8848ba0bd6)
 2017-06-14 22:26:32 +01:00
Mark Thompson
91c3b50d74 qsv: Add ability to create a session from a device 
(cherry picked from commit 4936a48b1e)
 2017-06-14 22:26:32 +01:00
Clément Bœsch
3c085c1ba5 Merge commit 'b68e353136' 
* commit 'b68e353136':
  qsvdec: do not sync PIX_FMT_QSV surfaces

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-05-05 14:11:51 +02:00
Clément Bœsch
c7173e5098 Merge commit '76167140a9' 
* commit '76167140a9':
  qsvdec: Drop stray extra braces around initializer

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-01 15:15:19 +02:00
James Almer
4fe9d69648 Merge commit '0940b748bd' 
* commit '0940b748bd':
  qsvdec: Only warn about unconsumed data if it happens more than once

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-31 17:16:39 -03:00
Mark Thompson
ff821fdfce Merge commit '4ab61cd983' 
* commit '4ab61cd983':
  qsv{enc,dec}: extend the internal frame allocator

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-30 22:07:57 +01:00
Mark Thompson
c0f2a8eac1 Merge commit '00aeedd841' 
* commit '00aeedd841':
  qsv{dec,enc}: use a struct as a memory id with internal memory allocator

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-30 22:06:03 +01:00
Mark Thompson
2f18e452f8 Merge commit '404e51478e' 
* commit '404e51478e':
  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>
 2017-03-30 22:00:03 +01:00
Clément Bœsch
e59a4d1df7 Merge commit '801ac7156d' 
* commit '801ac7156d':
  qsv: Be informative when reporting that no data has been consumed

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-27 22:19:09 +02:00
Clément Bœsch
aabe525734 Merge commit 'e328178da9' 
* commit 'e328178da9':
  qsvdec: only access hwaccel_context is the pixel format is QSV

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 23:22:50 +01:00
Mark Thompson
15887a410c Merge commit '95414eb2dc' 
* commit '95414eb2dc':
  qsv: print more complete error messages

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 15:19:05 +00:00
Anton Khirnov
b68e353136 qsvdec: do not sync PIX_FMT_QSV surfaces 
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.
 2017-01-12 16:21:39 +01:00
Timothy Gu
d32bdadda8 qsvdec: Fix memory leak on error 
Bug-Id: CID 1396851
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-12-08 15:53:58 -05:00
Timothy Gu
b6f80b16d1 qsvdec: Fix memory leak 
Fixes CID1396851.
 2016-12-06 13:21:08 -08:00
Diego Biurrun
76167140a9 qsvdec: Drop stray extra braces around initializer 
libavcodec/qsvdec.c:93:5: warning: braces around scalar initializer
 2016-11-17 16:53:48 +01:00
Mark Thompson
0940b748bd qsvdec: Only warn about unconsumed data if it happens more than once 2016-11-14 19:38:19 +00:00
Mark Thompson
030d84fa2e qsvdec: Pass field order information to libmfx 
The VC-1 decoder fails to initialise if this is not set.
 2016-11-14 19:38:19 +00:00
Mark Thompson
cd1047f391 qsvdec: Pass the correct profile to libmfx 
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.
 2016-11-14 19:38:19 +00: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
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 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
Luca Barbato
801ac7156d qsv: Be informative when reporting that no data has been consumed 2016-10-30 21:55:03 +01: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
Anton Khirnov
e328178da9 qsvdec: only access hwaccel_context is the pixel format is QSV 
We do not strictly specify that hwaccel_context must be cleared if no
hwaccel is used.

Reported-By: wm4 <nfxjfg@googlemail.com>
 2016-07-31 08:19:45 +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
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
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