From patchwork Fri Aug 10 08:10:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 9951 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3179150jad; Fri, 10 Aug 2018 01:09:51 -0700 (PDT) X-Google-Smtp-Source: AA+uWPyOgKYaAt/kWWgiy+ZhFDTRMoXVLR/5C41JaG1Ro4mWb0I5q4iw64zxBMX2sXAWJuagWpD4 X-Received: by 2002:a1c:7c0c:: with SMTP id x12-v6mr811903wmc.58.1533888591769; Fri, 10 Aug 2018 01:09:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533888591; cv=none; d=google.com; s=arc-20160816; b=GyMpJWxEL8zqCyhm2rvJFL3c1xcLxdAbBB8xMFuQLRaNUZswtXc1M6FRaOtTadpISJ CTgJbOqcTN9qYXWzW2/wiZrRklkjaMnyP7+hPueSqpuG3OYUrJVqp7tGonl+Ic9Jije9 O9SY6RO8FeXmuASKE/YveP/LVMLwAW+dlbHipuONvLIhSnsAE9VYqIUySM9xHil5K2uJ OUKkVaou/SuC5RzEGteTaZKXHc5TupyMgolUAGdx3SMRjwYr2IDMsEfKFxLW17/BQZ0g AaxOfInEAOaYNvCiAA7glDezLkVTZBUdJ1nue9zVzO8Coz7iJkko71FsduLYArjqpo1O wU4w== 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=Wsvj9Ai/S62LCG7ymd86FOia0WzQq/5ENWp762k8OJc=; b=UIeB4DkNSa1gZTUpC3uXKQgDjVH9oHl34Vvo6/i2ewyfiMJLn9FjcTIsyofQXmIqIk PQ4B3e0n8ySnE6EsbJX0GS8Bv0b57LySSQuI9DtaO9gO3EzMmXnrzkQVnRXelMO1AUJV T9DT4iEe1mp6k1Dwz8+I48cHWdN1R7oQOVyT78pfWlrNzO/Q2ExzMfS+gHARSfmssOPZ ObIVCgaoMlcRmgR0fFi9bGHSj9vIdv59aSzNNfkL2Cjm+fQDJJzoa9FCIWA+gXwhxxtB O84aPpVmbsN+VkwuzJstP9qSONe1337sT4lWnOacmVKeyQMYeDQm19j74slJfauet/XP CGOQ== 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 o8-v6si3657794wro.267.2018.08.10.01.09.51; Fri, 10 Aug 2018 01:09:51 -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 6F2F768A544; Fri, 10 Aug 2018 11:09:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C456A68A516 for ; Fri, 10 Aug 2018 11:09:20 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Aug 2018 01:09:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,218,1531810800"; d="scan'208";a="247713916" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by orsmga005.jf.intel.com with ESMTP; 10 Aug 2018 01:09:39 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Aug 2018 16:10:34 +0800 Message-Id: <1533888634-9533-1-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH V2] lavc/qsvenc: add quality status to side_data 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" Add fix a memory leak issue as James's comments. V2: use a local pict_type since coded_frame is deprecated. Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 32 ++++++++++++++++++++++---------- libavcodec/qsvenc.h | 2 -- libavcodec/qsvenc_h264.c | 5 ----- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 65dae31..0a14e6a 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1200,8 +1200,10 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, if (!sync) { av_freep(&bs); #if QSV_VERSION_ATLEAST(1, 26) - if (avctx->codec_id == AV_CODEC_ID_H264) + 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); @@ -1220,8 +1222,10 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, av_packet_unref(&new_pkt); av_freep(&bs); #if QSV_VERSION_ATLEAST(1, 26) - if (avctx->codec_id == AV_CODEC_ID_H264) + 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) ? @@ -1240,8 +1244,10 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, av_packet_unref(&new_pkt); av_freep(&bs); #if QSV_VERSION_ATLEAST(1, 26) - if (avctx->codec_id == AV_CODEC_ID_H264) + if (avctx->codec_id == AV_CODEC_ID_H264) { av_freep(&enc_info); + av_freep(&enc_buf); + } #endif } @@ -1264,7 +1270,9 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, 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); @@ -1282,23 +1290,27 @@ 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); - av_log(avctx, AV_LOG_DEBUG, "QP is %d\n", enc_info->QP); - q->sum_frame_qp += enc_info->QP; + 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); diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 3784a82..b2d6355 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -102,8 +102,6 @@ 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 b87bef6..5c262e5 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -95,11 +95,6 @@ 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); }