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

libeplayer: disable subtitle code

Browse Source 
current neutrino is not prepared for this, so comment
it out to fix linking
This commit is contained in:
Stefan Seyfried
2015-02-13 17:57:55 +01:00
parent dc5067e5d2
commit d4365037f6
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libeplayer3/include/input.h
View File

@@ -70,8 +70,10 @@ class Input
Input(); Input();
~Input(); ~Input();
#if 0
bool ReadSubtitle(const char *filename, const char *format, int pid); bool ReadSubtitle(const char *filename, const char *format, int pid);
bool ReadSubtitles(const char *filename); bool ReadSubtitles(const char *filename);
#endif
bool Init(const char *filename); bool Init(const char *filename);
bool UpdateTracks(); bool UpdateTracks();
bool Play(); bool Play();

12
libeplayer3/input.cpp
View File

@@ -73,12 +73,14 @@ int64_t Input::calcPts(AVStream * stream, int64_t pts)
return pts; return pts;
} }
#if 0
// from neutrino-mp/lib/libdvbsubtitle/dvbsub.cpp // from neutrino-mp/lib/libdvbsubtitle/dvbsub.cpp
extern void dvbsub_write(AVSubtitle *, int64_t); extern void dvbsub_write(AVSubtitle *, int64_t);
extern void dvbsub_ass_write(AVCodecContext *c, AVSubtitle *sub, int pid); extern void dvbsub_ass_write(AVCodecContext *c, AVSubtitle *sub, int pid);
extern void dvbsub_ass_clear(void); extern void dvbsub_ass_clear(void);
// from neutrino-mp/lib/lib/libtuxtxt/tuxtxt_common.h // from neutrino-mp/lib/lib/libtuxtxt/tuxtxt_common.h
extern void teletext_write(int pid, uint8_t *data, int size); extern void teletext_write(int pid, uint8_t *data, int size);
#endif
static std::string lastlog_message; static std::string lastlog_message;
static unsigned int lastlog_repeats; static unsigned int lastlog_repeats;
@@ -221,6 +223,7 @@ bool Input::Play()
logprintf("writing data to %s device failed\n", "audio"); logprintf("writing data to %s device failed\n", "audio");
} }
audioSeen = true; audioSeen = true;
#if 0
} else if (_subtitleTrack && (_subtitleTrack->stream == stream)) { } else if (_subtitleTrack && (_subtitleTrack->stream == stream)) {
if (stream->codec->codec) { if (stream->codec->codec) {
AVSubtitle sub; AVSubtitle sub;
@@ -250,6 +253,7 @@ bool Input::Play()
} else if (_teletextTrack && (_teletextTrack->stream == stream)) { } else if (_teletextTrack && (_teletextTrack->stream == stream)) {
if (packet.data && packet.size > 1) if (packet.data && packet.size > 1)
teletext_write(_teletextTrack->pid, packet.data + 1, packet.size - 1); teletext_write(_teletextTrack->pid, packet.data + 1, packet.size - 1);
#endif
} }
av_free_packet(&packet); av_free_packet(&packet);
@@ -260,7 +264,9 @@ bool Input::Play()
else else
player->output.Flush(); player->output.Flush();
#if 0
dvbsub_ass_clear(); dvbsub_ass_clear();
#endif
abortPlayback = true; abortPlayback = true;
hasPlayThreadStarted = false; hasPlayThreadStarted = false;
@@ -297,6 +303,7 @@ static int lock_callback(void **mutex, enum AVLockOp op)
} }
} }
#if 0
bool Input::ReadSubtitle(const char *filename, const char *format, int pid) bool Input::ReadSubtitle(const char *filename, const char *format, int pid)
{ {
const char *lastDot = strrchr(filename, '.'); const char *lastDot = strrchr(filename, '.');
@@ -369,6 +376,7 @@ bool Input::ReadSubtitles(const char *filename) {
ret |= ReadSubtitle(filename, "ssa", 0xFFFD); ret |= ReadSubtitle(filename, "ssa", 0xFFFD);
return ret; return ret;
} }
#endif
bool Input::Init(const char *filename) bool Input::Init(const char *filename)
{ {
@@ -438,9 +446,9 @@ again:
player->output.SwitchVideo(videoTrack->stream); player->output.SwitchVideo(videoTrack->stream);
if (audioTrack) if (audioTrack)
player->output.SwitchAudio(audioTrack->stream); player->output.SwitchAudio(audioTrack->stream);
#if 0
ReadSubtitles(filename); ReadSubtitles(filename);
#endif
return res; return res;
} }