From patchwork Sun Apr 30 07:04:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muhammad Faiz X-Patchwork-Id: 3515 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp937386vsd; Sun, 30 Apr 2017 00:05:04 -0700 (PDT) X-Received: by 10.223.170.195 with SMTP id i3mr14249363wrc.49.1493535904097; Sun, 30 Apr 2017 00:05:04 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 31si12066700wrz.258.2017.04.30.00.05.01; Sun, 30 Apr 2017 00:05:04 -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=@gmail.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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 87DE068921C; Sun, 30 Apr 2017 10:04:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9040680AD5 for ; Sun, 30 Apr 2017 10:04:49 +0300 (EEST) Received: by mail-pg0-f68.google.com with SMTP id c2so1272554pga.2 for ; Sun, 30 Apr 2017 00:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Ppjiz0gq6P3hphR4h/aJ9TKntG6Grorv+q1KfqzSiRM=; b=CIW3VUUScfriBnv0dFYu7TbCsqhHisj4P91yo55uW17bRGl7136aOwLk7I6vIL1UXD /JVs+HSMmay5nrrOLIM2msXjiQ6GMXIHj7rrgpWxbTz3pvXm530j/HOFr8CoGwC1Fcao 31JZobnqsYl3tIIAfz0xPw5GaETKQ3joIH/gxX295xxBbMHQw78qs7rAFkPaXSqOw3vo XomJYTaCf4zXThDht+05z7IZEZJHVjonM4gaBVMbm+BNWt5BgKa2PLHi3FdSzw4To170 iy/kvS5P/sVKi3N71J3ZkY07WKtIgj/SAnFuYlSucAhUsDPDEakHQoWWCQRU9PBOLYCd gFaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Ppjiz0gq6P3hphR4h/aJ9TKntG6Grorv+q1KfqzSiRM=; b=lLb+ylLjKl2fWIQQLiHMev2TieBYXmV6TK0/FCOCLheS7SaXSlfaRxi/d1FKZ2TuTW 6QVXZEDRaaxd3eZW4ghKPGJ7ziOZVsNwmLlqYcyjoE3RzmRTZdPIYoe7yBE+LJGb9zlO wHux0NpbKHyX/cxru3lP98jrjwaFlJDd4HEhGar2oh7352R6ta6QHdbi22F+zsi5QtBC YCYN6esfHqTAoOs0VrBzUOZ94hBoZ0iw/JNqPySw4ZR2zF2lWXch7EKuxge25GXjoiY7 0lJVwamAcf4b2mzkmtc8w0J3j8tLCKRAaAg2b2z20QsqDxcsxSfyevizQTI7rx2DxbVR Z/HQ== X-Gm-Message-State: AN3rC/4g9+Da0uN3ffLzBbUJapFQveLTJysfcA6Uh3FvvUDH+t5Oqc2X 94mdM6azNOQrqw== X-Received: by 10.98.87.78 with SMTP id l75mr20745215pfb.92.1493535891371; Sun, 30 Apr 2017 00:04:51 -0700 (PDT) Received: from localhost.localdomain ([114.121.235.94]) by smtp.gmail.com with ESMTPSA id p62sm18131193pfi.7.2017.04.30.00.04.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Apr 2017 00:04:51 -0700 (PDT) From: Muhammad Faiz To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2017 14:04:33 +0700 Message-Id: <20170430070433.25176-1-mfcc64@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: do not treat discarded frames as eof when draining 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: Muhammad Faiz MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fix fate failures: make fate-mov THREADS=32 Signed-off-by: Muhammad Faiz --- libavcodec/decode.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index edfae55..6ec423b 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -557,9 +557,6 @@ FF_ENABLE_DEPRECATION_WARNINGS avci->showed_multi_packet_warning = 1; } - if (!got_frame) - av_frame_unref(frame); - if (ret >= 0 && avctx->codec->type == AVMEDIA_TYPE_VIDEO && !(avctx->flags & AV_CODEC_FLAG_TRUNCATED)) ret = pkt->size; @@ -568,8 +565,9 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); #endif - /* do not stop draining when got_frame != 0 or ret < 0 */ - if (avctx->internal->draining && !got_frame) { + /* do not stop draining when frame->buf[0] != NULL or ret < 0 */ + /* at this point, got_frame == 0 when discarding frame */ + if (avctx->internal->draining && !frame->buf[0]) { if (ret < 0) { /* prevent infinite loop if a decoder wrongly always return error on draining */ /* reasonable nb_errors_max = maximum b frames + thread count */ @@ -603,7 +601,9 @@ FF_ENABLE_DEPRECATION_WARNINGS avci->last_pkt_props->dts = AV_NOPTS_VALUE; } - if (got_frame) + if (!got_frame) + av_frame_unref(frame); + else av_assert0(frame->buf[0]); return ret < 0 ? ret : 0;