mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 15:02:43 +02:00
libeplayer3/input: unbreak dvbsub pts calculation
Origin commit data
------------------
Branch: master
Commit: 9788b2403d
Author: martii <m4rtii@gmx.de>
Date: 2014-04-26 (Sat, 26 Apr 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -56,7 +56,7 @@ Input::~Input()
|
||||
{
|
||||
}
|
||||
|
||||
int64_t calcPts(AVFormatContext *avfc, AVStream * stream, int64_t pts)
|
||||
int64_t Input::calcPts(AVStream * stream, int64_t pts)
|
||||
{
|
||||
if (pts == AV_NOPTS_VALUE)
|
||||
return INVALID_PTS_VALUE;
|
||||
@@ -178,7 +178,7 @@ bool Input::Play()
|
||||
Track *_teletextTrack = teletextTrack;
|
||||
|
||||
if (_videoTrack && (_videoTrack->stream == stream)) {
|
||||
int64_t pts = calcPts(avfc, stream, packet.pts);
|
||||
int64_t pts = calcPts(stream, packet.pts);
|
||||
if (!player->output.Write(avfc, stream, &packet, pts)) {
|
||||
if (warnVideoWrite)
|
||||
warnVideoWrite--;
|
||||
@@ -193,7 +193,7 @@ bool Input::Play()
|
||||
player->output.Write(avfc, stream, NULL, 0);
|
||||
}
|
||||
if (!player->isBackWard) {
|
||||
int64_t pts = calcPts(avfc, stream, packet.pts);
|
||||
int64_t pts = calcPts(stream, packet.pts);
|
||||
if (!player->output.Write(avfc, stream, &packet, _videoTrack ? pts : 0)) {
|
||||
if (warnAudioWrite)
|
||||
warnAudioWrite--;
|
||||
@@ -219,8 +219,8 @@ bool Input::Play()
|
||||
dvbsub_ass_write(stream->codec, &sub, stream->id);
|
||||
break;
|
||||
case SUBTITLE_BITMAP: {
|
||||
int64_t pts = calcPts(avfc, stream, packet.pts);
|
||||
dvbsub_write(&sub, calcPts(avfc, stream, pts));
|
||||
int64_t pts = calcPts(stream, packet.pts);
|
||||
dvbsub_write(&sub, pts);
|
||||
// avsubtitle_free() will be called by handler
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user