diff options
Diffstat (limited to 'libavcodec/qsvenc.c')
-rw-r--r-- | libavcodec/qsvenc.c | 133 |
1 files changed, 100 insertions, 33 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 473a1804eb..f56cb612b6 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -4,20 +4,20 @@ * copyright (c) 2013 Yukinori Yamazoe * copyright (c) 2015 Anton Khirnov * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -30,6 +30,7 @@ #include "libavutil/log.h" #include "libavutil/time.h" #include "libavutil/imgutils.h" +#include "libavcodec/bytestream.h" #include "avcodec.h" #include "internal.h" @@ -271,7 +272,7 @@ static int select_rc_mode(AVCodecContext *avctx, QSVEncContext *q) const char *rc_desc; mfxU16 rc_mode; - int want_la = q->la_depth >= 0; + int want_la = q->look_ahead; int want_qscale = !!(avctx->flags & AV_CODEC_FLAG_QSCALE); int want_vcm = q->vcm; @@ -379,18 +380,30 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->param.mfx.BufferSizeInKB = 0; q->param.mfx.FrameInfo.FourCC = MFX_FOURCC_NV12; - q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, q->width_align); - q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, 32); q->param.mfx.FrameInfo.CropX = 0; q->param.mfx.FrameInfo.CropY = 0; q->param.mfx.FrameInfo.CropW = avctx->width; q->param.mfx.FrameInfo.CropH = avctx->height; q->param.mfx.FrameInfo.AspectRatioW = avctx->sample_aspect_ratio.num; q->param.mfx.FrameInfo.AspectRatioH = avctx->sample_aspect_ratio.den; - q->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE; q->param.mfx.FrameInfo.ChromaFormat = MFX_CHROMAFORMAT_YUV420; q->param.mfx.FrameInfo.BitDepthLuma = 8; q->param.mfx.FrameInfo.BitDepthChroma = 8; + q->param.mfx.FrameInfo.Width = FFALIGN(avctx->width, q->width_align); + + if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { + /* A true field layout (TFF or BFF) is not important here, + it will specified later during frame encoding. But it is important + to specify is frame progressive or not because allowed heigh alignment + does depend by this. + */ + q->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_FIELD_TFF; + q->height_align = 32; + } else { + q->param.mfx.FrameInfo.PicStruct = MFX_PICSTRUCT_PROGRESSIVE; + q->height_align = 16; + } + q->param.mfx.FrameInfo.Height = FFALIGN(avctx->height, q->height_align); if (avctx->framerate.den > 0 && avctx->framerate.num > 0) { q->param.mfx.FrameInfo.FrameRateExtN = avctx->framerate.num; @@ -430,11 +443,11 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) #if QSV_HAVE_LA case MFX_RATECONTROL_LA: q->param.mfx.TargetKbps = avctx->bit_rate / 1000; - q->extco2.LookAheadDepth = q->la_depth; + q->extco2.LookAheadDepth = q->look_ahead_depth; break; #if QSV_HAVE_ICQ case MFX_RATECONTROL_LA_ICQ: - q->extco2.LookAheadDepth = q->la_depth; + q->extco2.LookAheadDepth = q->look_ahead_depth; case MFX_RATECONTROL_ICQ: q->param.mfx.ICQQuality = avctx->global_quality; break; @@ -456,6 +469,9 @@ FF_ENABLE_DEPRECATION_WARNINGS q->extco.CAVLC = q->cavlc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; + q->extco.PicTimingSEI = q->pic_timing_sei ? + MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; + if (q->rdo >= 0) q->extco.RateDistortionOpt = q->rdo > 0 ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; @@ -519,6 +535,10 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco2; + +#if QSV_VERSION_ATLEAST(1,8) + q->extco2.LookAheadDS = q->look_ahead_downsampling; +#endif } #endif } @@ -676,18 +696,26 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) } if (!q->session) { - ret = ff_qsv_init_internal_session(avctx, &q->internal_session, + ret = ff_qsv_init_internal_session(avctx, &q->internal_qs, q->load_plugins); if (ret < 0) return ret; - q->session = q->internal_session; + q->session = q->internal_qs.session; } ret = init_video_param(avctx, q); if (ret < 0) return ret; + ret = MFXVideoENCODE_Query(q->session, &q->param,&q->param); + if (MFX_WRN_PARTIAL_ACCELERATION==ret) { + av_log(avctx, AV_LOG_WARNING, "Encoder will work with partial HW acceleration\n"); + } else if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Error %d querying encoder params\n", ret); + return ff_qsv_error(ret); + } + ret = MFXVideoENCODE_QueryIOSurf(q->session, &q->param, &q->req); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error querying the encoding parameters\n"); @@ -730,7 +758,9 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) } ret = MFXVideoENCODE_Init(q->session, &q->param); - if (ret < 0) { + if (MFX_WRN_PARTIAL_ACCELERATION==ret) { + av_log(avctx, AV_LOG_WARNING, "Encoder will work with partial HW acceleration\n"); + } else if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error initializing the encoder\n"); return ff_qsv_error(ret); } @@ -746,12 +776,24 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) return 0; } +static void free_encoder_ctrl_payloads(mfxEncodeCtrl* enc_ctrl) +{ + if (enc_ctrl) { + int i; + for (i = 0; i < enc_ctrl->NumPayload && i < QSV_MAX_ENC_PAYLOAD; i++) { + av_free(enc_ctrl->Payload[i]); + } + enc_ctrl->NumPayload = 0; + } +} + static void clear_unused_frames(QSVEncContext *q) { QSVFrame *cur = q->work_frames; while (cur) { if (cur->surface && !cur->surface->Data.Locked) { cur->surface = NULL; + free_encoder_ctrl_payloads(&cur->enc_ctrl); av_frame_unref(cur->frame); } cur = cur->next; @@ -784,6 +826,11 @@ static int get_free_frame(QSVEncContext *q, QSVFrame **f) av_freep(&frame); return AVERROR(ENOMEM); } + frame->enc_ctrl.Payload = av_mallocz(sizeof(mfxPayload*) * QSV_MAX_ENC_PAYLOAD); + if (!frame->enc_ctrl.Payload) { + av_freep(&frame); + return AVERROR(ENOMEM); + } *last = frame; *f = frame; @@ -792,7 +839,7 @@ static int get_free_frame(QSVEncContext *q, QSVFrame **f) } static int submit_frame(QSVEncContext *q, const AVFrame *frame, - mfxFrameSurface1 **surface) + QSVFrame **new_frame) { QSVFrame *qf; int ret; @@ -809,8 +856,9 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame, qf->surface = (mfxFrameSurface1*)qf->frame->data[3]; } else { /* make a copy if the input is not padded as libmfx requires */ - if (frame->height & 31 || frame->linesize[0] & (q->width_align - 1)) { - qf->frame->height = FFALIGN(frame->height, 32); + if ( frame->height & (q->height_align - 1) || + frame->linesize[0] & (q->width_align - 1)) { + qf->frame->height = FFALIGN(frame->height, q->height_align); qf->frame->width = FFALIGN(frame->width, q->width_align); ret = ff_get_buffer(q->avctx, qf->frame, AV_GET_BUFFER_FLAG_REF); @@ -852,7 +900,7 @@ static int submit_frame(QSVEncContext *q, const AVFrame *frame, qf->surface->Data.TimeStamp = av_rescale_q(frame->pts, q->avctx->time_base, (AVRational){1, 90000}); - *surface = qf->surface; + *new_frame = qf; return 0; } @@ -876,16 +924,22 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, mfxBitstream *bs; mfxFrameSurface1 *surf = NULL; - mfxSyncPoint *sync = NULL; + mfxSyncPoint *sync = NULL; + QSVFrame *qsv_frame = NULL; + mfxEncodeCtrl* enc_ctrl = NULL; int ret; if (frame) { - ret = submit_frame(q, frame, &surf); + ret = submit_frame(q, frame, &qsv_frame); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error submitting the frame for encoding.\n"); return ret; } } + if (qsv_frame) { + surf = qsv_frame->surface; + enc_ctrl = &qsv_frame->enc_ctrl; + } ret = av_new_packet(&new_pkt, q->packet_size); if (ret < 0) { @@ -901,6 +955,10 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, bs->Data = new_pkt.data; bs->MaxLength = new_pkt.size; + if (q->set_encode_ctrl_cb) { + q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); + } + sync = av_mallocz(sizeof(*sync)); if (!sync) { av_freep(&bs); @@ -909,22 +967,31 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, } do { - ret = MFXVideoENCODE_EncodeFrameAsync(q->session, NULL, surf, bs, sync); - if (ret == MFX_WRN_DEVICE_BUSY) - av_usleep(1); - } while (ret > 0); + ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, sync); + if (ret == MFX_WRN_DEVICE_BUSY) { + av_usleep(500); + continue; + } + break; + } while ( 1 ); if (ret < 0) { av_packet_unref(&new_pkt); av_freep(&bs); - av_freep(&sync); - return (ret == MFX_ERR_MORE_DATA) ? 0 : ff_qsv_error(ret); + if (ret == MFX_ERR_MORE_DATA) + return 0; + av_log(avctx, AV_LOG_ERROR, "EncodeFrameAsync returned %d\n", ret); + return ff_qsv_error(ret); } - if (ret == MFX_WRN_INCOMPATIBLE_VIDEO_PARAM && frame->interlaced_frame) - print_interlace_msg(avctx, q); - - if (*sync) { + if (ret == MFX_WRN_INCOMPATIBLE_VIDEO_PARAM) { + if (frame->interlaced_frame) + print_interlace_msg(avctx, q); + else + av_log(avctx, AV_LOG_WARNING, + "EncodeFrameAsync returned 'incompatible param' code\n"); + } + if (sync) { av_fifo_generic_write(q->async_fifo, &new_pkt, sizeof(new_pkt), NULL); av_fifo_generic_write(q->async_fifo, &sync, sizeof(sync), NULL); av_fifo_generic_write(q->async_fifo, &bs, sizeof(bs), NULL); @@ -1012,15 +1079,15 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) if (q->session) MFXVideoENCODE_Close(q->session); - if (q->internal_session) - MFXClose(q->internal_session); - q->session = NULL; - q->internal_session = NULL; + q->session = NULL; + + ff_qsv_close_internal_session(&q->internal_qs); cur = q->work_frames; while (cur) { q->work_frames = cur->next; av_frame_free(&cur->frame); + av_free(cur->enc_ctrl.Payload); av_freep(&cur); cur = q->work_frames; } |