From patchwork Thu Jul 26 07:51:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 9805 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp153410jad; Thu, 26 Jul 2018 00:50:39 -0700 (PDT) X-Google-Smtp-Source: AAOMgpct8x44ZDxRGAXdC7sC3z1H/wuPoTtlv5TxuGaZOQDJAkmh2NYcrpxv7pytRysuG+sj3Jer X-Received: by 2002:a1c:c019:: with SMTP id q25-v6mr814360wmf.148.1532591438940; Thu, 26 Jul 2018 00:50:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532591438; cv=none; d=google.com; s=arc-20160816; b=FK8uvxx4swTFQuo3BfRi8ZTsQSodSS+Z+XY02qUGXRGNYwtsScGDtnMNiX7sqhRPAC 9iD/bFXdgN0TZDFD4b5hWBS5eocjp78k1/st1R5d56Nm0W9ns4ONMKehnx5OGToB+wQx h4c1cEiEA4H73Ls64I3sUF/jmOZGjyadEe21hBAtH58WDn4aDfSJUQR9JwHZa7Uf9tI2 iDgvSdexJviU4vE1924Zlnl2fc8f5GlUEIb6sVL5JGwdKRQ4d0NtK++amiqCS489v6w7 Oq0djlSNa+iDJbIfDFdKljV1zoPwZKaPUNRWRCpRTieyenSBIF23T7FeKYSicVmPxJMm HKSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=fpTUrImWv5Ka6CI59tWHLaEZ7ktm1tl01syQwBmwuw0=; b=sAdE9kZdq/hJeIS87Ubz21eEoWK88xYiZjhNOb8p3VK1WNRIleJYlSJnUR53qse4Nl gpBGMQSvIEgxmufSQ3qSJkzt13PU2d7WF3KXI5JtuwdGpcjWIsr1jRAcWtLWUcLFoMV5 C75rj+XygXz4afHoF4tdYhunJ1JKA9/KRIY3iwF8E7pYfjSvPo9ybWHIPt8qlhnh6Moi HtfzLNNA2MbhK+Xpo5ndfm8UgqvqF/hoibEkRP/l7Pn81wul5a142rSEOtGUU6qehV14 4D+K0ko5J+OVCVPufOV+ZubOBBtiL2Sm6HmHGTd7/4JBNV2RSuCxwk15dzgJyOvvnveX lScQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v12-v6si579037wrq.302.2018.07.26.00.50.38; Thu, 26 Jul 2018 00:50:38 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C7D1468A400; Thu, 26 Jul 2018 10:50:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B7C77689FF7 for ; Thu, 26 Jul 2018 10:50:14 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jul 2018 00:50:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,404,1526367600"; d="scan'208";a="57282381" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by fmsmga007.fm.intel.com with ESMTP; 26 Jul 2018 00:50:18 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Jul 2018 15:51:06 +0800 Message-Id: <1532591467-13851-1-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/qsvenc: expose qp of encoded frames X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Requirement from ticket #7254. Currently only H264 supported by MSDK. Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 43 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/qsvenc.h | 2 ++ libavcodec/qsvenc_h264.c | 5 +++++ 3 files changed, 50 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 8096945..1294ed2 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1139,6 +1139,10 @@ 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; @@ -1172,6 +1176,22 @@ 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 *)); + 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); } @@ -1179,6 +1199,10 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, 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); + #endif av_packet_unref(&new_pkt); return AVERROR(ENOMEM); } @@ -1195,6 +1219,10 @@ 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); +#endif av_freep(&sync); return (ret == MFX_ERR_MORE_DATA) ? 0 : ff_qsv_print_error(avctx, ret, "Error during encoding"); @@ -1211,6 +1239,10 @@ 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); +#endif } return 0; @@ -1230,6 +1262,9 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, AVPacket new_pkt; mfxBitstream *bs; mfxSyncPoint *sync; +#if QSV_VERSION_ATLEAST(1, 26) + mfxExtAVCEncodedFrameInfo *enc_info; +#endif av_fifo_generic_read(q->async_fifo, &new_pkt, sizeof(new_pkt), NULL); av_fifo_generic_read(q->async_fifo, &sync, sizeof(sync), NULL); @@ -1258,6 +1293,14 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif +#if QSV_VERSION_ATLEAST(1, 26) + if (avctx->codec_id == AV_CODEC_ID_H264) { + enc_info = (mfxExtAVCEncodedFrameInfo *)(*bs->ExtParam); + av_log(avctx, AV_LOG_DEBUG, "QP is %d\n", enc_info->QP); + q->sum_frame_qp += enc_info->QP; + av_freep(&enc_info); + } +#endif av_freep(&bs); av_freep(&sync); diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index b2d6355..3784a82 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -102,6 +102,8 @@ typedef struct QSVEncContext { int width_align; int height_align; + int sum_frame_qp; + mfxVideoParam param; mfxFrameAllocRequest req; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 5c262e5..b87bef6 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -95,6 +95,11 @@ static av_cold int qsv_enc_close(AVCodecContext *avctx) { QSVH264EncContext *q = avctx->priv_data; +#if QSV_VERSION_ATLEAST(1, 26) + av_log(avctx, AV_LOG_VERBOSE, "encoded %d frames, avarge qp is %.2f\n", + avctx->frame_number,(double)q->qsv.sum_frame_qp / avctx->frame_number); +#endif + return ff_qsv_enc_close(avctx, &q->qsv); }