Merge pull request #333 from wb9688/playerresponse-dashmanifesturl

Extract dashManifestUrl in playerResponse
TeamNewPipe · May 28, 2020 · 0b4977b · 0b4977b
2 parents 0f8057a + 7ef3e80
commit 0b4977b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java b/...java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java
@@ -377,7 +377,9 @@ public String getDashMpdUrl() throws ParsingException {
         assertPageFetched();
         try {
             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");
             } else if (playerArgs != null && playerArgs.isString("dashmpd")) {
                 dashManifestUrl = playerArgs.getString("dashmpd", EMPTY_STRING);

diff --git a/...chabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorLivestreamTest.java b/...chabi/newpipe/extractor/services/youtube/stream/YoutubeStreamExtractorLivestreamTest.java
@@ -116,8 +116,7 @@ public void testStreamType() throws ParsingException {
 
     @Test
     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(), extractor.getDashMpdUrl().isEmpty());
+        assertTrue(extractor.getDashMpdUrl().startsWith("https://manifest.googlevideo.com/api/manifest/dash/"));
     }
 
     @Test