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

libspark/playback: fix hds streams by selecting a program

Browse Source 
right now there is no way to specify which program to play,
just the first one is selected
This commit is contained in:
Stefan Seyfried
2015-02-20 09:34:36 +01:00
parent e878f5f751
commit 2bb5b8e8a9
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libspark/playback_libeplayer3.cpp
View File

@@ -135,11 +135,11 @@ bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned s
videoDecoder->vdec->Stop(false); videoDecoder->vdec->Stop(false);
adec->Stop(); adec->Stop();
} else { } else {
#if 0
std::vector<std::string> keys, values; std::vector<std::string> keys, values;
int selected_program = 0; int selected_program = 0;
if (vpid || apid) { if (vpid || apid) {
; ;
#if 0
} else if (player->GetPrograms(keys, values) && (keys.size() > 1) && ProgramSelectionCallback) { } else if (player->GetPrograms(keys, values) && (keys.size() > 1) && ProgramSelectionCallback) {
const char *key = ProgramSelectionCallback(ProgramSelectionCallbackData, keys, values); const char *key = ProgramSelectionCallback(ProgramSelectionCallbackData, keys, values);
if (!key) { if (!key) {
@@ -149,18 +149,20 @@ bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned s
selected_program = atoi(key); selected_program = atoi(key);
} else if (keys.size() > 0) } else if (keys.size() > 0)
selected_program = atoi(keys[0].c_str()); selected_program = atoi(keys[0].c_str());
#else
if (!keys.size() || !player->SelectProgram(selected_program)) { } else {
if (apid) player->GetPrograms(keys, values);
SetAPid(apid); if (keys.size() > 0)
if (vpid) selected_program = atoi(keys[0].c_str());
SetVPid(vpid);
} }
#endif #endif
if (!keys.size() || !player->SelectProgram(selected_program)) {
if (apid) if (apid)
player->SwitchAudio(apid); player->SwitchAudio(apid);
if (vpid) if (vpid)
player->SwitchVideo(vpid); player->SwitchVideo(vpid);
}
pd->playing = true; pd->playing = true;
player->output.Open(); player->output.Open();
ret = player->Play(); ret = player->Play();