From patchwork Tue Jul 3 08:29:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 9589 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp851255jad; Tue, 3 Jul 2018 01:29:42 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc6gIjhJKQ5JZ87uKmtf+BWINUv0RcTotD2MeVFHCgBcZO5pX2wXUHpqA8QaCTYP0WRyozU X-Received: by 2002:adf:c4a7:: with SMTP id m36-v6mr21572698wrf.103.1530606582093; Tue, 03 Jul 2018 01:29:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530606582; cv=none; d=google.com; s=arc-20160816; b=0xSf9c6I5UhsGbvjJp8UOlWxBLYZFIieGc5sf6Oc4MXsFkmil7BCvk4QaEUrht0dsD lXPrbsCWKdSy4/YBfdFzJhv1x7c5UpMPtHQB80K0nH3rg3GxwsSfLmfEyvyJ4D6Eop5S IaZ2aAv6xGyoVCaGEq1v0/P2OadwmntvJqB83FXMnL+yUCzlrTXMRWdTdCJ2oh+crUWR UDCUGpZiUiFPxblh3SyGHZUMNvk5joXwYqsir4vOh2I+mAHUT1/1aB/7rNXRdc3UiXCo LMyDsv7hxm7+DUq2QtIpTz+eXqckfHpml5B0Q1n1PyzodQG9lQhjjMgBZ6ufR16Wt/1B uMkg== 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:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=39D1c+rm+33SYWXCVeY0KqEDRlZE4HenjDeb7GzJY10=; b=NbatOCxA6WoIlbW/WqBAzYlw+J1z5T8aLG37CqSJQWOZafi1i1JM6XFGhyEVuOvpwj 0HIQ0STjvdLdU2cKsV5c8RHd81ynSsJotaNVNOwauBNr5Hns4TBiFFMHorUO+IwdzqfL 2aqp5pDt3u3MT2QAbYIyo4vtR/wFHYbYUkkX8LdLXrNKpzEwHfThzJLewSju29LkGGCY ZFPZfUb62gV83laiCmYRgP4lc8UipI1W+OjMLlZjPn87cHIWNbIK66Vkisfzjan9Gbhk j3TutXaM0AQaq6XcO/l7ScJg27zXyOX2It2MXVKe5PYMRaXZ13063jFUupE+Ox4S0SYL 4cyA== 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 h16-v6si514635wro.367.2018.07.03.01.29.41; Tue, 03 Jul 2018 01:29:42 -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 3D01768A863; Tue, 3 Jul 2018 11:29:33 +0300 (EEST) 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 D7FC568A863 for ; Tue, 3 Jul 2018 11:29:25 +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 fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Jul 2018 01:29:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,302,1526367600"; d="scan'208";a="237461981" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by orsmga005.jf.intel.com with ESMTP; 03 Jul 2018 01:29:00 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jul 2018 16:29:39 +0800 Message-Id: <1530606579-17036-2-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530606579-17036-1-git-send-email-zhong.li@intel.com> References: <1530606579-17036-1-git-send-email-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavc/qsv: handle MFX_FRAMETYPE_UNKNOWN case 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" Signed-off-by: Zhong Li --- libavcodec/qsv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 3ff4f2c..bb0d795 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -198,7 +198,7 @@ int ff_qsv_find_surface_idx(QSVFramesContext *ctx, QSVFrame *frame) enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type) { - enum AVPictureType type = AV_PICTURE_TYPE_NONE; + enum AVPictureType type; switch (mfx_pic_type & 0x7) { case MFX_FRAMETYPE_I: if (mfx_pic_type & MFX_FRAMETYPE_S) @@ -215,6 +215,9 @@ enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type) else type = AV_PICTURE_TYPE_P; break; + case MFX_FRAMETYPE_UNKNOWN: + type = AV_PICTURE_TYPE_NONE; + break; default: av_assert0(0); }