From patchwork Fri Sep 23 03:48:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: raymond X-Patchwork-Id: 689 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp361683vsd; Thu, 22 Sep 2016 20:49:03 -0700 (PDT) X-Received: by 10.28.130.137 with SMTP id e131mr574006wmd.14.1474602543575; Thu, 22 Sep 2016 20:49:03 -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 o62si1329887wme.53.2016.09.22.20.49.02; Thu, 22 Sep 2016 20:49:03 -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 15BB3689B49; Fri, 23 Sep 2016 06:48:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pa0-f65.google.com (mail-pa0-f65.google.com [209.85.220.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEFA6689977 for ; Fri, 23 Sep 2016 06:48:37 +0300 (EEST) Received: by mail-pa0-f65.google.com with SMTP id hi10so4420588pac.2 for ; Thu, 22 Sep 2016 20:48: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=auKqTtC2t2GiCH8YXoDUymyM24FQ73QSZDO++vMxhdo=; b=uAOrfsuAIAviij1TIJAJv2VKkNRPF84HStI8HefbsKHnxKDEBSlmFs3jn+TkR+1pgn auCmbvRZT2H+OTByv0xkkMmEL97sLzYy8I8x2ZLhFMy+y1F1MPv5tqaxoV4P5gRR8lg7 +Zxr1eyIIdP3oThDmFX8clg2ICAABXfAW8pPEqBRNmJc7EYrKpMb9NEafjEj7Xs9mVMw AouKrXy2dEapwjtacdTAS1ajEyaqi1ZaJQC0lbR08ciawT30MsGC7dG7Sw6l3PKmTgoo P6OIcerUu514wDUbmEjT5pljXpCgSZ0L3W0p9/WvjbC6AHbm8t0me11EQodMUNg6AEaF V4Eg== 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=auKqTtC2t2GiCH8YXoDUymyM24FQ73QSZDO++vMxhdo=; b=ThgFgSnfS6xNtIJONREPXLEXxZgEOIlzvWM0FZCplgEcTHczAM9z+gYwi6FqmaVPcZ z2RvzGqBh6AdqrmxuMN72l0E8F01GCj+y3DIGKMC2h6ifYJEjI8nfdXasXE8AJ6rpmot EY5Hvzwj4nE4STZMZ463N3G7DWAJZ/VYpsOtihBTlBBRrdSYQcWrLtpwFiwn+8wFtaTD r2tZlDreiBJvahO7MfAeiv/XhEp9THp/c54GVSotuFgUfdfHalV5QHUEDqxrs0nNbu3p ix/rydfPr4pLPZCW77tboC1aueNkiI17NrfYrkY42z1sl9b1kPAh+zvsohuoP2pt018w UjZg== X-Gm-Message-State: AE9vXwP/u3Ta2qp08EEjuWmACIowbjKhJy0qycEdGp7eSvLLImYUIdTqoa8LOKDOICJ8Yw== X-Received: by 10.66.159.1 with SMTP id wy1mr8977928pab.20.1474602531914; Thu, 22 Sep 2016 20:48:51 -0700 (PDT) Received: from localhost.localdomain (014136134118.ctinets.com. [14.136.134.118]) by smtp.gmail.com with ESMTPSA id zh13sm6264208pab.4.2016.09.22.20.48.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Sep 2016 20:48:50 -0700 (PDT) From: "raymondzheng1412@gmail.com" To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Sep 2016 11:48:40 +0800 Message-Id: <1474602520-12918-1-git-send-email-raymondzheng1412@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474345876-95480-1-git-send-email-raymondzheng1412@gmail.com> References: <1474345876-95480-1-git-send-email-raymondzheng1412@gmail.com> Subject: [FFmpeg-devel] [PATCH] avformat/concatdec: don't call open_file when seek position within a file 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: "raymondzheng1412@gmail.com" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Thanks for your suggest, I have modified patch. see below. --- libavformat/concatdec.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index b3a430e..5cc239a 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -689,7 +689,7 @@ static int try_seek(AVFormatContext *avf, int stream, } static int real_seek(AVFormatContext *avf, int stream, - int64_t min_ts, int64_t ts, int64_t max_ts, int flags) + int64_t min_ts, int64_t ts, int64_t max_ts, int flags, AVFormatContext *cur_avf) { ConcatContext *cat = avf->priv_data; int ret, left, right; @@ -711,13 +711,19 @@ static int real_seek(AVFormatContext *avf, int stream, left = mid; } - if ((ret = open_file(avf, left)) < 0) - return ret; + if (cat->cur_file != &cat->files[left]) { + if ((ret = open_file(avf, left)) < 0) + return ret; + } else { + cat->avf = cur_avf; + } ret = try_seek(avf, stream, min_ts, ts, max_ts, flags); if (ret < 0 && left < cat->nb_files - 1 && cat->files[left + 1].start_time < max_ts) { + if (cat->cur_file == &cat->files[left]) + cat->avf = NULL; if ((ret = open_file(avf, left + 1)) < 0) return ret; ret = try_seek(avf, stream, min_ts, ts, max_ts, flags); @@ -738,13 +744,17 @@ static int concat_seek(AVFormatContext *avf, int stream, if (flags & (AVSEEK_FLAG_BYTE | AVSEEK_FLAG_FRAME)) return AVERROR(ENOSYS); cat->avf = NULL; - if ((ret = real_seek(avf, stream, min_ts, ts, max_ts, flags)) < 0) { - if (cat->avf) - avformat_close_input(&cat->avf); + if ((ret = real_seek(avf, stream, min_ts, ts, max_ts, flags, cur_avf_saved)) < 0) { + if (cat->cur_file != cur_file_saved) { + if (cat->avf) + avformat_close_input(&cat->avf); + } cat->avf = cur_avf_saved; cat->cur_file = cur_file_saved; } else { - avformat_close_input(&cur_avf_saved); + if (cat->cur_file != cur_file_saved) { + avformat_close_input(&cur_avf_saved); + } cat->eof = 0; } return ret;