From patchwork Wed Jul 27 04:21:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinzheng Zhang X-Patchwork-Id: 12 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp30490vsd; Tue, 26 Jul 2016 21:22:19 -0700 (PDT) X-Received: by 10.194.67.198 with SMTP id p6mr24753383wjt.138.1469593338996; Tue, 26 Jul 2016 21:22:18 -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 bf8si4604644wjb.121.2016.07.26.21.22.13; Tue, 26 Jul 2016 21:22:18 -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 F294968A582; Wed, 27 Jul 2016 07:22:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1711668998A for ; Wed, 27 Jul 2016 07:21:39 +0300 (EEST) Received: by mail-pf0-f194.google.com with SMTP id g202so1073974pfb.1 for ; Tue, 26 Jul 2016 21:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0AviGyq/KeF5ocSY8vUW3uTQW1ZA8YPasn/hIDTXSbc=; b=bxkZm01NBGjodb9f3o+VdGs+4DyiHiO2EsELuIMnIM5Bkq+t2mIFfkmdTVsGMw1XwN SONDWclkK0onRDlxjX/dAfeX6PQFsDPDJBZnpqg+DxzAhyWL+Bpg7LtiyOQ/pVsHrfHh 88Hg7AvMGqcTc0B+2j19oP8QExURJk9+vxg/KEsiyY6Z+o0MFX7c5pzKXbkE2dFmQhmN gp5ixoddZppyMYwhEqN6OhyfgE1LhgXRt3yP/qpRwjksyhDIMNUCV9nH+heUk0jbfWLg vHBwyuvGntJPw6+RHHeRkICFf3oJl2sIOBAU9TttjUpSp8d8Pqysr+8oPa/oPm551NcS 7k0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0AviGyq/KeF5ocSY8vUW3uTQW1ZA8YPasn/hIDTXSbc=; b=jfQ1HzE4DCdn169GydVwoL7+6JQv7j/6zmOE0UdDhyyQ6vtA+24Cn4hytqpnDtGaOC XxM/BaJsfxmz/35EnKzrBFNhcp+c4S8fkigRcYQf8HmOCAkHXdHw4pgArxieG1nfvpQq f0wRZJs9fwr//Etb6co9mDNnw4590SMWex4gH20SNRlrj4mL2gQfc8VQGl+JeLsEtfZp m07GbiPRTt2KG+sQBbv603ZQAwJPSr4Er7KmY3ySVbiG028st75gVnGrnfZvomA4KDBi QXr1sNx5BJhaIagWZiEtJZt0zzbOYJZWLfrNLqlbOsEbTS0AUkqOG9zJKbM8kV29YBEt 6Aug== X-Gm-Message-State: AEkoousXfr6tgTfV7V5w7cehqqTXBSCx4EDnFTMRrXN/PNX5bAGGvBPunwTc+mYf9fN3FA== X-Received: by 10.98.60.217 with SMTP id b86mr46145063pfk.129.1469593301715; Tue, 26 Jul 2016 21:21:41 -0700 (PDT) Received: from localhost.localdomain (014136134118.ctinets.com. [14.136.134.118]) by smtp.gmail.com with ESMTPSA id o8sm4917050pav.5.2016.07.26.21.21.40 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Jul 2016 21:21:41 -0700 (PDT) From: Xinzheng Zhang To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Jul 2016 12:21:25 +0800 Message-Id: <1469593285-28910-2-git-send-email-zhangxzheng@gmail.com> X-Mailer: git-send-email 2.6.4 (Apple Git-63) In-Reply-To: <1469593285-28910-1-git-send-email-zhangxzheng@gmail.com> References: <1469030804-11538-1-git-send-email-zhangxzheng@gmail.com> <1469593285-28910-1-git-send-email-zhangxzheng@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/flvdec: parse keyframe before a\v stream was created add_keyframes_index() when stream created or keyframe parsed 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: Xinzheng Zhang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/flvdec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 633cad0..0afeba5 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -128,6 +128,7 @@ static void add_keyframes_index(AVFormatContext *s) static AVStream *create_stream(AVFormatContext *s, int codec_type) { + FLVContext *flv = s->priv_data; AVStream *st = avformat_new_stream(s, NULL); if (!st) return NULL; @@ -138,6 +139,8 @@ static AVStream *create_stream(AVFormatContext *s, int codec_type) s->ctx_flags &= ~AVFMTCTX_NOHEADER; avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ + flv->last_keyframe_stream_index = s->nb_streams - 1; + add_keyframes_index(s); return st; } @@ -413,7 +416,6 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t m flv->keyframe_count = timeslen; times = NULL; filepositions = NULL; - add_keyframes_index(s); } else { invalid: av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n"); @@ -455,12 +457,14 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, } break; case AMF_DATA_TYPE_OBJECT: - if ((vstream || astream) && key && + if (key && ioc->seekable && !strcmp(KEYFRAMES_TAG, key) && depth == 1) if (parse_keyframes_index(s, ioc, max_pos) < 0) av_log(s, AV_LOG_ERROR, "Keyframe index parsing failed\n"); + else + add_keyframes_index(s); while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) if (amf_parse_object(s, astream, vstream, str_val, max_pos,