No need to extract video when 0x47 appears in the first 4B of m2ts file

The underlying issue is already fixed by AkarinVS/L-SMASH-Works#6. This reverts commit 73fb4f7. Signed-off-by: akarin <i@akarin.info>
AmusementClub · Oct 22, 2022 · 8d59ecd · 8d59ecd
1 parent 0e1e4f5
commit 8d59ecd
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 84 deletions.
diff --git a/OKEGui/OKEGui/JobProcessor/Demuxer/EACDemuxer.cs b/OKEGui/OKEGui/JobProcessor/Demuxer/EACDemuxer.cs
@@ -56,7 +56,6 @@ public EacOutputTrackType(TrackCodec codec, string rawOutput, string extension,
         private List<AudioInfo> JobAudio;
         private List<Info> JobSub;
         private int length;
-        private bool extractVideo;
         private string WorkingPathPrefix;
 
         private static List<EacOutputTrackType> s_eacOutputs = new List<EacOutputTrackType> {
@@ -93,7 +92,6 @@ public EACDemuxer(string eacPath, string fileName, TaskProfile jobProfile)
             {
                 JobSub.AddRange(jobProfile.SubtitleTracks);
             }
-            extractVideo = jobProfile.ExtractVideo;
             WorkingPathPrefix = jobProfile.WorkingPathPrefix;
         }
 
@@ -339,7 +337,7 @@ public MediaFile Extract(Action<double, EACProgressType> progressCallback)
             foreach (TrackInfo track in tracks)
             {
                 EacOutputTrackType trackType = s_eacOutputs.Find(val => val.Codec == track.Codec);
-                if (!(trackType.Extract || trackType.Type == TrackType.Video && extractVideo))
+                if (!trackType.Extract)
                 {
                     continue;
                 };

diff --git a/OKEGui/OKEGui/JobProcessor/Demuxer/TrackInfo.cs b/OKEGui/OKEGui/JobProcessor/Demuxer/TrackInfo.cs
@@ -49,15 +49,7 @@ public string OutFileName
                     var directory = Path.GetDirectoryName(WorkingPathPrefix);
                     var baseName = Path.GetFileNameWithoutExtension(SourceFile);
 
-                    if (Type == TrackType.Video)
-                    {
-                        return $"{Path.Combine(directory, baseName)}{FileExtension}";
-                    }
-                    else
-                    {
-                        return $"{Path.Combine(directory, baseName)}_{Index}{FileExtension}";
-                    }
-
+                    return $"{Path.Combine(directory, baseName)}_{Index}{FileExtension}";
                 }
             }
 

diff --git a/OKEGui/OKEGui/OKEGui.csproj b/OKEGui/OKEGui/OKEGui.csproj
@@ -156,7 +156,6 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Task\VideoService.cs" />
     <Compile Include="Utils\RegistryStorage.cs" />
     <Compile Include="Utils\SystemMenu.cs" />
     <Compile Include="Utils\TChapterExtension.cs" />

diff --git a/OKEGui/OKEGui/Task/TaskProfile.cs b/OKEGui/OKEGui/Task/TaskProfile.cs
@@ -29,7 +29,6 @@ public class TaskProfile : ICloneable
         public bool TimeCode;
 
         //后续任务中填写的参数
-        public bool ExtractVideo;
         public string VideoFormat;
         public string AudioFormat;
 

diff --git a/OKEGui/OKEGui/Task/VideoService.cs b/OKEGui/OKEGui/Task/VideoService.cs
diff --git a/OKEGui/OKEGui/Utils/Cleaner.cs b/OKEGui/OKEGui/Utils/Cleaner.cs
@@ -14,7 +14,7 @@ class Cleaner
         private const string TIME_FMT = "ddHHmm";
 
         public Cleaner() : this(
-            new List<string> { "flac", "alac", "aac", "ac3", "dts", "sup", "Log.txt", "vpy", "qpf", ".264", "lwi", "rpc", "pyc" },
+            new List<string> { "flac", "alac", "aac", "ac3", "dts", "sup", "Log.txt", "vpy", "qpf", "lwi", "rpc", "pyc" },
             new List<string> { "hevc", "mkv", "mp4", "mka", "h264" })
         {
         }

diff --git a/OKEGui/OKEGui/Worker/ExecuteTaskService.cs b/OKEGui/OKEGui/Worker/ExecuteTaskService.cs
@@ -76,7 +76,6 @@ private void WorkerDoWork(object sender, DoWorkEventArgs e)
                     task.MkaOutFile = new MediaFile();
 
                     // 抽取音轨
-                    profile.ExtractVideo = VideoService.ForceExtractVideo(task.InputFile);
                     FileInfo eacInfo = new FileInfo(Constants.eac3toWrapperPath);
                     MediaFile srcTracks = new EACDemuxer(eacInfo.FullName, task.InputFile, profile).Extract(
                         (double progress, EACProgressType type) =>
@@ -127,13 +126,6 @@ private void WorkerDoWork(object sender, DoWorkEventArgs e)
                         }
                     }
 
-                    // 如果必须抽取视频轨道，这里需要修改输入的vpy文件
-                    if (profile.ExtractVideo)
-                    {
-                        VideoService.ReplaceVpyInputFile(profile.InputScript, task.InputFile, srcTracks.VideoTrack.File.GetFullPath());
-                    }
-
-
                     // 新建视频处理工作
                     VideoJob videoJob = new VideoJob(profile.VideoFormat);
                     videoJob.SetUpdate(task);