From patchwork Mon Jan 29 07:47: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: 7444 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp3657355jak; Sun, 28 Jan 2018 23:49:07 -0800 (PST) X-Google-Smtp-Source: AH8x226e5fU+59uIHqedN0dkdcMN2Byq51HlzJYR5dfHBhbvIZcFzPALag6JOlHSbmig/JV0MLUV X-Received: by 10.28.16.2 with SMTP id 2mr17551222wmq.120.1517212147334; Sun, 28 Jan 2018 23:49:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517212147; cv=none; d=google.com; s=arc-20160816; b=C57VDo5w5n2gwfBi99iG6gctDET8czdMfSoxttSc7aQl9C57jBrhaAyMuxWAdNFLBs RT6RbNQrwiTu1nFJLwc4saabzpLcIesDzflDi2KWmhgyvp7x6/mFf48yjIzQ/JXlCUw0 bnBqv3vfXJDMENU33ZJBeoSESOcEjifjtB3FJfgnOFtCoKclonQbU+6KG0GO33P9fIsn 5M2nJFXK4EdducnAAAv+84GYioStahlpKbV4+maKvEWUpDJ6We+YDPo42ttCkn8+lzq5 B8bdQFE0koOX5qhqyqgzWpg54KVKRrq/aMUaxWo5HP5p+DT4bAgHPSDJJCOoRVnWj7zx 0M2A== 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=CpNrqql5Q0WSkcXcN5wtvFTaLNLLYf8nArKuxrODoqQ=; b=gJXb+D73I9DxIF9v1LBNTaz8ZlPqCAeXvkm2grMop6VIVPGHuVWuNd622YesYp9pw9 CF7RZdTbfvJU36PRiPA/o99iqiFzmbjWINXtB1iQz1irPLceENEmXDt7q/SKbAe9ZmaD LGqt4o+CbTMvEIAler1L3rfTnFL//4y2XPZxxZgmNRnT3hYXEBcAW8O4klRVNRubtLn2 TS9fO/vH2OYn6lQSgfNL6j4TxUMGCRwfaa7I9inRIQK2PECyoWP98ZPRbvArXMTJF/ZY cSK0RYs6gHDNxePP0DbiAoeuSQ7JcBW1EjJJaA+dlQG3lINEWr5EcYooHoYLETmVcaSN ej/A== 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f63si7013377wmh.170.2018.01.28.23.49.06; Sun, 28 Jan 2018 23:49:07 -0800 (PST) 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9066B68828E; Mon, 29 Jan 2018 09:49:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB3E968824F for ; Mon, 29 Jan 2018 09:48:53 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jan 2018 23:48:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,429,1511856000"; d="scan'208";a="196987938" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.13.18]) by orsmga005.jf.intel.com with ESMTP; 28 Jan 2018 23:48:53 -0800 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jan 2018 15:47:06 +0800 Message-Id: <1517212026-32291-1-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH] lavc/qsvdec: expose frame pic_type and key_frame 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 , ChaoX A Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Currently key_frame and pict_type are unset. (./ffmpeg -c:v h264_qsv -debug_ts -i in.h264 -flags +global_header -c:v libx264 out.h264, then check the frame_type in the log) Add an extra param to fetch the picture type from qsv decoder Signed-off-by: ChaoX A Liu Signed-off-by: Zhong Li --- libavcodec/qsv.c | 24 ++++++++++++++++++++++++ libavcodec/qsv_internal.h | 3 +++ libavcodec/qsvdec.c | 7 +++++++ 3 files changed, 34 insertions(+) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 5217adf..2362e55 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -195,6 +195,30 @@ int ff_qsv_find_surface_idx(QSVFramesContext *ctx, QSVFrame *frame) return AVERROR_BUG; } +enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type) +{ + enum AVPictureType type = AV_PICTURE_TYPE_NONE; + switch (mfx_pic_type & 0x7) { + case MFX_FRAMETYPE_I: + if (mfx_pic_type & MFX_FRAMETYPE_S) + type = AV_PICTURE_TYPE_SI; + else + type = AV_PICTURE_TYPE_I; + break; + case MFX_FRAMETYPE_B: + type = AV_PICTURE_TYPE_B; + break; + case MFX_FRAMETYPE_P: + if (mfx_pic_type & MFX_FRAMETYPE_S) + type = AV_PICTURE_TYPE_SP; + else + type = AV_PICTURE_TYPE_P; + break; + } + + return type; +} + static int qsv_load_plugins(mfxSession session, const char *load_plugins, void *logctx) { diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index c030550..5c33f18 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -51,6 +51,8 @@ typedef struct QSVFrame { AVFrame *frame; mfxFrameSurface1 surface; mfxEncodeCtrl enc_ctrl; + mfxExtDecodedFrameInfo dec_info; + mfxExtBuffer *ext_param; int queued; int used; @@ -86,6 +88,7 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id); int ff_qsv_profile_to_mfx(enum AVCodecID codec_id, int profile); int ff_qsv_map_pixfmt(enum AVPixelFormat format, uint32_t *fourcc); +enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type); int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session, const char *load_plugins); diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index 45bedf9..29bdd86 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -232,6 +232,11 @@ static int alloc_frame(AVCodecContext *avctx, QSVContext *q, QSVFrame *frame) frame->surface.Data.MemId = &q->frames_ctx.mids[ret]; } + frame->surface.Data.ExtParam = &frame->ext_param; + frame->surface.Data.NumExtParam = 1; + frame->ext_param = (mfxExtBuffer*)&frame->dec_info; + frame->dec_info.Header.BufferId = MFX_EXTBUFF_DECODED_FRAME_INFO; + frame->dec_info.Header.BufferSz = sizeof(frame->dec_info); frame->used = 1; @@ -416,6 +421,8 @@ FF_ENABLE_DEPRECATION_WARNINGS outsurf->Info.PicStruct & MFX_PICSTRUCT_FIELD_TFF; frame->interlaced_frame = !(outsurf->Info.PicStruct & MFX_PICSTRUCT_PROGRESSIVE); + frame->pict_type = ff_qsv_map_pictype(out_frame->dec_info.FrameType); + frame->key_frame = !!(out_frame->dec_info.FrameType & MFX_FRAMETYPE_IDR); /* update the surface properties */ if (avctx->pix_fmt == AV_PIX_FMT_QSV)