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

libeplayer3/playback_libeplayer3: change noprobe handling

Browse Source
This commit is contained in:
martii
2013-03-18 18:49:00 +01:00
parent f5c97eaf88
commit 5548017dc7
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libeplayer3/container/container_ffmpeg.c
View File

@@ -1604,10 +1604,8 @@ int container_ffmpeg_init(Context_t *context, char * filename)
} }
avContext->flags = AVFMT_FLAG_GENPTS; avContext->flags = AVFMT_FLAG_GENPTS;
#ifndef MARTII // I'm currently taking the DVB subtitle info from the stream. Need to probe.
if (context->playback->noprobe) if (context->playback->noprobe)
avContext->max_analyze_duration = 1; avContext->max_analyze_duration = 1;
#endif
ffmpeg_printf(20, "find_streaminfo\n"); ffmpeg_printf(20, "find_streaminfo\n");

8
libspark/playback_libeplayer3.cpp
View File

@@ -106,7 +106,11 @@ void cPlayback::Close(void)
} }
//Used by Fileplay //Used by Fileplay
#ifdef MARTII
bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int, bool no_probe)
#else
bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int) bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, int ac3, unsigned int)
#endif
{ {
bool ret = false; bool ret = false;
bool isHTTP = false; bool isHTTP = false;
@@ -150,7 +154,11 @@ bool cPlayback::Start(char *filename, unsigned short vpid, int vtype, unsigned s
printf("upnp://\n"); printf("upnp://\n");
isHTTP = true; isHTTP = true;
} }
#ifdef MARTII
else if (pm == PLAYMODE_TS && no_probe)
#else
else if (pm == PLAYMODE_TS) else if (pm == PLAYMODE_TS)
#endif
strcat(file, "myts://"); strcat(file, "myts://");
else else
strcat(file, "file://"); strcat(file, "file://");

4
libspark/playback_libeplayer3.h
View File

@@ -33,7 +33,11 @@ class cPlayback
bool Open(playmode_t PlayMode); bool Open(playmode_t PlayMode);
void Close(void); void Close(void);
bool Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, bool Start(char *filename, unsigned short vpid, int vtype, unsigned short apid,
#ifdef MARTII
int ac3, unsigned int duration, bool no_probe = true);
#else
int ac3, unsigned int duration); int ac3, unsigned int duration);
#endif
bool SetAPid(unsigned short pid, bool ac3); bool SetAPid(unsigned short pid, bool ac3);
#ifdef MARTII #ifdef MARTII
bool SetSubtitlePid(unsigned short pid); bool SetSubtitlePid(unsigned short pid);