From patchwork Thu Aug 10 06:37:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 43197 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b1b:b0:130:ccc6:6c4b with SMTP id l27csp460837pzh; Wed, 9 Aug 2023 23:37:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHK2LwQjNdvVjPqLmSnk0FAzLhEz3LFY6tr9JtEWMCi+LA0QlEHu07uctBNdMf0nsb6H1k9 X-Received: by 2002:a19:f51a:0:b0:4f8:6d54:72fb with SMTP id j26-20020a19f51a000000b004f86d5472fbmr915809lfb.62.1691649468805; Wed, 09 Aug 2023 23:37:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691649468; cv=none; d=google.com; s=arc-20160816; b=P+QOihD7PAhx5f/1ETz2XVlWtxa1aBoAoO9ZgKg4BB2jvBuWz7FygWEXyKsI4lOM1c rxcQxmcpYuRL0LFeXt3ND6DShyB4b3YSE8iTZyn1kdltyK1h1MumhrAbmjxTGYYGDCEO iKaOyBYCVG1lJ6MhQbw65maCAijH2Ck1lOBEtBDW5HG07wYHWBQhl1l94O9bcyy7d6pD BrzXivGP4PnMULP5cUpCOoRc96ywWh0BkhUEsXHikPFBfnsc7YRHDsk5IBIah8zL2jos PRGBkgQuBtWiAm5352WTCD2nb8de8zciJFJCXF4jiJxMir5I3ehpIv1y53yDdPGUJBNW 6I3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=fKKuy6AcsihquOKLo2le0joBjghYRrtTQ3dL8hR84v0=; fh=Tt4aWcAPplwJLYowQh9cIyedJjsIqBA8GlwfHZgTuYo=; b=zK7J1T8uv+7hgQirZoB/cRIrDMKZ8qwkHxOhEAEBFs/nbGbgavf+xUIFv3nxtYETs6 czXEDb9MNwv4QhMSS2INVMtXhtxVzgK6zGL1jrUrraNla0H3TN1kkoMVGrZUVKVirc7h owvKZdz74u3VNHz46qHwYfP9NeoPeFgQk7BxP0sJ2GvhMNWg3owhq/bfjPvlBY8hzFIv WncY0gD9X8qxYT76Qh+VnAFV4W7QNMTfDzaNfWNOmxV0i77XPk/sGKoAKWtilpBGKmYi F7nZt+UcgJlRbypWAU89jQ/afC/mcLoYMjZn31679q9e6IZwT0/wqUWwHy3oo6LzCrJe W8rA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=bxlg+Ztg; 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 f16-20020a056402151000b005233fff787csi911252edw.470.2023.08.09.23.37.48; Wed, 09 Aug 2023 23:37:48 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=bxlg+Ztg; 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 E473C68C897; Thu, 10 Aug 2023 09:37:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D25C668C897 for ; Thu, 10 Aug 2023 09:37:38 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1691649464; x=1723185464; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=AAyLFJr31QmpI/FAyt0fWQZQ/lmWv+OufSlIboABBN0=; b=bxlg+ZtgUuPGJerQr014AEFazqmhIcgc9Kin+LYn4ZMH5V43FB/wbxbY gXLANQlE8HaG/U4yCgyNxrUcC0JC6b3pZc7h918P7cqlcVA6a9sxImPW4 o7qZkulQoFlc4vqPD9inehrx+E6htZIc8FHYhZ6F6u5dPc/bYNL7BnGMy IWmY9g7exSqH7OIAAThFNvleb1wPOqNSpvgXHybY6Fo+r/WW59Rul2/nf ZGXAkNrL7JLTC7gTM8tDpV8zOq9YkvHFCPK9R1q3NbIcd3NUp6W23X7tr BfEZ8mvelm9I/K7xyPFKC+dxTllPcDKZ6CdIThny2tqzTOcSCClQNi1To A==; X-IronPort-AV: E=McAfee;i="6600,9927,10797"; a="370212088" X-IronPort-AV: E=Sophos;i="6.01,161,1684825200"; d="scan'208";a="370212088" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Aug 2023 23:37:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10797"; a="822120566" X-IronPort-AV: E=Sophos;i="6.01,161,1684825200"; d="scan'208";a="822120566" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Aug 2023 23:37:35 -0700 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Aug 2023 14:37:14 +0800 Message-Id: <20230810063714.457486-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: return error with zero output X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Y1XA6agaMpmq From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavcodec/qsvenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 7ff9d333a2..b3b7475b0f 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -2584,7 +2584,7 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, pict_type = AV_PICTURE_TYPE_P; else if (qpkt.bs->FrameType & MFX_FRAMETYPE_B || qpkt.bs->FrameType & MFX_FRAMETYPE_xB) pict_type = AV_PICTURE_TYPE_B; - else if (qpkt.bs->FrameType == MFX_FRAMETYPE_UNKNOWN) { + else if (qpkt.bs->FrameType == MFX_FRAMETYPE_UNKNOWN && qpkt.bs->DataLength) { pict_type = AV_PICTURE_TYPE_NONE; av_log(avctx, AV_LOG_WARNING, "Unknown FrameType, set pict_type to AV_PICTURE_TYPE_NONE.\n"); } else {