mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 07:23:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: cleanup

Browse Source
This commit is contained in:
martii
2014-04-10 23:51:17 +02:00
parent be26d8d46b
commit 6c594a7cda
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libeplayer3/input.cpp
View File

@@ -191,8 +191,8 @@ bool Input::Play()
Track *_teletextTrack = teletextTrack; Track *_teletextTrack = teletextTrack;
if (_videoTrack && (_videoTrack->stream == stream)) { if (_videoTrack && (_videoTrack->stream == stream)) {
int64_t pts = calcPts(avfc, _videoTrack->stream, packet.pts); int64_t pts = calcPts(avfc, stream, packet.pts);
if (!player->output.Write(avfc, _videoTrack->stream, &packet, pts)) { if (!player->output.Write(avfc, stream, &packet, pts)) {
if (warnVideoWrite) if (warnVideoWrite)
warnVideoWrite--; warnVideoWrite--;
else { else {
@@ -203,11 +203,11 @@ bool Input::Play()
} else if (_audioTrack && (_audioTrack->stream == stream)) { } else if (_audioTrack && (_audioTrack->stream == stream)) {
if (restart_audio_resampling) { if (restart_audio_resampling) {
restart_audio_resampling = false; restart_audio_resampling = false;
player->output.Write(avfc, _audioTrack->stream, NULL, 0); player->output.Write(avfc, stream, NULL, 0);
} }
if (!player->isBackWard) { if (!player->isBackWard) {
int64_t pts = calcPts(avfc, _audioTrack->stream, packet.pts); int64_t pts = calcPts(avfc, stream, packet.pts);
if (!player->output.Write(avfc, _audioTrack->stream, &packet, pts)) { if (!player->output.Write(avfc, stream, &packet, pts)) {
if (warnAudioWrite) if (warnAudioWrite)
warnAudioWrite--; warnAudioWrite--;
else { else {
@@ -217,23 +217,23 @@ bool Input::Play()
} }
} }
} else if (_subtitleTrack && (_subtitleTrack->stream == stream)) { } else if (_subtitleTrack && (_subtitleTrack->stream == stream)) {
if (((AVStream *) _subtitleTrack->stream)->codec->codec) { if (stream->codec->codec) {
AVSubtitle sub; AVSubtitle sub;
memset(&sub, 0, sizeof(sub)); memset(&sub, 0, sizeof(sub));
int got_sub_ptr = 0; int got_sub_ptr = 0;
err = avcodec_decode_subtitle2(((AVStream *) _subtitleTrack->stream)->codec, &sub, &got_sub_ptr, &packet); err = avcodec_decode_subtitle2(stream->codec, &sub, &got_sub_ptr, &packet);
averror(err, avcodec_decode_subtitle2); averror(err, avcodec_decode_subtitle2);
if (got_sub_ptr && sub.num_rects > 0) { if (got_sub_ptr && sub.num_rects > 0) {
switch (sub.rects[0]->type) { switch (sub.rects[0]->type) {
case SUBTITLE_TEXT: // FIXME? case SUBTITLE_TEXT: // FIXME?
case SUBTITLE_ASS: case SUBTITLE_ASS:
dvbsub_ass_write(_subtitleTrack->stream->codec, &sub, _subtitleTrack->stream->id); dvbsub_ass_write(stream->codec, &sub, stream->id);
break; break;
case SUBTITLE_BITMAP: { case SUBTITLE_BITMAP: {
int64_t pts = calcPts(avfc, _subtitleTrack->stream, packet.pts); int64_t pts = calcPts(avfc, stream, packet.pts);
dvbsub_write(&sub, calcPts(avfc, _subtitleTrack->stream, pts)); dvbsub_write(&sub, calcPts(avfc, stream, pts));
// avsubtitle_free() will be called by handler // avsubtitle_free() will be called by handler
break; break;
} }
@@ -243,7 +243,7 @@ bool Input::Play()
} }
} }
} else if (_teletextTrack && (_teletextTrack->stream == stream)) { } else if (_teletextTrack && (_teletextTrack->stream == stream)) {
teletext_write(_teletextTrack->stream->id, packet.data, packet.size); teletext_write(stream->id, packet.data, packet.size);
} }
av_free_packet(&packet); av_free_packet(&packet);
@@ -439,7 +439,7 @@ bool Input::UpdateTracks()
track.avfc = avfc; track.avfc = avfc;
track.stream = stream; track.stream = stream;
AVDictionaryEntry *lang = av_dict_get(stream->metadata, "language", NULL, 0); AVDictionaryEntry *lang = av_dict_get(stream->metadata, "language", NULL, 0);
track.Name = lang ? lang->value : "?"; track.Name = lang ? lang->value : "";
track.pid = stream->id; track.pid = stream->id;
if (stream->duration == AV_NOPTS_VALUE) if (stream->duration == AV_NOPTS_VALUE)
track.duration = (double) avfc->duration / 1000.0; track.duration = (double) avfc->duration / 1000.0;