From 01cf4946063245a79e85c33ebd8ce61c5b081c3f Mon Sep 17 00:00:00 2001 From: TangoCash Date: Tue, 6 Sep 2022 14:07:09 +0200 Subject: [PATCH] dont use avformat_find_stream_info, if noprobe is requested Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c90e05a8f0eabf8c74ec9a1a39a70f439e1b5a01 Author: TangoCash Date: 2022-09-06 (Tue, 06 Sep 2022) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/playback_libeplayer3.cpp | 2 +- libeplayer3/container/container_ffmpeg.c | 12 +++++++----- libeplayer3/playback/playback.c | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libarmbox/playback_libeplayer3.cpp b/libarmbox/playback_libeplayer3.cpp index a4f4a0c..3432924 100644 --- a/libarmbox/playback_libeplayer3.cpp +++ b/libarmbox/playback_libeplayer3.cpp @@ -124,7 +124,7 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in file = "file://"; file += filename; - if ((file.find(":31339/id=") != std::string::npos) || (file.find(":10000") != std::string::npos) || (file.find(":8001/") != std::string::npos)) // for LocalTV and Entertain-TV streaming + if ((file.find(":31339/id=") != std::string::npos) || (file.find(":17999/1:") != std::string::npos) || (file.find(":10000") != std::string::npos) || (file.find(":8001/") != std::string::npos)) // for LocalTV and Entertain-TV streaming no_probe = true; if (file.substr(0, 7) == "file://") diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c index 149e5fd..bd71ac5 100644 --- a/libeplayer3/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -1845,13 +1845,15 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin wrapped_set_max_analyze_duration(avContextTab[AVIdx], 1); } - ffmpeg_printf(20, "find_streaminfo\n"); - - if (avformat_find_stream_info(avContextTab[AVIdx], NULL) < 0) + if (!context->playback->noprobe) { - ffmpeg_err("Error avformat_find_stream_info\n"); - } + ffmpeg_printf(20, "find_streaminfo\n"); + if (avformat_find_stream_info(avContextTab[AVIdx], NULL) < 0) + { + ffmpeg_err("Error avformat_find_stream_info\n"); + } + } //for buffered io if (avContextTab[AVIdx] != NULL && avContextTab[AVIdx]->pb != NULL && !context->playback->isTSLiveMode) { diff --git a/libeplayer3/playback/playback.c b/libeplayer3/playback/playback.c index d0b89e1..b4ee075 100644 --- a/libeplayer3/playback/playback.c +++ b/libeplayer3/playback/playback.c @@ -200,7 +200,7 @@ static int PlaybackOpen(Context_t *context, PlayFiles_t *pFiles) context->playback->uri = tUri; } - if (strstr(uri, ":10000") || strstr(uri, ":31339/id=")) + if (strstr(uri, ":10000") || strstr(uri, ":31339/id=") || strstr(uri, ":17999/1:") || strstr(uri, ":8001/")) { context->playback->noprobe = 1; }