be-gay-do-crimes
/
NewPipeExtractor
mirror of https://github.com/TeamNewPipe/NewPipeExtractor
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #333 from wb9688/playerresponse-dashmanifesturl 

Extract dashManifestUrl in playerResponse
This commit is contained in:
Tobias Groza 2020-05-28 21:17:07 +02:00 committed by GitHub
parent 0f8057ae56 7ef3e80493
commit 0b4977bb0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
View File

@ -377,7 +377,9 @@ public class YoutubeStreamExtractor extends StreamExtractor {
assertPageFetched(); assertPageFetched();
try { try {
String dashManifestUrl; String dashManifestUrl;
if (videoInfoPage.containsKey("dashmpd")) { if (playerResponse.getObject("streamingData").isString("dashManifestUrl")) {
return playerResponse.getObject("streamingData").getString("dashManifestUrl");
} else if (videoInfoPage.containsKey("dashmpd")) {
dashManifestUrl = videoInfoPage.get("dashmpd"); dashManifestUrl = videoInfoPage.get("dashmpd");
} else if (playerArgs != null && playerArgs.isString("dashmpd")) { } else if (playerArgs != null && playerArgs.isString("dashmpd")) {
dashManifestUrl = playerArgs.getString("dashmpd", EMPTY_STRING); dashManifestUrl = playerArgs.getString("dashmpd", EMPTY_STRING);

3
extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorLivestreamTest.java
View File

@ -116,8 +116,7 @@ public class YoutubeStreamExtractorLivestreamTest {
@Test @Test
public void testGetDashMpd() throws ParsingException { public void testGetDashMpd() throws ParsingException {
// we dont expect this particular video to have a DASH file. For this purpouse we use a different test class. assertTrue(extractor.getDashMpdUrl().startsWith("https://manifest.googlevideo.com/api/manifest/dash/"));
assertTrue(extractor.getDashMpdUrl(), extractor.getDashMpdUrl().isEmpty());
} }
@Test @Test