Fix failures when text track has both VTT and CMFT.

Use VTT over CMFT since shaka supports CMFT.
Azure · Aug 22, 2023 · 2891aa5 · 2891aa5
1 parent 3836b82
commit 2891aa5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/transform/BasePackager.cs b/transform/BasePackager.cs
@@ -54,6 +54,21 @@ abstract class BasePackager : IPackager
 
         public IDictionary<string, IList<Track>> FileToTrackMap => _fileToTrackMap;
 
+        public static bool IsTextTrackSupported(Track track, Manifest manifest)
+        {
+            return !track.IsMultiFile && (track.Source.EndsWith(VTT_FILE) || track.Parameters.Any(t => t.Name == TRANSCRIPT_SOURCE));
+        }
+
+        public static bool IsLiveTextTrackSupported(Track track, ClientManifest clientManifest)
+        {
+            return track.IsMultiFile && 
+                // Choose the text track with a list of fragblobs for close captions.
+                clientManifest!.Streams.Any(
+                    stream => (stream.Type == StreamType.Text &&
+                    stream.SubType == "SUBT") &&
+                    stream.Name == track.TrackName);
+        }
+
         public BasePackager(AssetDetails assetDetails, TransMuxer transMuxer, ILogger logger)
         {
             _assetDetails = assetDetails;
@@ -65,24 +80,7 @@ public BasePackager(AssetDetails assetDetails, TransMuxer transMuxer, ILogger lo
             SelectedTracks = manifest.Tracks.Where(t =>
             {
                 if (t is TextTrack)
-                {
-                    bool pickThisTextTrack = !t.IsMultiFile && (t.Source.EndsWith(VTT_FILE) || t.Parameters.Any(t => t.Name == TRANSCRIPT_SOURCE));
-
-                    if (manifest.IsLiveArchive)
-                    {
-                        pickThisTextTrack = false;
-
-                        if (t.IsMultiFile)
-                        {
-                            // Choose the text track with a list of fragblobs for close captions.
-                            pickThisTextTrack = assetDetails.ClientManifest!.Streams.Any(
-                                                              stream => (stream.Type == StreamType.Text &&
-                                                                         stream.SubType == "SUBT") &&
-                                                                         stream.Name == t.TrackName);
-                        }
-                    }
-                    return pickThisTextTrack;
-                }
+                    return manifest.IsLiveArchive && IsLiveTextTrackSupported(t, assetDetails.ClientManifest!) || IsTextTrackSupported(t, manifest);
                 return true;
             }).ToList();
 

diff --git a/transform/ShakaPackager.cs b/transform/ShakaPackager.cs
@@ -112,8 +112,9 @@ private IEnumerable<string> GetArguments(IList<string> inputs, IList<string> out
 
             List<string> arguments = new(SelectedTracks.Select((t, i) =>
             {
+                var source = t.Parameters.SingleOrDefault(p => p.Name == TRANSCRIPT_SOURCE)?.Value ?? t.Source;
                 var ext = t.IsMultiFile ? (t is TextTrack ? VTT_FILE : MEDIA_FILE) : string.Empty;
-                var file = $"{t.Source}{ext}";
+                var file = $"{source}{ext}";
                 var index = Inputs.IndexOf(file);
                 var multiTrack = TransmuxedSmooth && FileToTrackMap[file].Count > 1;
                 var inputFile = multiTrack ?