From patchwork Mon Jan 22 08:50:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruiling Song X-Patchwork-Id: 7387 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp2684779jak; Mon, 22 Jan 2018 00:50:45 -0800 (PST) X-Google-Smtp-Source: AH8x226SPrsSbvEhN7u37BUQMevYJvr9n4NvAfJE0muOXtyADbDrYnugvBKXliU/mB00KReBz3X9 X-Received: by 10.223.164.148 with SMTP id g20mr5981620wrb.49.1516611045242; Mon, 22 Jan 2018 00:50:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516611045; cv=none; d=google.com; s=arc-20160816; b=NecK0CpExfyvgvShJF3Y73w4NUkAbSPuYIImn4ZvQBLAndYFBJ7oyyy3y4fKhI+nrK EcasNfql62gVEbvwREigpBMBBB502IEOM/h1sXJMszelVyKVeXcRTYlHX1NIur3zZgnf LNSfMgxLANA76P1q3iEjaVLdF5vu1CzkmWr0QYAPUzp+4jbXJgNd04NzppCWjvXhzOvU 5vAeRWisxt3bnvu7ofIbJyrMIO9uzk6muUOQtX7ON03cT7/eKebM9SycEkSzHvwLemA+ Iz8VrR5QQxusC4uC6hnnLgnDbmLUHFxGAu7UtmjbzlVfRCWECxa2U6qmzspWw9ovtMGH 3Svg== 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=T3PFr4Kmdkb1AG9sasrbb8sjczqyxCCNU9uM/rzp4hw=; b=LWq7sKY5Dmj6VdKFR/JvgiKu0RvIKVXLohFTWCPjJxwiyvGtyc/9AZQFz5cNG9yNl/ qNTvLlVP2/Zaw2ilRPSwWWS4p+kF7xbhpK+RN90qC5g05RKdviRIgIXnVXtXOY1YQUd0 FEyfVI8IrhYKWM/ZBjWu8kNrAAACs2lJBMHUM0+LP9+0/YLLO/9OXDZgiADw+CEgBBTi tjhJCiouboad3XaS0ziaw/6i7Mi27YYZwMiQAtv83qWOdwbIlt52Uf7ciIhamT7viZiL s2q4B2I3OK1ggE2SAe+67PPPKekn07gmr9ua4unRDXcpJvg6vHNVR3DxcP51f3WNywqE xAEA== 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 j12si11846188wre.336.2018.01.22.00.50.44; Mon, 22 Jan 2018 00:50:45 -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 4E5C1689D56; Mon, 22 Jan 2018 10:50:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3CCF689B96 for ; Mon, 22 Jan 2018 10:50:33 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2018 00:50:33 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,395,1511856000"; d="scan'208";a="197510830" Received: from ruiling-skl2.sh.intel.com ([10.239.160.35]) by fmsmga005.fm.intel.com with ESMTP; 22 Jan 2018 00:50:32 -0800 From: "Ruiling, Song" To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jan 2018 16:50:33 +0800 Message-Id: <1516611033-14558-1-git-send-email-ruiling.song@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] lavc/qsv: skip the packet if decoding failure. 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: Ruiling@ffbox0-bg.ffmpeg.org, "Ruiling, Song" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" MediaSDK may fail to decode some frame, just skip it. Otherwise, it will keep decoding the failure packet repeatedly without processing any packet afterwards. Signed-off-by: Ruiling, Song --- libavcodec/qsvdec_h2645.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index 5e00673..0d06b21 100644 --- a/libavcodec/qsvdec_h2645.c +++ b/libavcodec/qsvdec_h2645.c @@ -153,8 +153,12 @@ static int qsv_decode_frame(AVCodecContext *avctx, void *data, } ret = ff_qsv_process_data(avctx, &s->qsv, frame, got_frame, &s->buffer_pkt); - if (ret < 0) - return ret; + if (ret < 0){ + /* force the buffer_pkt's size to 0 when failed to decode the packet, + otherwise, the decoder will keep decoding the failure packet. */ + s->buffer_pkt.size = 0; + return ret; + } s->buffer_pkt.size -= ret; s->buffer_pkt.data += ret;