Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve handling of some source quality related edge cases #953

Merged
merged 4 commits into from
Jan 21, 2024
+34 −6
Merged

Improve handling of some source quality related edge cases #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5b910c
Always sort source quality to the top of the list regardless of video…
ScrubN Jan 20, 2024
c19f9c8
Return best quality when quality string contains "source" or "chunked"
ScrubN Jan 20, 2024
51becdf
Always include "Source" in the source stream's quality string because…
ScrubN Jan 21, 2024
7761d37
Cleanup
ScrubN Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions TwitchDownloaderCore/Extensions/M3U8Extensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ public static M3U8.Stream GetStreamOfQuality(this M3U8 m3u8, string qualityStrin
return m3u8.BestQualityStream();
}

if (qualityString.Contains("source", StringComparison.OrdinalIgnoreCase) || qualityString.Contains("chunked", StringComparison.OrdinalIgnoreCase))
{
return m3u8.BestQualityStream();
}

if (qualityString.Contains("audio", StringComparison.OrdinalIgnoreCase) &&
streams.FirstOrDefault(x => x.MediaInfo.Name.Contains("audio", StringComparison.OrdinalIgnoreCase)) is { } audioStream)
{
Expand Down Expand Up @@ -84,38 +89,55 @@ public static M3U8.Stream GetStreamOfQuality(this M3U8 m3u8, string qualityStrin
/// </returns>
public static string GetResolutionFramerateString(this M3U8.Stream stream)
{
const string RESOLUTION_FRAMERATE_PATTERN = /*lang=regex*/@"\d{3,4}p\d{2,3}";

var mediaInfo = stream.MediaInfo;
if (mediaInfo.Name.Contains("audio", StringComparison.OrdinalIgnoreCase) || Regex.IsMatch(mediaInfo.Name, @"\d{3,4}p\d{2,3}"))
if (mediaInfo.Name.Contains("audio", StringComparison.OrdinalIgnoreCase) || Regex.IsMatch(mediaInfo.Name, RESOLUTION_FRAMERATE_PATTERN))
{
return mediaInfo.Name;
}

var streamInfo = stream.StreamInfo;
if (Regex.IsMatch(streamInfo.Video, @"\d{3,4}p\d{2,3}"))
if (Regex.IsMatch(streamInfo.Video, RESOLUTION_FRAMERATE_PATTERN))
{
return streamInfo.Video;
}

if (Regex.IsMatch(mediaInfo.GroupId, @"\d{3,4}p\d{2,3}"))
if (Regex.IsMatch(mediaInfo.GroupId, RESOLUTION_FRAMERATE_PATTERN))
{
return mediaInfo.GroupId;
}

if (streamInfo.Resolution == default)
{
if (stream.IsSource())
{
return "Source";
}

return "";
}

var frameHeight = streamInfo.Resolution.Height;

if (streamInfo.Framerate == default)
{
if (stream.IsSource())
{
return $"{frameHeight}p (Source)";
}

return $"{frameHeight}p";
}

// Some M3U8 responses have framerate values up to 2fps more/less than the typical framerate.
var frameRate = (uint)(Math.Round(streamInfo.Framerate / 10) * 10);

if (stream.IsSource())
{
return $"{frameHeight}p{frameRate} (Source)";
}

return $"{frameHeight}p{frameRate}";
}

Expand All @@ -124,10 +146,12 @@ public static string GetResolutionFramerateString(this M3U8.Stream stream)
/// </summary>
public static M3U8.Stream BestQualityStream(this M3U8 m3u8)
{
var source = Array.Find(
m3u8.Streams, x => x.MediaInfo.Name.Contains("source", StringComparison.OrdinalIgnoreCase) ||
x.MediaInfo.GroupId.Equals("chunked", StringComparison.OrdinalIgnoreCase));
var source = Array.Find(m3u8.Streams, x => x.IsSource());
return source ?? m3u8.Streams.MaxBy(x => x.StreamInfo.Resolution.Width * x.StreamInfo.Resolution.Height * x.StreamInfo.Framerate);
}

internal static bool IsSource(this M3U8.Stream stream)
=> stream.MediaInfo.Name.Contains("source", StringComparison.OrdinalIgnoreCase) ||
stream.MediaInfo.GroupId.Equals("chunked", StringComparison.OrdinalIgnoreCase);
}
}
4 changes: 4 additions & 0 deletions TwitchDownloaderCore/Tools/M3U8StreamQualityComparer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using TwitchDownloaderCore.Extensions;

namespace TwitchDownloaderCore.Tools
{
Expand All @@ -14,6 +15,9 @@ public int Compare(M3U8.Stream x, M3U8.Stream y)

if (y?.StreamInfo is null) return 1;

if (x.IsSource()) return -1;
if (y.IsSource()) return 1;

var xResolution = x.StreamInfo.Resolution;
var yResolution = y.StreamInfo.Resolution;
var xTotalPixels = xResolution.Width * xResolution.Height;
Expand Down
Loading