From ef5fe487f3fc3c1867089e1c56690f5ec745210b Mon Sep 17 00:00:00 2001 From: eumagga0x2a Date: Wed, 20 Mar 2019 22:41:04 +0100 Subject: [PATCH] [coreDemuxerMpeg/coreUtils] Increase tolerance for detection of sequenced files to 8 MiB from 1 GiB fragment size on, this is probably the upper limit --- avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp | 2 ++ avidemux_core/ADM_coreUtils/src/avidemutils.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp b/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp index 1241ae2f82..df83498470 100644 --- a/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp +++ b/avidemux_core/ADM_coreDemuxerMpeg/src/dmx_io.cpp @@ -188,6 +188,8 @@ uint8_t fileParser::open( const char *filename,FP_TYPE *multi ) if(myFd.fileSize >= threshold-tolerance && myFd.fileSize <= threshold+tolerance) break; threshold<<=1; + if(i==1) + tolerance<<=3; // 8 MiB starting with 1 GiB fragment size } } count++; diff --git a/avidemux_core/ADM_coreUtils/src/avidemutils.cpp b/avidemux_core/ADM_coreUtils/src/avidemutils.cpp index ce861cf973..b85671e713 100644 --- a/avidemux_core/ADM_coreUtils/src/avidemutils.cpp +++ b/avidemux_core/ADM_coreUtils/src/avidemutils.cpp @@ -510,6 +510,8 @@ bool ADM_probeSequencedFile(const char *fileName) break; } threshold<<=1; + if(i==1) + tolerance<<=3; // 8 MiB starting with 1 GiB fragment size } if(!success) return false;