Browse Source

Try to change some dependencies folder structure

Jimmy 2 years ago
parent
commit
e18ff4d5ef

+ 15 - 1
fis/Utilities/FFMPEG/VideoFFmpegHelper.cs

@@ -36,7 +36,7 @@ namespace fis.Win.Dev.Utilities.FFMPEG
 
         public void ExportVideo(string path)
         {
-            FFmpegService.SetFFmpegPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SmartPublisher","ffmpeg.exe"));
+            FFmpegService.SetFFmpegPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ffmpeg","ffmpeg.exe"));
 #if DEBUG
             FFmpegService.SetFFmpegPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ffmpeg.exe"));
 #endif
@@ -193,5 +193,19 @@ namespace fis.Win.Dev.Utilities.FFMPEG
         {
             _vid.Dispose();
         }
+
+        public static void CopyDependenciese()
+        {
+            var dependicesList = new List<string>(){
+            "avcodec-58.dll",
+            "avdevice-58.dll",
+            "avfilter-7.dll",
+            "avformat-58.dll",
+            "avutil-56.dll",
+            "swresample-3.dll",
+            "swscale-5.dll",
+            };   
+
+        }
     }
 }

+ 5 - 1
fis/fis.Win.Dev.csproj

@@ -31,7 +31,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FFMpegWrapper">
-      <HintPath>..\third_party\SmartPublisher\FFMpegWrapper.dll</HintPath>
+      <HintPath>..\third_party\ffmpeg\FFMpegWrapper.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -52,8 +52,12 @@
   </ItemGroup>
   <Target Name="BuildAppWin" AfterTargets="AfterBuild">
 	  <Exec Command="xcopy $(ProjectDir)..\third_party\SmartPublisherDev\*.*  $(ProjectDir)bin\Debug\net6.0\*.* /Y" />
+	  <Exec Command="xcopy $(ProjectDir)..\third_party\ffmpeg\*.*  $(ProjectDir)bin\Debug\net6.0\*.* /Y" />
   </Target>
   <Target Name="PublishAppWin" AfterTargets="AfterPublish">
     <Exec Command="xcopy $(ProjectDir)..\third_party\SmartPublisher\*.*  $(ProjectDir)bin\Release\net6.0\win-x64\publish /Y" />
+	<Exec Command="xcopy $(ProjectDir)..\third_party\ffmpeg\*.*  $(ProjectDir)bin\Release\net6.0\win-x64\publish /Y" />
   </Target>
+  
+  
 </Project>

BIN
third_party/SmartPublisherDev/FFMpegWrapper.dll


BIN
third_party/SmartPublisherDev/ffmpeg.exe


+ 0 - 0
third_party/SmartPublisher/FFMpegWrapper.dll → third_party/ffmpeg/FFMpegWrapper.dll


BIN
third_party/ffmpeg/avcodec-58.dll


BIN
third_party/ffmpeg/avdevice-58.dll


BIN
third_party/ffmpeg/avfilter-7.dll


BIN
third_party/ffmpeg/avformat-58.dll


BIN
third_party/ffmpeg/avutil-56.dll


+ 0 - 0
third_party/SmartPublisher/ffmpeg.exe → third_party/ffmpeg/ffmpeg.exe


BIN
third_party/ffmpeg/postproc-55.dll


BIN
third_party/ffmpeg/swresample-3.dll


BIN
third_party/ffmpeg/swscale-5.dll