summaryrefslogtreecommitdiff
path: root/libavcodec/qsvenc.c
Commit message (Collapse)AuthorAge
* Merge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'Derek Buitenhuis2016-02-16
|\ | | | | | | | | | | | | * commit '9cac1b4b4f1532fb2aeef54799285360656be5eb': qsvenc: Add private option to replace coder_type Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsvenc: Add private option to replace coder_typeVittorio Giovara2016-01-25
| | | | | | | | Missing from be00ec832c519427cd92218abac77dafdc1d5487.
| * qsvenc: fix a typoAnton Khirnov2016-01-23
| | | | | | | | Introduced in 0e6c8532215790bbe560a9eea4f3cc82bb55cf92.
* | qsvenc: Fix b_strategy typoDerek Buitenhuis2016-01-28
| | | | | | | | | | | | This was introduced in 0e6c8532215790bbe560a9eea4f3cc82bb55cf92. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'Derek Buitenhuis2016-01-27
|\| | | | | | | | | | | | | * commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92' lavc: Move b_frame_strategy and b_sensitivity to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move b_frame_strategy and b_sensitivity to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | | | | | | | The b_frame_strategy option is only used by mpegvideoenc, qsv, x264, and xavs, while b_sensitivity is only used by mpegvideoenc. These are very codec-specific options, so deprecate the global variants. Set proper limits to the maximum allowed values. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'd1cd20e4e33f8139e150034b3c457302312d81bd'Hendrik Leppkes2016-01-19
|\| | | | | | | | | | | | | * commit 'd1cd20e4e33f8139e150034b3c457302312d81bd': qsvenc: split encoding frames and reading from the async FIFO Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: split encoding frames and reading from the async FIFOAnton Khirnov2016-01-07
| | | | | | | | | | | | This makes sure all the frames are returned at the end. Found-By: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53'Hendrik Leppkes2016-01-19
|\| | | | | | | | | | | | | * commit 'a6259a6ecbad18d58085e4ab23f56151e98d7b53': qsvenc: properly handle the warning from MFXVideoCORE_SyncOperation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: properly handle the warning from MFXVideoCORE_SyncOperationMaxym Dmytrychenko2016-01-07
| | | | | | | | | | | | Same as what is done in 3b6473b43eb69fc3faaf69f7fd0b83b51db7607f. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '825900248b4053515803152d3165efdb034b660b'Hendrik Leppkes2015-12-17
|\| | | | | | | | | | | | | * commit '825900248b4053515803152d3165efdb034b660b': qsvenc: export CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: export CPB props side dataAnton Khirnov2015-12-06
| |
* | qsvenc: write a53 caption data to SEIWill Kelleher2015-11-30
| | | | | | | | | | | | 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 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8'Hendrik Leppkes2015-11-29
|\| | | | | | | | | | | | | * commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8': qsvenc: expose additional encoding options Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: expose additional encoding optionsAnton Khirnov2015-11-20
| |
* | Merge commit 'e7d7cf86dcaba8eaaed62c80172ff0aff2588c2a'Hendrik Leppkes2015-11-29
|\| | | | | | | | | | | | | * commit 'e7d7cf86dcaba8eaaed62c80172ff0aff2588c2a': qsvenc: support more RC methods Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: support more RC methodsAnton Khirnov2015-11-20
| |
| * qsvenc: fix setting maxrate for VBRAnton Khirnov2015-11-20
| |
* | Merge commit '4d8f536b535487063a08609636e712ad86d2ad54'Derek Buitenhuis2015-11-22
|\| | | | | | | | | | | | | * commit '4d8f536b535487063a08609636e712ad86d2ad54': qsvenc: print the actual video parameters used by MSDK Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * qsvenc: print the actual video parameters used by MSDKAnton Khirnov2015-11-20
| |
* | Merge commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'dc923bc23b3efd949d0bf67ff1abdb95059e5843': qsvenc: add an API for allocating opaque surfaces Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: add an API for allocating opaque surfacesAnton Khirnov2015-10-16
| |
* | Merge commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit '2ec96b6bd5bf7b22978711bcf2cee702bee89c6f': qsvenc: cosmetics, reindent Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: cosmetics, reindentAnton Khirnov2015-10-16
| |
* | Merge commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42': qsvenc: set the timestamp for PIX_FMT_QSV frames as well Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: set the timestamp for PIX_FMT_QSV frames as wellAnton Khirnov2015-10-16
| |
* | Merge commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79'Hendrik Leppkes2015-10-22
|\| | | | | | | | | | | | | * commit '772c87c5a658f36d7c0612f5da583fc2bfa54f79': qsvenc: support passing arbitrary external buffers to the encoder Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: support passing arbitrary external buffers to the encoderAnton Khirnov2015-10-16
| |
* | qsvenc.c: use query to catch all kind of setting issuesSven Dueking2015-10-01
| | | | | | | | | | Reviewed-by: Ivan Uskov <ivan.uskov@nablet.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc'Hendrik Leppkes2015-09-29
|\| | | | | | | | | | | | | * commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc': qsvenc: do not try to close the encoder if the session is NULL Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * qsvenc: do not try to close the encoder if the session is NULLAnton Khirnov2015-09-28
| |
* | avcodec/qsv : Added look ahead rate control modeSven Dueking2015-08-30
| | | | | | | | | | Reviewed-by: Ivan Uskov <ivan.uskov@nablet.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/qsvenc: Added PicTiming SEISven Dueking2015-08-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/qsvenc: Set MaxKpbs to rc_max_rate for CBR and VBR (bitrate is equal ↵Sven Dueking2015-08-14
| | | | | | | | | | | | to rc_max_rate for CBR) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvenc.c delay in 1 microsecond replaced to more appropriate 500 ↵Ivan Uskov2015-07-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | microseconds This commit replaces the 1 microsecond delay by 500 microsecond for the case when the MFX library does return MFX_WRN_DEVICE_BUSY status. In general this warning never appears for simple encoding or transcoding session because the GPU is so fast so it almost always is not busy and any delay value just does not executes. But for heavy transcoding tasks for example, when several QSV sessions are running simultaneously then using a 1-microsecond delay may result in 1000 iterations per each frame. So here possible a paradoxical case when GPU loading also loads CPU by dummy tasks. Official MFX/QSV samples by Intel are using 1 millisecond (i.e. 1000 microseconds) everywhere where MFX_WRN_DEVICE_BUSY does appear. So 500us is a much more optimal value than 1us. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-27
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec flagsVittorio Giovara2015-07-27
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'Michael Niedermayer2015-07-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370': Deprecate avctx.coded_frame Conflicts: ffmpeg.c libavcodec/a64multienc.c libavcodec/asvenc.c libavcodec/cljrenc.c libavcodec/dpxenc.c libavcodec/gif.c libavcodec/mpegvideo_enc.c libavcodec/nvenc.c libavcodec/proresenc_kostya.c libavcodec/pthread_frame.c libavcodec/rawenc.c libavcodec/sunrastenc.c libavcodec/tiffenc.c libavcodec/version.h libavcodec/xbmenc.c libavcodec/xwdenc.c libavdevice/v4l2.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * Deprecate avctx.coded_frameVittorio Giovara2015-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rationale is that coded_frame was only used to communicate key_frame, pict_type and quality to the caller, as well as a few other random fields, in a non predictable, let alone consistent way. There was agreement that there was no use case for coded_frame, as it is a full-sized AVFrame container used for just 2-3 int-sized properties, which shouldn't even belong into the AVCodecContext in the first place. The appropriate AVPacket flag can be used instead of key_frame, while quality is exported with the new AVPacketSideData quality factor. There is no replacement for the other fields as they were unreliable, mishandled or just not used at all. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'Michael Niedermayer2015-07-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534': Gather all coded_frame allocations and free functions to a single place Conflicts: libavcodec/a64multienc.c libavcodec/asvenc.c libavcodec/cljrenc.c libavcodec/dpxenc.c libavcodec/dvenc.c libavcodec/gif.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libopenjpegenc.c libavcodec/libtheoraenc.c libavcodec/libvpxenc.c libavcodec/mpegvideo_enc.c libavcodec/nvenc.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/sunrastenc.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/v210enc.c libavcodec/v410enc.c libavcodec/xbmenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * Gather all coded_frame allocations and free functions to a single placeVittorio Giovara2015-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocating coded_frame is what most encoders do anyway, so it makes sense to always allocate and free it in a single place. Moreover a lot of encoders freed the frame with av_freep() instead of the correct API av_frame_free(). This bring uniformity to encoder behaviour and prevents applications from erroneusly accessing this field when not allocated. Additionally this helps isolating encoders that export information with coded_frame, and heavily simplifies its deprecation. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031'Michael Niedermayer2015-07-19
|\| | | | | | | | | | | | | | | | | | | * commit '69b92f1b99f3f210be19ee6ec06f6c0de1733031': qsvenc: properly handle asynchronous encoding Conflicts: libavcodec/qsvenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * qsvenc: properly handle asynchronous encodingAnton Khirnov2015-07-19
| | | | | | | | Wait for async_depth frames before syncing.
* | libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler ↵Ivan Uskov2015-07-14
| | | | | | | | | | | | | | under linux platform. Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/qsvenc.c: improving handling for return codes of ↵Ivan Uskov2015-07-10
| | | | | | | | | | | | MFXVideoENCODE_EncodeFrameAsync Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/qsvenc.c: Fix for too agressive height alignment during frame ↵Ivan Uskov2015-07-09
| | | | | | | | | | | | encoding which may be reason of superflous frame copying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'Michael Niedermayer2015-07-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-08
| |