From patchwork Mon Sep 3 10:05:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 10220 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2493148jap; Mon, 3 Sep 2018 03:07:42 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdaoh/D0t0QoL/BRyrTDq3dwOtSf5xPqhd2DRpnSui7QMiLd9QlHVO7RG13VwLPD8QHoSN0Y X-Received: by 2002:a1c:b404:: with SMTP id d4-v6mr4759571wmf.28.1535969262281; Mon, 03 Sep 2018 03:07:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535969262; cv=none; d=google.com; s=arc-20160816; b=Z+s8ulZK3FrF3KR77S1kzCX95ZnNlHLfXTDTenW8MLeAspIFHHCF6kD8zz+5sk5i86 W/J1Hv2RH2jYlXqcRZ5EEEj3i/h0/uXUycFzBmw0WIzHkfrciJZmwmJUx80nlxjT3ZhX Cgo+tnydjcGRyfmnn1qVgCEMqcCr60x7K0NUU6zK+JfGlUG2triZ4RgvGYRBP5jrlUT7 yRkjoPaU5FSfzFtivWT8OrpLO6KqMyL1sZyluRQGN13NYZBaGMbcBNLgs4rHqMkfl3dp Xwn73ngNn27ulqnwrugdon/H3qpP6EfnPFoep20lt8el4v8CACEmn4eI5CWUwGTPHgop HFPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=IqoNyl7JO3VH33vILqCeULJDlkPN129OzkvZbZ20HNQ=; b=kSQtCZXZf8/2xaMuQvkWarq+FIPWk04nn8da1NzCA0tt8FAyWvpynm9aOTZswnAt8/ OznER1xfWl39JSC8oyFZyikBYL94EYdPgQabj5HxCqnO/UjeFSwzkr9/0kIx9ZWIZMcq fUC/SIon1oYp+15cQEz+tU7m5qPIp1bvl96Y73R/yyz0mgl/W1UQ5IovoUPy/jKeGXYb pt+a2+dajA4KqpNlN6P3dKuUILaLsYptBVan33zdwF5MMfTNs4HfT6ZYco9gQlt5LB2R pFno1jFJhqGVQMz34FgZfuE/0hZ84/9lV/xFTp+BDfEPAZ2vVyuM70Sn3MYNa7kpIpCI Ul+A== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z6-v6si14284494wrq.331.2018.09.03.03.07.41; Mon, 03 Sep 2018 03:07:42 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75F24689EE2; Mon, 3 Sep 2018 13:06:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgeu1.qq.com (smtpbgeu1.qq.com [52.59.177.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 026DF6806A5 for ; Mon, 3 Sep 2018 13:06:39 +0300 (EEST) X-QQ-mid: bizesmtp20t1535969191to7jle9z Received: from localhost (unknown [117.136.38.158]) by esmtp6.qq.com (ESMTP) with id ; Mon, 03 Sep 2018 18:06:29 +0800 (CST) X-QQ-SSF: 01100000002000F0FMF0000A0000000 X-QQ-FEAT: R/yWRekfFcphYuS25P/H3XEAoVSvG5U+APMACiLgXDsjgR//lLkrZciH4RM5g cfVh2K3nN9EvimkJU9sMa+iNe/9ncqJ4V8Msc1LWQHl0zgSFtdhSy21aDth3+YND9z5Ahsk GCsmah0nzxbYZc3BKhliqM2J6fs/1qzRSOSCGfNSo3X8dLAdxRl/+Kv8yd5svRtf2lepnIE SKmsTbNENsjBppsbSdvBhVPge3b91hBcYMHvVXMDz+khbEdT5eeM6RwK1HDodlibdK+nboq MzONZxuN3Ja6TEeriRqF7JzoC+O+DfjD5wYw== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Sep 2018 18:05:59 +0800 Message-Id: <20180903100600.85023-7-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) In-Reply-To: <20180903100600.85023-1-lq@chinaffmpeg.org> References: <20180903100600.85023-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 7/8] avformat/dashdec: reindent code for previous commit 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/dashdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 2a2d7455cd..854d7edc59 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1346,7 +1346,7 @@ static int64_t calc_cur_seg_no(AVFormatContext *s, struct representation *pls) if (c->min_buffer_time) { num = pls->first_seq_no + (((c->publish_time + pls->fragment_duration) - c->suggested_presentation_delay) * pls->fragment_timescale) / pls->fragment_duration - c->min_buffer_time; } else { - num = pls->first_seq_no + (((c->publish_time - c->time_shift_buffer_depth + pls->fragment_duration) - c->suggested_presentation_delay) * pls->fragment_timescale) / pls->fragment_duration; + num = pls->first_seq_no + (((c->publish_time - c->time_shift_buffer_depth + pls->fragment_duration) - c->suggested_presentation_delay) * pls->fragment_timescale) / pls->fragment_duration; } } else { num = pls->first_seq_no + (((get_current_time_in_sec() - c->availability_start_time) - c->suggested_presentation_delay) * pls->fragment_timescale) / pls->fragment_duration;