From patchwork Mon Aug 15 08:23:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 170 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp1430145vsd; Mon, 15 Aug 2016 01:24:09 -0700 (PDT) X-Received: by 10.28.197.143 with SMTP id v137mr12720414wmf.26.1471249448436; Mon, 15 Aug 2016 01:24:08 -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 s21si14224369wmd.21.2016.08.15.01.24.06; Mon, 15 Aug 2016 01:24:08 -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 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 6B3666897E2; Mon, 15 Aug 2016 11:24:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pa0-f49.google.com (mail-pa0-f49.google.com [209.85.220.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 878A7687EE6 for ; Mon, 15 Aug 2016 11:23:55 +0300 (EEST) Received: by mail-pa0-f49.google.com with SMTP id i5so14737326pat.2 for ; Mon, 15 Aug 2016 01:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:from:subject:message-id:date:user-agent:mime-version; bh=slYg+yJdbaZMwOd3VZ6ULc3gaXUi/YGN8uJ4vEea2PM=; b=l6lLsZEAh5wOF+pFWGcfNvBYc+cTPtxsZPVgnHI9GWEg3TSLXaaknQV/DVzPzD2Xqa K8Il18wn6HT6OJxa5RPEg+bL42Kqk+KEAD5kYhFJDrhYyE4ukSEN0MncXi0mZVIEuhYY nXNfL3/fy2PYJwI0JFzSCjSVeYO15GeY269qOAKQC9gJwWConHptWj/pd1U66k7Y1yme W/qn4k/EPBiHY/tIT0O95qC7GxNP+liFzXhN3GX/cnNR2Ll/T5VAhGsBgwghr9QRgMXb wk6hMAvA8aGVgKsc36LVVqwLWHcf6/1NoCQLmce3+8q63T7F2IbhxizCoS5uduXh2tyZ mxiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=slYg+yJdbaZMwOd3VZ6ULc3gaXUi/YGN8uJ4vEea2PM=; b=D1z2RvKsiVbuh2pRwnBJXU2k8DOfSkKVWPsSdLyDYJxv4hBtC0tK4FacXm0QFj4hvA 2YTeubWhbAgZhRfRW6IKZ/YR5mRsoy369tCzyMu7n6Ni/MBaMO0n0NE1N2talRVWNKWj ROip8ItGwfzOIn8HEBKhX/Vq6DNWDtrDI7OLpsmjp6t9CW6h+BKch+9UZB7f6UHZDLN/ siQEgViQZHBsw3y9iGmX7Ovz1FNDoRHMqGwCydGriMgusJIX7Oz0tFy2vRmVpjg/dlrL pidlH6Wm5+TMfEWmATifXIID9he1xFVqdr1JOHMGwCx/H+l7ehzXiRHzl7l1tjKdTZ20 e7Rg== X-Gm-Message-State: AEkooustfwM7YQ/yNclb1j/3+Tc7sq0lDrLJ8bTt3xY+QSnG4IHU7DEwUM5CBQeTUpV8wA== X-Received: by 10.66.189.104 with SMTP id gh8mr869262pac.125.1471249435706; Mon, 15 Aug 2016 01:23:55 -0700 (PDT) Received: from [10.239.204.220] ([192.55.55.41]) by smtp.gmail.com with ESMTPSA id s23sm30244145pfd.23.2016.08.15.01.23.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Aug 2016 01:23:55 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Jun Zhao Message-ID: <9569b934-2196-c3c9-6ac8-0d04b0de0d02@gmail.com> Date: Mon, 15 Aug 2016 16:23:52 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 Content-Disposition: attachment; filename="0002-utils-fix-yami-decoder-carsh-issue.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH 2/5] utils : yami : fix yami decoder issue 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 5f72c65d6e33397a64770dca2cedc02d43589236 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Mon, 15 Aug 2016 15:51:09 +0800 Subject: [[PATCH] 2/5] utils : fix yami decoder carsh issue. when used the external yami h264 decoder lib, can't used sps from external yami h264 decoder lib. Signed-off-by: Jun Zhao --- libavformat/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 6b7609e..5bb6b0d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -927,7 +927,7 @@ static int has_decode_delay_been_guessed(AVStream *st) if (st->codecpar->codec_id != AV_CODEC_ID_H264) return 1; if (!st->info) // if we have left find_stream_info then nb_decoded_frames won't increase anymore for stream copy return 1; -#if CONFIG_H264_DECODER +#if CONFIG_H264_DECODER && !CONFIG_LIBYAMI_H264_DECODER if (st->internal->avctx->has_b_frames && avpriv_h264_has_num_reorder_frames(st->internal->avctx) == st->internal->avctx->has_b_frames) return 1;