From patchwork Thu Aug 30 10:22:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacek Jendrzej X-Patchwork-Id: 10183 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp7982jap; Thu, 30 Aug 2018 12:58:52 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaYS5a4XNs4zfqRxa7gadMpC8SUcd02q0/QcufAXbaN4WGnD2XsqINbVUW4xboVUSOLb1yB X-Received: by 2002:a1c:e00a:: with SMTP id x10-v6mr2828513wmg.58.1535659131944; Thu, 30 Aug 2018 12:58:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535659131; cv=none; d=google.com; s=arc-20160816; b=pMjgmw0Sz0CMt7z01hFuUH/w4xWoza6+FQNXRcasxPOTcLZdrRjFFf7nmIHcfBq8/B ZKwz8Xho/ptaRjeQWhJ9HqnH8DXHzLmd7qOYwdUdZs6pWGkG+zKz6M5plkSJ6V27GN6A EAJIsZDiZOgm0ww4Qn9mpvu8fW6eeo2MDmHWWQm0qPObvnsWOqFQ6CElOrzf359xLT3T SFTZFp6apEqh7JddvdAWv3Heh479y9PY89Ra9tXu8Lkp8hl9CvSoTr3amrk0TYx77yxy fUUaLrIPFk/rXJvW07sjvaPdP3OzSFo/Mqt6XOZt08TCK88mYWiEWGoZk9c4V1CNSK6c BaAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=OSLW3omOH4oNg2AWHwGYFaW2ycYms2YtyfQWyMiWQec=; b=PU7OAixAlB/+56n+3SYBE9ABsa5t+BRYkdv2N/kz8hOultQiphFahy16JWm4dE0yPd nOoWmOM2xLjougvqa+TTmHFtqM2V/+ZCAohqXg+yvIGu3Ed/JehcDzJsUNJxLWty7DWr jy87rbiXgxaAbOiETjXepKEicidVFyvWKaQdvHk+yn6qQLHzbY1C5avAV5wJmGmzWyyW /B8t57WI53PUqKdiC05Qf9kj5fs6I1bGj4gogUvCt5CJ3RpCJ3yREqpKpsb8hwpNEGX5 eYqY1/EKEMhqx3Zgabp02hTk7jmnfrdRDzM2gonbu5pBJmOgZ94BVmOq3UoGfdA1Kc7C QKXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=dbqCQs1x; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b79-v6si1123985wmf.126.2018.08.30.12.58.51; Thu, 30 Aug 2018 12:58:51 -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 header.s=20161025 header.b=dbqCQs1x; 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 sp=QUARANTINE 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 9681F68A04C; Thu, 30 Aug 2018 22:58:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f51.google.com (mail-it0-f51.google.com [209.85.214.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65E7B689CBF for ; Thu, 30 Aug 2018 13:23:04 +0300 (EEST) Received: by mail-it0-f51.google.com with SMTP id j81-v6so1914440ite.0 for ; Thu, 30 Aug 2018 03:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=BQd7356NY3OQ06ZO0zkQ1++5jDKwbvoCLB69rL83mZs=; b=dbqCQs1xH98/Z/ZtJ7R2uPX/jDwhgo7C0QER6XfeN6eD+umJJOq4HNIl2CXpNWaUbd LrAl1DLNIpc6r0M/plVf1KEodM1MjvLZP4kzB6LOkTqgCUobBJIQlnckYi+r/YoHQXrz L9+eK6Hq/nhm43EpsWC8hftRhWiF+ifZKVa1y/0fF2NCdmRfffIRrb3KUFKC//JTL1rX QDTITLJm8qEoGsF28r9fDQ+GUKUwRuiozShLFhGCtHMgv+ymkM2qwRjYv12uz8GmTxiZ ko4146ze/qHdjfj1CqljFO0jvTsi1ELsQiIBDl/GquQE7nIi938bKeJWDW+UswHNoDAt 7ovA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=BQd7356NY3OQ06ZO0zkQ1++5jDKwbvoCLB69rL83mZs=; b=eENDbyprItFTfqjEBkggIHwnWzCA1Rjk9FxAjrrlI+a/m1P8H1BUfxGBm7Np3k/+sV LE++RuyHxynOiogaT2//8GHdw0pe4agnsa6y9Ib2Wf/AUgJ9fNzEzauiL6oMIGfZRZAx q4nZGIuFXPKHgbPQaKnRbHY4coIPDp+3MoiGm0orippm5hsZakVGeK1s4AE/L3IfR9s3 hIX13gBqF1jNz/uwC6SgoFG/ko95MmD1ExOVuGtn+2bH2aJKkw//j7B9+Tr+OhBFJeTb HC5x/Yz6IgsOzSO8DO3RsA8cHO2vcf8Y7L0qgrdq1VET8YfEeMA5bCCJChRow0xNfOyR 3hGQ== X-Gm-Message-State: APzg51AouQCzg6p7g8QYRmsEQwKpS2AWRE9p5Ue2SOoMmBvW1ZWcVhIM NGCnn2NiZJlDMeFvvwojdA1UoGw8QAbGH9vJLeaueefd X-Received: by 2002:a24:cc07:: with SMTP id x7-v6mr1540201itf.3.1535624587659; Thu, 30 Aug 2018 03:23:07 -0700 (PDT) MIME-Version: 1.0 From: jacek jendrzej Date: Thu, 30 Aug 2018 12:22:53 +0200 Message-ID: To: ffmpeg-devel@ffmpeg.org X-Mailman-Approved-At: Thu, 30 Aug 2018 22:58:42 +0300 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] lavf//dashdec:fix calc_cur_seg_no with presentation_timeoffset 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" Hi. My try to fix Ticket #7382. Patch for https://trac.ffmpeg.org/ticket/7382 From a22984201f05854c6ec6e86cf05f67c11112419d Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 29 Aug 2018 12:35:35 +0200 Subject: [PATCH] avformat/dashdec:try to fix calc_cur_seg_no with presentation_timeoffset --- libavformat/dashdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 0435f25412..81168efd82 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1294,7 +1294,7 @@ static int64_t calc_cur_seg_no(AVFormatContext *s, struct representation *pls) num += pls->first_seq_no; } else if (pls->fragment_duration){ if (pls->presentation_timeoffset) { - num = pls->presentation_timeoffset * pls->fragment_timescale / pls->fragment_duration; + num = pls->first_seq_no + (((get_current_time_in_sec() * pls->fragment_timescale)-pls->presentation_timeoffset) / pls->fragment_duration) - 120;//FIXME waht is 120 ??? } else if (c->publish_time > 0 && !c->availability_start_time) { 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 { -- 2.18.0