From 4ad4310903763694c857d6003c48ff8f4b1bb755 Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 31 Aug 2014 12:36:22 +0200 Subject: [PATCH 1/2] libeplayer3/manager: use AVDISCARD_NONE instead of AVDISCARD_DEFAULT to disable programs Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/04fb4c9adddf25d0631fba8541d59dd812017290 Author: martii Date: 2014-08-31 (Sun, 31 Aug 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/input.cpp | 2 +- libeplayer3/manager.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libeplayer3/input.cpp b/libeplayer3/input.cpp index 52085a0..8f42bc8 100644 --- a/libeplayer3/input.cpp +++ b/libeplayer3/input.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#define ENABLE_LOGGING 1 +#define ENABLE_LOGGING 0 #include #include diff --git a/libeplayer3/manager.cpp b/libeplayer3/manager.cpp index 9dc1d38..da39024 100644 --- a/libeplayer3/manager.cpp +++ b/libeplayer3/manager.cpp @@ -201,7 +201,7 @@ bool Manager::selectProgram(const int id) if (it->second->hidden || it->second->inactive) { it->second->stream->discard = AVDISCARD_ALL; } else { - it->second->stream->discard = AVDISCARD_DEFAULT; + it->second->stream->discard = AVDISCARD_NONE; player->input.SwitchAudio(it->second); } @@ -209,7 +209,7 @@ bool Manager::selectProgram(const int id) if (it->second->hidden || it->second->inactive) { it->second->stream->discard = AVDISCARD_ALL; } else { - it->second->stream->discard = AVDISCARD_DEFAULT; + it->second->stream->discard = AVDISCARD_NONE; player->input.SwitchVideo(it->second); } @@ -217,7 +217,7 @@ bool Manager::selectProgram(const int id) if (it->second->hidden || it->second->inactive) { it->second->stream->discard = AVDISCARD_ALL; } else { - it->second->stream->discard = AVDISCARD_DEFAULT; + it->second->stream->discard = AVDISCARD_NONE; player->input.SwitchSubtitle(it->second); } @@ -225,7 +225,7 @@ bool Manager::selectProgram(const int id) if (it->second->hidden || it->second->inactive) { it->second->stream->discard = AVDISCARD_ALL; } else { - it->second->stream->discard = AVDISCARD_DEFAULT; + it->second->stream->discard = AVDISCARD_NONE; player->input.SwitchTeletext(it->second); } From dcffc093717d741efb5dbe58ede24bda6017a814 Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 31 Aug 2014 14:28:20 +0200 Subject: [PATCH 2/2] libspark/playback_libeplayer3: fix multi-program handling Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/a8499a543b39346094f4d7d2c712062769935263 Author: martii Date: 2014-08-31 (Sun, 31 Aug 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/playback_libeplayer3.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp index f4fa9f9..1c3399d 100644 --- a/libspark/playback_libeplayer3.cpp +++ b/libspark/playback_libeplayer3.cpp @@ -82,7 +82,9 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in } else { std::vector keys, values; int selected_program = 0; - if (!vpid && !apid && GetPrograms(keys, values) && (keys.size() > 1) && ProgramSelectionCallback) { + if (vpid || apid) { + ; + } else if (GetPrograms(keys, values) && (keys.size() > 1) && ProgramSelectionCallback) { const char *key = ProgramSelectionCallback(ProgramSelectionCallbackData, keys, values); if (!key) { player->Close();