Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Sources/YouTubeKit/Extraction.swift
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,9 @@ class Extraction {
if let adaptiveFormats = streamData.adaptiveFormats {
formats += adaptiveFormats
}

// Protected formats must not displace playable alternatives during itag deduplication.
formats.removeAll { !($0.drmFamilies?.isEmpty ?? true) }

for (i, data) in formats.enumerated() {
if data.url == nil {
Expand Down
1 change: 1 addition & 0 deletions Sources/YouTubeKit/InnerTube.swift
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ class InnerTube {
let audioSampleRate: String?
let audioChannels: Int?
let audioTrack: AudioTrack?
let drmFamilies: [String]?
let signatureCipher: String? // not tested yet
var s: String? // assigned from Extraction.applyDescrambler
var sp: String? // signature parameter name from signatureCipher
Expand Down
27 changes: 27 additions & 0 deletions Tests/YouTubeKitTests/ExtractionTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,33 @@ final class ExtractionTests: XCTestCase {
XCTAssertEqual(videoID, "2lAe1cqCOXo")
}

func testDescramblerExcludesDRMFormatsBeforeMergingClients() throws {
let json = #"""
[
{
"formats": [
{"itag": 18, "mimeType": "video/mp4", "url": "https://example.com/protected-video", "drmFamilies": ["WIDEVINE"]}
],
"adaptiveFormats": [
{"itag": 140, "mimeType": "audio/mp4", "url": "https://example.com/protected-audio", "drmFamilies": ["WIDEVINE"]}
]
},
{
"formats": [
{"itag": 18, "mimeType": "video/mp4", "url": "https://example.com/clear-video"}
],
"adaptiveFormats": [
{"itag": 140, "mimeType": "audio/mp4", "url": "https://example.com/clear-audio", "drmFamilies": []}
]
}
]
"""#
let responses = try JSONDecoder().decode([InnerTube.StreamingData].self, from: Data(json.utf8))
let formats = responses.flatMap { Extraction.applyDescrambler(streamData: $0) }
XCTAssertEqual(formats.map(\.itag), [18, 140])
XCTAssertEqual(formats.compactMap(\.url), ["https://example.com/clear-video", "https://example.com/clear-audio"])
}

func testPlayabilityStatusReadsInterstitialErrors() throws {
let cases: [(String, Extraction.InitialPlayerResponse.PlayabilityStatus.Status, [String])] = [
(#"{"status":"LOGIN_REQUIRED","errorScreen":{"playerInterstitialRenderer":{"content":{"interstitialViewModel":{"title":{"content":"Private video"},"description":{"content":"Please sign in."}}}}}}"#, .loginRequired, ["Private video", "Please sign in."]),
Expand Down
Loading