mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 15:32:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: use av_rescale for pts calulations

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 91712236fe
Author: martii <m4rtii@gmx.de>
Date: 2014-04-18 (Fri, 18 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-18 11:16:44 +02:00
parent a678fc046e
commit 2b2a43de82
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libeplayer3/input.cpp
View File

@@ -61,9 +61,9 @@ int64_t calcPts(AVFormatContext *avfc, AVStream * stream, int64_t pts)
if (pts == AV_NOPTS_VALUE)
return INVALID_PTS_VALUE;
pts = 90000 * pts * stream->time_base.num / stream->time_base.den;
pts = av_rescale(90000ll * stream->time_base.num, pts, stream->time_base.den);
if (avfc->start_time != AV_NOPTS_VALUE)
pts -= 90000 * avfc->start_time / AV_TIME_BASE;
pts -= av_rescale(90000ll, avfc->start_time, AV_TIME_BASE);
if (pts < 0)
return INVALID_PTS_VALUE;
@@ -422,8 +422,8 @@ bool Input::UpdateTracks()
AVDictionaryEntry* title = av_dict_get(ch->metadata, "title", NULL, 0);
Chapter chapter;
chapter.title = title ? title->value : "";
chapter.start = AV_TIME_BASE * ch->start * ch->time_base.num / ch->time_base.den;
chapter.end = AV_TIME_BASE * ch->end * ch->time_base.num / ch->time_base.den;
chapter.start = av_rescale(ch->time_base.num * AV_TIME_BASE, ch->start, ch->time_base.den);
chapter.end = av_rescale(ch->time_base.num * AV_TIME_BASE, ch->end, ch->time_base.den);
chapters.push_back(chapter);
}
player->SetChapters(chapters);
@@ -447,7 +447,7 @@ bool Input::UpdateTracks()
if (stream->duration == AV_NOPTS_VALUE)
track.duration = avfc->duration;
else
track.duration = AV_TIME_BASE * stream->duration * stream->time_base.num / stream->time_base.den;
track.duration = av_rescale(stream->time_base.num * AV_TIME_BASE, stream->duration, stream->time_base.den);
switch (stream->codec->codec_type) {
case AVMEDIA_TYPE_VIDEO: {