diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c index 820f9bc..08d0c2e 100644 --- a/libeplayer3/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -807,8 +807,9 @@ int container_ffmpeg_init(Context_t * context, char *filename) avContext->iformat->flags |= AVFMT_SEEK_TO_PTS; avContext->flags = AVFMT_FLAG_GENPTS; if (context->playback->noprobe) { - ffmpeg_printf(10, "noprobe\n"); + ffmpeg_printf(5, "noprobe\n"); avContext->max_analyze_duration = 1; + avContext->probesize = 8192; } ffmpeg_printf(20, "find_streaminfo\n"); diff --git a/libeplayer3/include/output.h b/libeplayer3/include/output.h index dd38b84..92b4c70 100644 --- a/libeplayer3/include/output.h +++ b/libeplayer3/include/output.h @@ -60,8 +60,6 @@ typedef struct OutputHandler_s { char *Name; Output_t *audio; Output_t *video; - Output_t *subtitle; - Output_t *teletext; int (*Command) ( /*Context_t */ void *, OutputCmd_t, void *); } OutputHandler_t; diff --git a/libeplayer3/include/playback.h b/libeplayer3/include/playback.h index 8af3179..fd14962 100644 --- a/libeplayer3/include/playback.h +++ b/libeplayer3/include/playback.h @@ -34,7 +34,6 @@ typedef struct PlaybackHandler_s { unsigned char isAudio; unsigned char isSubtitle; unsigned char isDvbSubtitle; - unsigned char isTeletext; unsigned char abortRequested; unsigned char abortPlayback; diff --git a/libeplayer3/manager/teletext.c b/libeplayer3/manager/teletext.c index a7fae7b..4e3d8cb 100644 --- a/libeplayer3/manager/teletext.c +++ b/libeplayer3/manager/teletext.c @@ -77,7 +77,7 @@ static int CurrentTrack = -1; /* Functions */ /* ***************************** */ -static int ManagerAdd(Context_t * context, Track_t track) +static int ManagerAdd(Context_t * context __attribute__((unused)), Track_t track) { teletext_mgr_printf(10, "%s::%s name=\"%s\" encoding=\"%s\" id=%d\n", @@ -113,9 +113,6 @@ static int ManagerAdd(Context_t * context, Track_t track) return cERR_TELETEXT_MGR_ERROR; } - if (TrackCount > 0) - context->playback->isTeletext = 1; - teletext_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__); return cERR_TELETEXT_MGR_NO_ERROR; @@ -156,7 +153,7 @@ static char **ManagerList(Context_t * context __attribute__ ((unused))) return tracklist; } -static int ManagerDel(Context_t * context) +static int ManagerDel(Context_t * context __attribute__((unused))) { int i = 0; @@ -177,7 +174,6 @@ static int ManagerDel(Context_t * context) TrackCount = 0; CurrentTrack = -1; - context->playback->isTeletext = 0; teletext_mgr_printf(10, "%s::%s return no error\n", FILENAME, __FUNCTION__); diff --git a/libeplayer3/output/output.c b/libeplayer3/output/output.c index 253761f..0380024 100644 --- a/libeplayer3/output/output.c +++ b/libeplayer3/output/output.c @@ -124,8 +124,6 @@ static void OutputDel(Context_t * context, char *port) context->output->audio = NULL; else if (!strcmp("video", port)) context->output->video = NULL; - else if (!strcmp("teletext", port)) - context->output->teletext = NULL; } @@ -141,20 +139,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_OPEN:{ if (context && context->playback) { if (context->playback->isVideo) - ret |= - context->output->video->Command(context, - OUTPUT_OPEN, - "video"); + ret |= context->output->video->Command(context, OUTPUT_OPEN, "video"); if (context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_OPEN, - "audio"); - if (context->playback->isTeletext) - ret |= - context->output->teletext->Command(context, - command, - "teletext"); + ret |= context->output->audio->Command(context, OUTPUT_OPEN, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -162,20 +149,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_CLOSE:{ if (context && context->playback) { if (context->playback->isVideo) - ret |= - context->output->video->Command(context, - OUTPUT_CLOSE, - "video"); + ret |= context->output->video->Command(context, OUTPUT_CLOSE, "video"); if (context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_CLOSE, - "audio"); - if (context->playback->isTeletext) - ret |= - context->output->teletext->Command(context, - command, - "teletext"); + ret |= context->output->audio->Command(context, OUTPUT_CLOSE, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -195,23 +171,11 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_PLAY:{ // 4 if (context && context->playback) { if (context->playback->isVideo) - ret = - context->output->video->Command(context, - OUTPUT_PLAY, - "video"); + ret = context->output->video->Command(context, OUTPUT_PLAY, "video"); if (!ret) { // success or not executed, dunn care if (context->playback->isAudio) - ret = - context->output->audio->Command(context, - OUTPUT_PLAY, - "audio"); - - if (context->playback->isTeletext) - ret |= - context->output->teletext->Command(context, - command, - "teletext"); + ret = context->output->audio->Command(context, OUTPUT_PLAY, "audio"); } } else ret = cERR_OUTPUT_INTERNAL_ERROR; @@ -221,19 +185,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) if (context && context->playback) { if (context->playback->isVideo) ret |= - context->output->video->Command(context, - OUTPUT_STOP, - "video"); + context->output->video->Command(context, OUTPUT_STOP, "video"); if (context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_STOP, - "audio"); - if (context->playback->isTeletext) - ret |= - context->output->teletext->Command(context, - command, - "teletext"); + ret |= context->output->audio->Command(context, OUTPUT_STOP, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -241,15 +195,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_FLUSH:{ if (context && context->playback) { if (context->playback->isVideo) - ret |= - context->output->video->Command(context, - OUTPUT_FLUSH, - "video"); + ret |= context->output->video->Command(context, OUTPUT_FLUSH, "video"); if (context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_FLUSH, - "audio"); + ret |= context->output->audio->Command(context, OUTPUT_FLUSH, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -257,15 +205,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_PAUSE:{ if (context && context->playback) { if (context->playback->isVideo) - ret |= - context->output->video->Command(context, - OUTPUT_PAUSE, - "video"); + ret |= context->output->video->Command(context, OUTPUT_PAUSE, "video"); if (context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_PAUSE, - "audio"); + ret |= context->output->audio->Command(context, OUTPUT_PAUSE, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -273,15 +215,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_FASTFORWARD:{ if (context && context->playback) { if (context->playback->isVideo) - ret |= - context->output->video->Command(context, - OUTPUT_FASTFORWARD, - "video"); + ret |= context->output->video->Command(context, OUTPUT_FASTFORWARD, "video"); if (context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_FASTFORWARD, - "audio"); + ret |= context->output->audio->Command(context, OUTPUT_FASTFORWARD, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -289,15 +225,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_REVERSE:{ if (context && context->playback) { if (context->playback->isVideo) - ret |= - context->output->video->Command(context, - OUTPUT_REVERSE, - "video"); + ret |= context->output->video->Command(context, OUTPUT_REVERSE, "video"); if (context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_REVERSE, - "audio"); + ret |= context->output->audio->Command(context, OUTPUT_REVERSE, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -305,32 +235,17 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_CONTINUE:{ if (context && context->playback) { if (context->playback->isVideo) - ret |= - context->output->video->Command(context, - OUTPUT_CONTINUE, - "video"); + ret |= context->output->video->Command(context, OUTPUT_CONTINUE, "video"); if (context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_CONTINUE, - "audio"); - if (context->playback->isTeletext) - ret |= - context->output->teletext->Command(context, - command, - "teletext"); + ret |= context->output->audio->Command(context, OUTPUT_CONTINUE, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; } case OUTPUT_AVSYNC:{ if (context && context->playback) { - if (context->playback->isVideo - && context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_AVSYNC, - "audio"); + if (context->playback->isVideo && context->playback->isAudio) + ret |= context->output->audio->Command(context, OUTPUT_AVSYNC, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -339,21 +254,10 @@ static int Command(void *_context, OutputCmd_t command, void *argument) if (context && context->playback) { if (context->playback->isVideo && (argument == NULL || *(char *) argument == 'v')) - ret |= - context->output->video->Command(context, - OUTPUT_CLEAR, - "video"); + ret |= context->output->video->Command(context, OUTPUT_CLEAR, "video"); if (context->playback->isAudio && (argument == NULL || *(char *) argument == 'a')) - ret |= - context->output->audio->Command(context, - OUTPUT_CLEAR, - "audio"); - if (context->playback->isTeletext) - ret |= - context->output->teletext->Command(context, - command, - "teletext"); + ret |= context->output->audio->Command(context, OUTPUT_CLEAR, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -361,13 +265,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_PTS:{ if (context && context->playback) { if (context->playback->isVideo) - return context->output->video->Command(context, - OUTPUT_PTS, - argument); + return context->output->video->Command(context, OUTPUT_PTS, argument); if (context->playback->isAudio) - return context->output->audio->Command(context, - OUTPUT_PTS, - argument); + return context->output->audio->Command(context, OUTPUT_PTS, argument); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -375,18 +275,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_SWITCH:{ if (context && context->playback) { if (context->playback->isAudio) - return context->output->audio->Command(context, - OUTPUT_SWITCH, - "audio"); + return context->output->audio->Command(context, OUTPUT_SWITCH, "audio"); if (context->playback->isVideo) - return context->output->video->Command(context, - OUTPUT_SWITCH, - "video"); - if (context->playback->isTeletext) - ret |= - context->output->teletext->Command(context, - command, - "teletext"); + return context->output->video->Command(context, OUTPUT_SWITCH, "video"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -395,14 +286,10 @@ static int Command(void *_context, OutputCmd_t command, void *argument) if (context && context->playback) { if (context->playback->isVideo) ret |= - context->output->video->Command(context, - OUTPUT_SLOWMOTION, - "video"); + context->output->video->Command(context, OUTPUT_SLOWMOTION, "video"); if (context->playback->isAudio) ret |= - context->output->audio->Command(context, - OUTPUT_SLOWMOTION, - "audio"); + context->output->audio->Command(context, OUTPUT_SLOWMOTION, "audio"); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -410,10 +297,7 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_AUDIOMUTE:{ if (context && context->playback) { if (context->playback->isAudio) - ret |= - context->output->audio->Command(context, - OUTPUT_AUDIOMUTE, - (char *) argument); + ret |= context->output->audio->Command(context, OUTPUT_AUDIOMUTE, (char *) argument); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -421,10 +305,7 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_DISCONTINUITY_REVERSE:{ if (context && context->playback) { if (context->playback->isVideo) - ret |= - context->output->video->Command(context, - OUTPUT_DISCONTINUITY_REVERSE, - (void *) argument); + ret |= context->output->video->Command(context, OUTPUT_DISCONTINUITY_REVERSE, (void *) argument); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -432,13 +313,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument) case OUTPUT_GET_FRAME_COUNT:{ if (context && context->playback) { if (context->playback->isVideo) - return context->output->video->Command(context, - OUTPUT_GET_FRAME_COUNT, - argument); + return context->output->video->Command(context, OUTPUT_GET_FRAME_COUNT, argument); if (context->playback->isAudio) - return context->output->audio->Command(context, - OUTPUT_GET_FRAME_COUNT, - argument); + return context->output->audio->Command(context, OUTPUT_GET_FRAME_COUNT, argument); } else ret = cERR_OUTPUT_INTERNAL_ERROR; break; @@ -460,7 +337,5 @@ OutputHandler_t OutputHandler = { "Output", NULL, NULL, - NULL, - NULL, // teletext &Command }; diff --git a/libeplayer3/playback/playback.c b/libeplayer3/playback/playback.c index 411deeb..edf91ab 100644 --- a/libeplayer3/playback/playback.c +++ b/libeplayer3/playback/playback.c @@ -870,7 +870,6 @@ PlaybackHandler_t PlaybackHandler = { 0, 0, 0, - 0, &Command, "", 0, diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp index b018cbb..3ebdedb 100644 --- a/libspark/playback_libeplayer3.cpp +++ b/libspark/playback_libeplayer3.cpp @@ -92,8 +92,8 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, un bool ret = false; bool isHTTP = false; - printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d\n", - FILENAME, __FUNCTION__, filename, vpid, vtype, apid, ac3); + printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d, no_probe=%d\n", + FILENAME, __FUNCTION__, filename, vpid, vtype, apid, ac3, no_probe); init_jump = -1; //create playback path @@ -108,7 +108,7 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, un if(strstr(filename, "://")) isHTTP = true; - else if (pm == PLAYMODE_TS && no_probe) + else if (no_probe) strcat(file, "myts://"); else strcat(file, "file://");