diff options
Diffstat (limited to 'libavcodec/qsvenc.c')
| -rw-r--r-- | libavcodec/qsvenc.c | 143 |
1 files changed, 107 insertions, 36 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index e7ca62fedf..10bb237863 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 */ @@ -32,6 +32,7 @@ #include "libavutil/log.h" #include "libavutil/time.h" #include "libavutil/imgutils.h" +#include "libavcodec/bytestream.h" #include "avcodec.h" #include "internal.h" @@ -135,9 +136,6 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, #if QSV_HAVE_CO2 mfxExtCodingOption2 *co2 = (mfxExtCodingOption2*)coding_opts[1]; #endif -#if QSV_HAVE_CO3 && QSV_HAVE_QVBR - mfxExtCodingOption3 *co3 = (mfxExtCodingOption3*)coding_opts[2]; -#endif av_log(avctx, AV_LOG_VERBOSE, "profile: %s; level: %"PRIu16"\n", print_profile(info->CodecProfile), info->CodecLevel); @@ -192,12 +190,6 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, info->ICQQuality, co2->LookAheadDepth); } #endif -#if QSV_HAVE_QVBR - else if (info->RateControlMethod == MFX_RATECONTROL_QVBR) { - av_log(avctx, AV_LOG_VERBOSE, "QVBRQuality: %"PRIu16"\n", - co3->QVBRQuality); - } -#endif av_log(avctx, AV_LOG_VERBOSE, "NumSlice: %"PRIu16"; NumRefFrame: %"PRIu16"\n", info->NumSlice, info->NumRefFrame); @@ -278,7 +270,7 @@ static int select_rc_mode(AVCodecContext *avctx, QSVEncContext *q) const char *rc_desc; mfxU16 rc_mode; - int want_la = q->la_depth >= 10; + int want_la = q->look_ahead; int want_qscale = !!(avctx->flags & AV_CODEC_FLAG_QSCALE); int want_vcm = q->vcm; @@ -571,11 +563,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; @@ -589,6 +581,9 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco.Header.BufferId = MFX_EXTBUFF_CODING_OPTION; q->extco.Header.BufferSz = sizeof(q->extco); + 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; @@ -647,7 +642,7 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif #if QSV_HAVE_LA_DS - q->extco2.LookAheadDS = q->la_ds; + q->extco2.LookAheadDS = q->look_ahead_downsampling; #endif #if QSV_HAVE_BREF_TYPE @@ -736,12 +731,6 @@ static int qsv_retrieve_enc_params(AVCodecContext *avctx, QSVEncContext *q) .Header.BufferSz = sizeof(co2), }; #endif -#if QSV_HAVE_CO3 - mfxExtCodingOption3 co3 = { - .Header.BufferId = MFX_EXTBUFF_CODING_OPTION3, - .Header.BufferSz = sizeof(co3), - }; -#endif mfxExtBuffer *ext_buffers[] = { (mfxExtBuffer*)&extradata, @@ -749,9 +738,6 @@ static int qsv_retrieve_enc_params(AVCodecContext *avctx, QSVEncContext *q) #if QSV_HAVE_CO2 (mfxExtBuffer*)&co2, #endif -#if QSV_HAVE_CO3 - (mfxExtBuffer*)&co3, -#endif }; int need_pps = avctx->codec_id != AV_CODEC_ID_MPEG2VIDEO; @@ -1009,11 +995,23 @@ 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->used && !cur->surface.Data.Locked) { + free_encoder_ctrl_payloads(&cur->enc_ctrl); cur->used = 0; } cur = cur->next; @@ -1047,6 +1045,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; @@ -1056,7 +1059,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; @@ -1129,7 +1132,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; } @@ -1151,18 +1154,28 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, { AVPacket new_pkt = { 0 }; mfxBitstream *bs; +#if QSV_VERSION_ATLEAST(1, 26) + mfxExtAVCEncodedFrameInfo *enc_info; + mfxExtBuffer **enc_buf; +#endif mfxFrameSurface1 *surf = 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) { @@ -1178,17 +1191,45 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, bs->Data = new_pkt.data; bs->MaxLength = new_pkt.size; +#if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) { + enc_info = av_mallocz(sizeof(*enc_info)); + if (!enc_info) + return AVERROR(ENOMEM); + + enc_info->Header.BufferId = MFX_EXTBUFF_ENCODED_FRAME_INFO; + enc_info->Header.BufferSz = sizeof (*enc_info); + bs->NumExtParam = 1; + enc_buf = av_mallocz(sizeof(mfxExtBuffer *)); + if (!enc_buf) + return AVERROR(ENOMEM); + enc_buf[0] = (mfxExtBuffer *)enc_info; + + bs->ExtParam = enc_buf; + } +#endif + + 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); + #if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) { + av_freep(&enc_info); + av_freep(&enc_buf); + } + #endif av_packet_unref(&new_pkt); return AVERROR(ENOMEM); } do { - ret = MFXVideoENCODE_EncodeFrameAsync(q->session, NULL, surf, bs, sync); + ret = MFXVideoENCODE_EncodeFrameAsync(q->session, enc_ctrl, surf, bs, sync); if (ret == MFX_WRN_DEVICE_BUSY) - av_usleep(1); + av_usleep(500); } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_WRN_IN_EXECUTION); if (ret > 0) @@ -1197,6 +1238,12 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, if (ret < 0) { av_packet_unref(&new_pkt); av_freep(&bs); +#if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) { + av_freep(&enc_info); + av_freep(&enc_buf); + } +#endif av_freep(&sync); return (ret == MFX_ERR_MORE_DATA) ? 0 : ff_qsv_print_error(avctx, ret, "Error during encoding"); @@ -1213,6 +1260,12 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, av_freep(&sync); av_packet_unref(&new_pkt); av_freep(&bs); +#if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) { + av_freep(&enc_info); + av_freep(&enc_buf); + } +#endif } return 0; @@ -1232,6 +1285,11 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, AVPacket new_pkt; mfxBitstream *bs; mfxSyncPoint *sync; +#if QSV_VERSION_ATLEAST(1, 26) + mfxExtAVCEncodedFrameInfo *enc_info; + mfxExtBuffer **enc_buf; +#endif + enum AVPictureType pict_type; av_fifo_generic_read(q->async_fifo, &new_pkt, sizeof(new_pkt), NULL); av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); @@ -1249,17 +1307,29 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, bs->FrameType & MFX_FRAMETYPE_xIDR) new_pkt.flags |= AV_PKT_FLAG_KEY; -#if FF_API_CODED_FRAME -FF_DISABLE_DEPRECATION_WARNINGS if (bs->FrameType & MFX_FRAMETYPE_I || bs->FrameType & MFX_FRAMETYPE_xI) - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; + pict_type = AV_PICTURE_TYPE_I; else if (bs->FrameType & MFX_FRAMETYPE_P || bs->FrameType & MFX_FRAMETYPE_xP) - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_P; + pict_type = AV_PICTURE_TYPE_P; else if (bs->FrameType & MFX_FRAMETYPE_B || bs->FrameType & MFX_FRAMETYPE_xB) - avctx->coded_frame->pict_type = AV_PICTURE_TYPE_B; + pict_type = AV_PICTURE_TYPE_B; + +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS + avctx->coded_frame->pict_type = pict_type; FF_ENABLE_DEPRECATION_WARNINGS #endif +#if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) { + enc_buf = bs->ExtParam; + enc_info = (mfxExtAVCEncodedFrameInfo *)(*bs->ExtParam); + ff_side_data_set_encoder_stats(&new_pkt, + enc_info->QP * FF_QP2LAMBDA, NULL, 0, pict_type); + av_freep(&enc_info); + av_freep(&enc_buf); + } +#endif av_freep(&bs); av_freep(&sync); @@ -1305,6 +1375,7 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) 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; } |