From patchwork Thu Jan 25 08:37:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruiling Song X-Patchwork-Id: 7414 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp1775717jak; Thu, 25 Jan 2018 00:37:30 -0800 (PST) X-Google-Smtp-Source: AH8x226yyidw6SyXWVZG7YlmV4oxQ49NmwNd0JbbhXVj0lNxXAC6CIC+E+gWYU6axsdnUNSm3CGG X-Received: by 10.223.209.6 with SMTP id a6mr8845855wri.4.1516869450146; Thu, 25 Jan 2018 00:37:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516869450; cv=none; d=google.com; s=arc-20160816; b=j5v+YdrXNMMtEnFkS8ptQdipuKIbO9Cu944RY9IDIMJI+QDXHwSVplvvG6UrWn5ayf uwKjMnW392Om707DjKFgyFMN840DTt6K/MJTElKRMzrVNknlCUjE7MpXhUj53jSkK1eg qYNZ3nPk8xHCmE7bLbMY3eesBCBhfM3NcwpPjsB+0aU4ClE88LKFIFnCHDfKuDXLPh2d ZXLFahctfpz5LqxlLLKvlA5O11FM4JuvClzaf0AEGMpDUVRlHvtZYS/rttbr+scWqbqq aVVel5yUKeMadn/A0oAsKGjhlkOaLw2OBeOTD+/uKZOcjPzCLPW3Mg0aVRsiZ48sxzDD C3XA== 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=ug+ottemLVrPH3qfbO3U9a4em+5cCMNReHzAEBDL67c=; b=kGI784nyQO/L24gJqfdcO94nquwk7xJpJw1eO6o9lKQiTGSK3Y4SUVwaa/Gyp8BgLB 7nbv68NpB8MAt9uUClUXfbsvQDhWxe90GCaNRc1jkJUsxmxQXdV3L3Gt4AALDJ+cihEq rNtvDoSWux3Y/V89XVEUNz7pNe4B9YsVN1N+hOjyr8acvztymvDsJzim99FCkXMaJJXL qwEGICxOIn84x0u7S3bQ0bjEKR5Xqoc2XBIEXlc/7sLCCjfs/3LNOKyJFBdRpp2Z0jys DLwtPWxAr9afNYdIRCAyIFv7y1G3csLMhigRf6uaAGZ38S7v0kU0Ewblupampko7GcBz +Zuw== 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 x90si3498166wrb.344.2018.01.25.00.37.29; Thu, 25 Jan 2018 00:37:30 -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 B5DA168998B; Thu, 25 Jan 2018 10:37:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41AFD680168 for ; Thu, 25 Jan 2018 10:37:16 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Jan 2018 00:37:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,411,1511856000"; d="scan'208";a="12892037" Received: from ruiling-skl2.sh.intel.com ([10.239.160.35]) by fmsmga007.fm.intel.com with ESMTP; 25 Jan 2018 00:37:15 -0800 From: Ruiling Song To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2018 16:37:12 +0800 Message-Id: <1516869432-30961-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, Song" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: "Ruiling, Song" MediaSDK may fail to decode some frame, just skip it. Otherwise, it will keep decoding the failure packet repeatedly without processing any packet afterwards. v2: switch to using av_packet_unref(). Signed-off-by: Ruiling Song --- libavcodec/qsvdec_h2645.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvdec_h2645.c b/libavcodec/qsvdec_h2645.c index 5e00673..d92a150 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) + if (ret < 0) { + /* Drop buffer_pkt when failed to decode the packet. Otherwise, + the decoder will keep decoding the failure packet. */ + av_packet_unref(&s->buffer_pkt); return ret; + } s->buffer_pkt.size -= ret; s->buffer_pkt.data += ret;