Combine some more files

Make all files lowercase
vapoursynth · Mar 21, 2024 · 8c97f63 · 8c97f63
1 parent ba02ed2
commit 8c97f63
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 84 deletions.
diff --git a/meson.build b/meson.build
@@ -12,8 +12,7 @@ link_static = get_option('link_static')
 
 sources = [
     'src/audiosource.cpp',
-    'src/BSRational.cpp',
-    'src/BSShared.cpp',
+    'src/bsshared.cpp',
     'src/vapoursynth.cpp',
     'src/videosource.cpp'
 ]

diff --git a/msvc/BestSource.vcxproj b/msvc/BestSource.vcxproj
@@ -22,8 +22,7 @@
     <ClCompile Include="..\libp2p\p2p_api.cpp" />
     <ClCompile Include="..\libp2p\v210.cpp" />
     <ClCompile Include="..\src\audiosource.cpp" />
-    <ClCompile Include="..\src\BSRational.cpp" />
-    <ClCompile Include="..\src\BSShared.cpp" />
+    <ClCompile Include="..\src\bsshared.cpp" />
     <ClCompile Include="..\src\vapoursynth.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
@@ -34,8 +33,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\audiosource.h" />
-    <ClInclude Include="..\src\BSRational.h" />
-    <ClInclude Include="..\src\BSShared.h" />
+    <ClInclude Include="..\src\bsshared.h" />
     <ClInclude Include="..\src\version.h" />
     <ClInclude Include="..\src\videosource.h" />
   </ItemGroup>

diff --git a/msvc/BestSource.vcxproj.filters b/msvc/BestSource.vcxproj.filters
@@ -27,30 +27,24 @@
     <ClCompile Include="..\libp2p\v210.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\BSRational.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\audiosource.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\BSShared.cpp">
+    <ClCompile Include="..\src\bsshared.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\videosource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\BSRational.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\audiosource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\BSShared.h">
+    <ClInclude Include="..\src\bsshared.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/src/BSShared.cpp b/src/BSShared.cpp
diff --git a/src/BSShared.h b/src/BSShared.h
diff --git a/src/BSRational.cpp → src/bsshared.cpp b/src/BSRational.cpp → src/bsshared.cpp
@@ -19,9 +19,10 @@
 //  THE SOFTWARE.
 
 
-#include "BSRational.h"
+#include "bsshared.h"
 
 extern "C" {
+#include <libavutil/log.h>
 #include <libavutil/rational.h>
 }
 
@@ -33,3 +34,13 @@ BSRational::BSRational(const AVRational &r) {
 double BSRational::ToDouble() const {
     return Num / (double)Den;
 }
+
+
+int SetFFmpegLogLevel(int Level) {
+    av_log_set_level(Level);
+    return GetFFmpegLogLevel();
+}
+
+int GetFFmpegLogLevel() {
+    return av_log_get_level();
+}
diff --git a/src/BSRational.h → src/bsshared.h b/src/BSRational.h → src/bsshared.h
@@ -18,8 +18,8 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //  THE SOFTWARE.
 
-#ifndef BSRATIONAL_H
-#define BSRATIONAL_H
+#ifndef BSSHARED_H
+#define BSSHARED_H
 
 struct AVRational;
 
@@ -31,4 +31,7 @@ struct BSRational {
     double ToDouble() const;
 };
 
+int SetFFmpegLogLevel(int Level);
+int GetFFmpegLogLevel();
+
 #endif
diff --git a/src/vapoursynth.cpp b/src/vapoursynth.cpp
@@ -20,7 +20,7 @@
 
 #include "videosource.h"
 #include "audiosource.h"
-#include "BSShared.h"
+#include "bsshared.h"
 #include "version.h"
 #include <VapourSynth4.h>
 #include <VSHelper4.h>

diff --git a/src/videosource.cpp b/src/videosource.cpp
@@ -1320,16 +1320,19 @@ namespace std {
 
 typedef std::unique_ptr<FILE> file_ptr_t;
 
-static file_ptr_t OpenCacheFile(const std::string &CachePath, int Track, bool Write) {
-    std::string FullPath = CachePath + "." + std::to_string(Track) + ".bsindex";
+static file_ptr_t OpenFile(const std::string &Filename, bool Write) {
 #ifdef _WIN32
-    file_ptr_t F(_wfopen(Utf16FromUtf8(FullPath).c_str(), Write ? L"wb" : L"rb"));
+    file_ptr_t F(_wfopen(Utf16FromUtf8(Filename).c_str(), Write ? L"wb" : L"rb"));
 #else
     file_ptr_t F(fopen(FullPath.c_str(), Write ? "wb" : "rb"));
 #endif
     return F;
 }
 
+static file_ptr_t OpenCacheFile(const std::string &CachePath, int Track, bool Write) {
+    return OpenFile(CachePath + "." + std::to_string(Track) + ".bsindex", Write);
+}
+
 static void WriteInt(file_ptr_t &F, int Value) {
     fwrite(&Value, 1, sizeof(Value), F.get());
 }
@@ -1458,3 +1461,13 @@ bool BestVideoSource::ReadVideoTrackIndex(const std::string &CachePath, int Trac
 
     return true;
 }
+
+bool BestVideoSource::WriteTimecodes(const std::string &TimecodeFile) const {
+    file_ptr_t F(OpenFile(TimecodeFile, true));
+    if (!F)
+        return false;
+
+    fprintf(F.get(), "# timecode format v2\n");
+    for (const auto &Iter : TrackIndex.Frames)
+        fprintf(F.get(), "%.02f\n", (Iter.PTS * VP.TimeBase.Num) / (double)VP.TimeBase.Den);
+}
diff --git a/src/videosource.h b/src/videosource.h
@@ -21,7 +21,7 @@
 #ifndef VIDEOSOURCE_H
 #define VIDEOSOURCE_H
 
-#include "BSRational.h"
+#include "bsshared.h"
 #include <cstdint>
 #include <stdexcept>
 #include <list>
@@ -264,6 +264,7 @@ class BestVideoSource {
     [[nodiscard]] BestVideoFrame *GetFrame(int64_t N, bool Linear = false);
     [[nodiscard]] BestVideoFrame *GetFrameWithRFF(int64_t N, bool Linear = false);
     [[nodiscard]] BestVideoFrame *GetFrameByTime(double Time, bool Linear = false);
+    bool WriteTimecodes(const std::string &TimecodeFile) const;
 };
 
 #endif