Request 6397 (accepted)

avidemux3.changes Changed

avidemux2-2.8.2.git20260407.tar.xz/avidemux/qt4/ADM_commonUI/DIA_prefs.cpp Changed

@@ -15,6 +15,7 @@
 #include "ADM_default.h"
 #include "config.h"
 #include "prefs.h"
+#include "ADM_Video.h"
 
 #include "ADM_pp.h"
 #include "ADM_qtx.h"
@@ -45,6 +46,9 @@
 #define HW_ACCELERATED_DECODING
 #endif
 
+static uint32_t idxSettingsToFlags(uint32_t set, uint32_t off);
+static uint32_t flagsToIdxSettings(uint32_t flag, uint32_t off);
+
 uint8_t DIA_Preferences(void);
 #define NOT_WAYLAND(call, var)                                                                                         \
     bool var;                                                                                                          \
@@ -201,6 +205,24 @@
     }
     ADM_info("Avisynth port: %d\n", defaultPortAvisynth);
 
+    // Indexing
+//#define INDEXING_PREFS_VERBOSE
+    uint32_t indexingFlags = ADM_IDX_FLAGS_DEFAULT;
+    if (!prefs->get(INDEXING_INDEXING_FLAGS, &indexingFlags))
+    {
+        indexingFlags = ADM_IDX_FLAGS_DEFAULT;
+    }
+#if 0
+    uint32_t idxPsFiles = flagsToIdxSettings(indexingFlags, ADM_IDX_FLAGS_OFFSET_MPEGPS);
+    uint32_t idxTsFiles = flagsToIdxSettings(indexingFlags, ADM_IDX_FLAGS_OFFSET_MPEGTS);
+#endif
+    uint32_t idxMkvFiles = flagsToIdxSettings(indexingFlags, ADM_IDX_FLAGS_OFFSET_MATROSKA);
+    uint32_t idxMp4Files = flagsToIdxSettings(indexingFlags, ADM_IDX_FLAGS_OFFSET_MP4);
+#ifdef INDEXING_PREFS_VERBOSE
+    ADM_info("Indexing flags: %" PRIu32" -> MPEG-PS: %" PRIu32" MPEG-TS: %" PRIu32" Matroska: %" PRIu32" MP4: %" PRIu32"\n",
+                indexingFlags, idxPsFiles, idxTsFiles, idxMkvFiles, idxMp4Files);
+#endif
+
     // HDR
     if (!prefs->get(HDR_TONEMAPPING, &toneMappingHDR))
         toneMappingHDR = 1;
@@ -465,6 +487,30 @@
     frameAvisynth.swallow(&togAskAvisynthPort);
     frameAvisynth.swallow(&uintDefaultPortAvisynth);
 
+    // Indexing
+    diaElemFrame frameIndexing(QT_TRANSLATE_NOOP("adm","Writing index to disk"));
+#define IDX_FORCE_MEM 0
+#define IDX_USE_SAVED 1
+#define IDX_WRITE_TO_DISK 2
+    diaMenuEntry indexingEntries = {
+        {IDX_FORCE_MEM, QT_TRANSLATE_NOOP("adm","Disabled"), NULL },
+        {IDX_USE_SAVED, QT_TRANSLATE_NOOP("adm","Read-only"), NULL },
+        {IDX_WRITE_TO_DISK, QT_TRANSLATE_NOOP("adm","Enabled"), NULL }
+    };
+#if 0
+    diaElemMenu menuIndexingPs(&idxPsFiles, QT_TRANSLATE_NOOP("adm","MPEG-PS files:"), NB_ITEMS(indexingEntries), indexingEntries);
+    diaElemMenu menuIndexingTs(&idxTsFiles, QT_TRANSLATE_NOOP("adm","MPEG-TS files:"), NB_ITEMS(indexingEntries), indexingEntries);
+#endif
+    diaElemMenu menuIndexingMkv(&idxMkvFiles, QT_TRANSLATE_NOOP("adm","Matroska files:"), NB_ITEMS(indexingEntries), indexingEntries);
+    diaElemMenu menuIndexingMp4(&idxMp4Files, QT_TRANSLATE_NOOP("adm","MP4 files:"), NB_ITEMS(indexingEntries), indexingEntries);
+
+#if 0
+    frameIndexing.swallow(&menuIndexingPs);
+    frameIndexing.swallow(&menuIndexingTs);
+#endif
+    frameIndexing.swallow(&menuIndexingMkv);
+    frameIndexing.swallow(&menuIndexingMp4);
+
     // Editor cache
     diaElemFrame frameCache(QT_TRANSLATE_NOOP("adm", "Caching of decoded pictures"));
     diaElemUInteger cacheSize(&editor_cache_size, QT_TRANSLATE_NOOP("adm", "_Cache size:"), 8, 16);
@@ -609,7 +655,7 @@
     /* Automation */
 
     /* Import */
-    diaElem *diaImport = {&frameMultiLoad, &framePics, &frameAvisynth};
+    diaElem *diaImport = {&frameMultiLoad, &framePics, &frameAvisynth, &frameIndexing};
     diaElemTabs tabImport(QT_TRANSLATE_NOOP("adm", "Import"), NB_ELEM(diaImport), diaImport);
 
     /* Output */
@@ -955,6 +1001,19 @@
         prefs->set(AVISYNTH_AVISYNTH_DEFAULTPORT, defaultPortAvisynth);
         prefs->set(AVISYNTH_AVISYNTH_ALWAYS_ASK, askPortAvisynth);
 
+        // Indexing
+        indexingFlags = 0;
+#if 0
+        indexingFlags += idxSettingsToFlags(idxPsFiles, ADM_IDX_FLAGS_OFFSET_MPEGPS);
+        indexingFlags += idxSettingsToFlags(idxTsFiles, ADM_IDX_FLAGS_OFFSET_MPEGTS);
+#endif
+        indexingFlags += idxSettingsToFlags(idxMkvFiles, ADM_IDX_FLAGS_OFFSET_MATROSKA);
+        indexingFlags += idxSettingsToFlags(idxMp4Files, ADM_IDX_FLAGS_OFFSET_MP4);
+#ifdef INDEXING_PREFS_VERBOSE
+        ADM_info("Setting indexing flags to %" PRIu32"\n", indexingFlags);
+#endif
+        prefs->set(INDEXING_INDEXING_FLAGS, indexingFlags);
+
         // HDR
         prefs->set(HDR_TONEMAPPING, toneMappingHDR);
         targetLumHDR = dTargetLumHDR;
@@ -1000,4 +1059,52 @@
 
     return dialogAccepted;
 }
+// Indexing helper funcs
+uint32_t idxSettingsToFlags(uint32_t val, uint32_t off)
+{
+    uint32_t flags = 0;
+    switch (off)
+    {
+        case ADM_IDX_FLAGS_OFFSET_MPEGPS:
+        case ADM_IDX_FLAGS_OFFSET_MPEGTS:
+        case ADM_IDX_FLAGS_OFFSET_MATROSKA:
+        case ADM_IDX_FLAGS_OFFSET_MP4:
+            break;
+        default:
+            return flags;
+    }
+    switch (val)
+    {
+        case IDX_FORCE_MEM:
+            flags |= ADM_IDX_FLAG_IGNORE_INDEX_FILE << off;
+            break;
+        case IDX_WRITE_TO_DISK:
+            flags |= ADM_IDX_FLAG_WRITE_INDEX_FILE << off;
+        case IDX_USE_SAVED:
+        default:
+            break;
+    }
+    return flags;
+}
+
+uint32_t flagsToIdxSettings(uint32_t flags, uint32_t off)
+{
+    switch (off)
+    {
+        case ADM_IDX_FLAGS_OFFSET_MPEGPS:
+        case ADM_IDX_FLAGS_OFFSET_MPEGTS:
+        case ADM_IDX_FLAGS_OFFSET_MATROSKA:
+        case ADM_IDX_FLAGS_OFFSET_MP4:
+            break;
+        default:
+            return IDX_WRITE_TO_DISK;
+    }
+    flags >>= off;
+    if (flags & ADM_IDX_FLAG_WRITE_INDEX_FILE)
+        return IDX_WRITE_TO_DISK;
+    if (flags & ADM_IDX_FLAG_IGNORE_INDEX_FILE)
+        return IDX_FORCE_MEM;
+
+    return IDX_USE_SAVED;
+}
 // EOF

avidemux2-2.8.2.git20260407.tar.xz/avidemux_core/ADM_coreDemuxer/include/ADM_Video.h Changed

avidemux2-2.8.2.git20260407.tar.xz/avidemux_core/ADM_coreUtils/include/prefs2_list.h Changed

avidemux2-2.8.2.git20260407.tar.xz/avidemux_core/ADM_coreUtils/src/prefs2.conf Changed

avidemux2-2.8.2.git20260407.tar.xz/avidemux_core/ADM_coreUtils/src/prefs2.h Changed

avidemux2-2.8.2.git20260407.tar.xz/avidemux_core/ADM_coreUtils/src/prefs2_desc.cpp Changed

avidemux2-2.8.2.git20260407.tar.xz/avidemux_core/ADM_coreUtils/src/prefs2_json.cpp Changed

avidemux2-2.8.2.git20260407.tar.xz/avidemux_core/ADM_coreUtils/src/prefs2_pref.h Changed

avidemux2-2.8.2.git20260407.tar.xz/avidemux_plugins/ADM_demuxers/Matroska/ADM_mkvIndexer.cpp Changed

@@ -26,6 +26,8 @@
 #include "ADM_videoInfoExtractor.h"
 #include "ADM_vidMisc.h"
 #include "ADM_metaToFile.h"
+#include "prefs.h"
+
 #define VIDEO _tracks0
 
 #if 0
@@ -763,15 +765,32 @@
     uint64_t pos;
     uint8_t res=1;
     bool indexOnDisk = true;
-    bool indexAllowOverwrite = false;
+    bool indexAllowOverwrite = true;
+    bool memOnly = false;
+
+    uint32_t indexingFlags = 0;
+    if (prefs->get(INDEXING_INDEXING_FLAGS, &indexingFlags))
+    {
+        indexingFlags >>= ADM_IDX_FLAGS_OFFSET_MATROSKA;
+        if (!(indexingFlags & ADM_IDX_FLAG_WRITE_INDEX_FILE))
+        {
+            indexOnDisk = false;
+        }
+        if (indexingFlags & ADM_IDX_FLAG_IGNORE_INDEX_FILE)
+        {
+            indexOnDisk = false;
+            memOnly = true;
+            ADM_info("Mem-only indexing.\n");
+        }
+    }
 
     if (NULL != getenv("ADM_NOINDEX_MKV") && !strncmp(getenv("ADM_NOINDEX_MKV"), "1", 1))
         indexOnDisk = false;
 
-    if (indexOnDisk)
+    if (!memOnly)
     {
-        if (NULL != getenv("ADM_MKV_INDEX_ALLOW_OVERWRITE") && !strncmp(getenv("ADM_MKV_INDEX_ALLOW_OVERWRITE"), "1", 1))
-            indexAllowOverwrite = true;
+        if (NULL != getenv("ADM_MKV_INDEX_ALLOW_OVERWRITE") && !strncmp(getenv("ADM_MKV_INDEX_ALLOW_OVERWRITE"), "0", 1))
+            indexAllowOverwrite = false;
         if (loadIndex(_idxName, parser->getFileSize()))
         {
             printf("MKV Video track indexing loaded from \"%s\"\n", _idxName.c_str());

avidemux2-2.8.2.git20260407.tar.xz/avidemux_plugins/ADM_demuxers/Mp4/ADM_mp4.cpp Changed

@@ -74,6 +74,8 @@
 #include "ADM_dcainfo.h"
 #include "ADM_audioXiphUtils.h"
 
+#include "prefs.h"
+
 #if 1
 #define aprintf(...) {}
 #else
@@ -383,15 +385,32 @@
         _idxName = name;
         _idxName += ".idxb";
         bool indexOnDisk = true;
-        bool indexAllowOverwrite = false;
+        bool indexAllowOverwrite = true;
+        bool memOnly = false;
+
+        uint32_t indexingFlags = 0;
+        if (prefs->get(INDEXING_INDEXING_FLAGS, &indexingFlags))
+        {
+            indexingFlags >>= ADM_IDX_FLAGS_OFFSET_MP4;
+            if (!(indexingFlags & ADM_IDX_FLAG_WRITE_INDEX_FILE))
+            {
+                indexOnDisk = false;
+            }
+            if (indexingFlags & ADM_IDX_FLAG_IGNORE_INDEX_FILE)
+            {
+                indexOnDisk = false;
+                memOnly = true;
+                ADM_info("Mem-only indexing.\n");
+            }
+        }
 
         if (NULL != getenv("ADM_NOINDEX_MP4") && !strncmp(getenv("ADM_NOINDEX_MP4"), "1", 1))
             indexOnDisk = false;
 
         if (indexOnDisk)
         {
-            if (NULL != getenv("ADM_MP4_INDEX_ALLOW_OVERWRITE") && !strncmp(getenv("ADM_MP4_INDEX_ALLOW_OVERWRITE"), "1", 1))
-                indexAllowOverwrite = true;
+            if (NULL != getenv("ADM_MP4_INDEX_ALLOW_OVERWRITE") && !strncmp(getenv("ADM_MP4_INDEX_ALLOW_OVERWRITE"), "0", 1))
+                indexAllowOverwrite = false;
         }
         
 #define CLR(x)              memset(& x,0,sizeof(  x));
@@ -524,7 +543,7 @@
             if(extractSPSInfo_mp4Header(VDEO.extraData,VDEO.extraDataSize,&info))
             {
                 bool indexLoadedFromDisk = false;
-                if (indexOnDisk)
+                if (!memOnly)
                 {
                     if (loadIndex(_idxName, fileSize))
                     {
@@ -670,7 +689,7 @@
                     _video_bih.biHeight = _mainaviheader.dwHeight = info.height;
                 }
                 bool indexLoadedFromDisk = false;
-                if (indexOnDisk)
+                if (!memOnly)
                 {
                     if (loadIndex(_idxName, fileSize))
                     {

Overview

Request 6397 (accepted)

Request History