From 4b03a8681fe2d331f227746d95c68a802eba9f63 Mon Sep 17 00:00:00 2001 From: max_10 Date: Fri, 15 Apr 2016 21:13:12 +0200 Subject: [PATCH] re add old calcPts Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/055fa18dbfe523d6f415d9114e1a06bed323bba0 Author: max_10 Date: 2016-04-15 (Fri, 15 Apr 2016) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/input.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libeplayer3/input.cpp b/libeplayer3/input.cpp index dd7d477..9676383 100644 --- a/libeplayer3/input.cpp +++ b/libeplayer3/input.cpp @@ -65,9 +65,9 @@ int64_t Input::calcPts(AVStream * stream, int64_t pts) if (pts == AV_NOPTS_VALUE) return INVALID_PTS_VALUE; - pts = av_rescale(90000ll * stream->time_base.num, pts, stream->time_base.den); + pts = 90000 * (double)pts * stream->time_base.num / stream->time_base.den; if (avfc->start_time != AV_NOPTS_VALUE) - pts -= av_rescale(90000ll, avfc->start_time, AV_TIME_BASE); + pts -= 90000 * avfc->start_time / AV_TIME_BASE; if (pts < 0) return INVALID_PTS_VALUE; @@ -154,16 +154,16 @@ bool Input::Play() seek_target = seek_avts_abs; } seek_avts_abs = INT64_MIN; - } else if (player->isBackWard && av_gettime() >= showtime) { + } else if (player->isBackWard && av_gettime_relative() >= showtime) { player->output.ClearVideo(); if (bof) { - showtime = av_gettime(); + showtime = av_gettime_relative(); usleep(100000); continue; } seek_avts_rel = player->Speed * AV_TIME_BASE; - showtime = av_gettime() + 300000; //jump back every 300ms + showtime = av_gettime_relative() + 300000; //jump back every 300ms continue; } else { bof = false;