From 2377c0ce4ed65e78a49e73efadb701dce24cdd24 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 8 Oct 2017 13:14:30 +0200 Subject: [PATCH] Revert "libeplayer3: switch off the teletext sub" This reverts commit 2d7a73495fa1ac62f26fe5ddfa33b71bb1892c39. Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/a2fc1d51ee2bd5d66263aecdbf2936cf26e91f17 Author: TangoCash Date: 2017-10-08 (Sun, 08 Oct 2017) ------------------ This commit was generated by Migit --- libeplayer3/input.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libeplayer3/input.cpp b/libeplayer3/input.cpp index f4621f9..19af03e 100644 --- a/libeplayer3/input.cpp +++ b/libeplayer3/input.cpp @@ -80,7 +80,7 @@ extern void dvbsub_write(AVSubtitle *, int64_t); extern void dvbsub_ass_write(AVCodecContext *c, AVSubtitle *sub, int pid); extern void dvbsub_ass_clear(void); // 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); static std::string lastlog_message; static unsigned int lastlog_repeats; @@ -253,11 +253,10 @@ bool Input::Play() } } } + } else if (_teletextTrack && (_teletextTrack->stream == stream)) { + if (packet.data && packet.size > 1) + teletext_write(_teletextTrack->pid, packet.data + 1, packet.size - 1); } -// else if (_teletextTrack && (_teletextTrack->stream == stream)) { -// if (packet.data && packet.size > 1) -// teletext_write(_teletextTrack->pid, packet.data + 1, packet.size - 1); -// } #if (LIBAVFORMAT_VERSION_MAJOR == 57 && LIBAVFORMAT_VERSION_MINOR == 25) av_packet_unref(&packet);