From patchwork Tue Jul 26 12:17:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinzheng Zhang X-Patchwork-Id: 4 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp1263519vsd; Tue, 26 Jul 2016 05:18:10 -0700 (PDT) X-Received: by 10.28.3.69 with SMTP id 66mr20449779wmd.26.1469535490713; Tue, 26 Jul 2016 05:18:10 -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 it8si501584wjb.171.2016.07.26.05.18.10; Tue, 26 Jul 2016 05:18:10 -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 19F6D68A04E; Tue, 26 Jul 2016 15:18:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31C7A68A424 for ; Tue, 26 Jul 2016 15:17:50 +0300 (EEST) Received: by mail-pf0-f195.google.com with SMTP id i6so13849977pfe.0 for ; Tue, 26 Jul 2016 05:17:53 -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=38ERG3VFktq2XlsAPNX7KCp5smDZNXMXTjd7hsNxS+M=; b=zMkMOYYnY4U1kaHGxzZjrdA2PrZnLEZcNSs5KDAdVjjIpJxqALa/ygv0RUmvH2pHMb benoDnDcW6LaoEDQ9jmO7WoJI1i/l/y+3uM/Sq1pPV8jwcr3nGsc9i376yp3mYQgEHco VNqzPscUo48w7cHuC6AxtbKzDpGgOY0AHgU2TuVjhdtwXu/GDQdnno/RZfeLFt8/e4W7 0l/bU0paXzQi0TyR9qrZindGaPHnUZnwKGYNtUu2tqzOq9AdlRF9WIptpVt3sciehJVc IhRHGKqHr7nJFOaSaJrCPCi0mCVgV+F5x2ktW/PldVtatXZBWEaJ2sDO6VPXgvP1dy7l em4g== 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=38ERG3VFktq2XlsAPNX7KCp5smDZNXMXTjd7hsNxS+M=; b=N1AgyYWG7Lrf/n8ZTdmvChliXwthZjWDw1m6+MkNLDMoJY6J2jyIgIyt+i+Lkgje2S UmVMBIP9DWKE9GrqIbTfoDM/imGTkKLcHFcbnynSL8aa9KWIZsFAMBxInCTc92Y50dlX 8v9JobuybLYFV1O5aFkICQc0n1xID3CkWVIc0jUzQtrAX5pyOINp2RJPfUE4ZPeycQIx L7bOEypg36p3edViwAKNg4391FIvmTZFgBLr8k/WbT2PIVwhEuzf4tyA4PrFuCM7DwmE B4iNPDi7mMDfKaaDqkabG57kaVyng8Ps5LczfLnj+jnQZgjfgZQ30S2oYfQM0LFA1g+L 9rEA== X-Gm-Message-State: AEkoouuKwQuQ1mdJ7urpjUng+u3+YkYXby3rtWwD1hWWC76ih9HSld0X3E0eCZX+NaGL5A== X-Received: by 10.98.29.201 with SMTP id d192mr38919980pfd.142.1469535472044; Tue, 26 Jul 2016 05:17:52 -0700 (PDT) Received: from localhost.localdomain (014136134118.ctinets.com. [14.136.134.118]) by smtp.gmail.com with ESMTPSA id c125sm1284032pfc.40.2016.07.26.05.17.50 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Jul 2016 05:17:51 -0700 (PDT) From: Xinzheng Zhang To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Jul 2016 20:17:46 +0800 Message-Id: <1469535466-79933-1-git-send-email-zhangxzheng@gmail.com> X-Mailer: git-send-email 2.6.4 (Apple Git-63) In-Reply-To: <1469030804-11538-1-git-send-email-zhangxzheng@gmail.com> References: <1469030804-11538-1-git-send-email-zhangxzheng@gmail.com> Subject: [FFmpeg-devel] [PATCH] avformat/fivdec: cached keyframes before video or audio stream was created 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 | 84 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 69 insertions(+), 15 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 2bf1e05..82b9f83 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -61,6 +61,12 @@ typedef struct FLVContext { int broken_sizes; int sum_flv_tag_size; + + int vhead_exists; + int ahead_exists; + int keyframe_count; + int64_t *keyframe_times; + int64_t *keyframe_filepositions; } FLVContext; static int probe(AVProbeData *p, int live) @@ -92,6 +98,42 @@ static int live_flv_probe(AVProbeData *p) return probe(p, 1); } +static void add_keyframes_index(AVFormatContext *s) +{ + FLVContext *flv = s->priv_data; + AVStream *current_stream = NULL; + AVStream *vstream = NULL; + AVStream *astream = NULL; + unsigned int i,j ; + + for (i = 0; i< s->nb_streams; i++) { + if (s->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { + vstream = s->streams[i]; + } else if (s->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { + astream = s->streams[i]; + } + } + + AVStream *streams[2] = {vstream, astream}; + for (i = 0; i < 2; i++) { + current_stream = streams[i]; + if (current_stream && current_stream->nb_index_entries==0) { + for (j = 0; j < flv->keyframe_count; j++) { + av_add_index_entry(current_stream, flv->keyframe_filepositions[j], flv->keyframe_times[j] * 1000, + 0, 0, AVINDEX_KEYFRAME); + } + } + } + + // free keyframe index only if all expected streams have been created + if (((vstream && vstream->nb_index_entries>0) || !flv->vhead_exists) && + ((astream && astream->nb_index_entries>0) || !flv->ahead_exists)) { + av_freep(&flv->keyframe_times); + av_freep(&flv->keyframe_filepositions); + flv->keyframe_count = 0; + } +} + static AVStream *create_stream(AVFormatContext *s, int codec_type) { AVStream *st = avformat_new_stream(s, NULL); @@ -104,6 +146,7 @@ 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 */ + add_keyframes_index(s); return st; } @@ -305,8 +348,7 @@ static int amf_get_string(AVIOContext *ioc, char *buffer, int buffsize) return length; } -static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, - AVStream *vstream, int64_t max_pos) +static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t max_pos) { FLVContext *flv = s->priv_data; unsigned int timeslen = 0, fileposlen = 0, i; @@ -316,7 +358,7 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int ret = AVERROR(ENOSYS); int64_t initial_pos = avio_tell(ioc); - if (vstream->nb_index_entries>0) { + if (flv->keyframe_count > 0) { av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n"); return 0; } @@ -324,6 +366,10 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, if (s->flags & AVFMT_FLAG_IGNIDX) return 0; + av_freep(&flv->keyframe_times); + av_freep(&flv->keyframe_filepositions); + flv->keyframe_count = 0; + while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { int64_t **current_array; @@ -366,17 +412,17 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, break; } } - if (timeslen == fileposlen && fileposlen>1 && max_pos <= filepositions[0]) { - for (i = 0; i < fileposlen; i++) { - av_add_index_entry(vstream, filepositions[i], times[i] * 1000, - 0, 0, AVINDEX_KEYFRAME); - if (i < 2) { - flv->validate_index[i].pos = filepositions[i]; - flv->validate_index[i].dts = times[i] * 1000; - flv->validate_count = i + 1; - } + for (i = 0; i < FFMIN(2,fileposlen); i++) { + flv->validate_index[i].pos = filepositions[i]; + flv->validate_index[i].dts = times[i] * 1000; + flv->validate_count = i + 1; } + flv->keyframe_times = times; + flv->keyframe_filepositions = filepositions; + flv->keyframe_count = timeslen; + times = NULL; + filepositions = NULL; } else { invalid: av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n"); @@ -418,12 +464,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, vstream ? vstream : astream, + 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) @@ -631,9 +679,13 @@ static int flv_read_header(AVFormatContext *s) { FLVContext *flv = s->priv_data; int offset; + int flags; avio_skip(s->pb, 4); - avio_r8(s->pb); // flags + flags = avio_r8(s->pb); // flags + + flv->vhead_exists = flags & FLV_HEADER_FLAG_HASVIDEO; + flv->ahead_exists = flags & FLV_HEADER_FLAG_HASAUDIO; s->ctx_flags |= AVFMTCTX_NOHEADER; @@ -653,6 +705,8 @@ static int flv_read_close(AVFormatContext *s) FLVContext *flv = s->priv_data; for (i=0; inew_extradata[i]); + av_freep(&flv->keyframe_times); + av_freep(&flv->keyframe_filepositions); return 0; }