CypherpunkSamurai/NewPipeExtractor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix checkstyle issues & more in DashMpdParser

Browse source 
Also remove useless null check on ItagItem.getItag() as that function already throws an exception if there is no itag
This commit is contained in:
Stypox 2022-03-17 15:40:12 +01:00 committed by litetex
parent 8aba2b47b0
commit bd7b362040
1 changed files with 67 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
extractor/src/main/java/org/schabi/newpipe/extractor/utils/DashMpdParser.java
View file

@ -43,13 +43,13 @@ import java.util.List;
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
*/
public class DashMpdParser {
public final class DashMpdParser {
private DashMpdParser() {
}
public static class DashMpdParsingException extends ParsingException {
DashMpdParsingException(String message, Exception e) {
DashMpdParsingException(final String message, final Exception e) {
super(message, e);
}
}
@ -64,12 +64,12 @@ public class DashMpdParser {
private final List<VideoStream> segmentedVideoOnlyStreams;
public ParserResult(List<VideoStream> videoStreams,
List<AudioStream> audioStreams,
List<VideoStream> videoOnlyStreams,
List<VideoStream> segmentedVideoStreams,
List<AudioStream> segmentedAudioStreams,
List<VideoStream> segmentedVideoOnlyStreams) {
public ParserResult(final List<VideoStream> videoStreams,
final List<AudioStream> audioStreams,
final List<VideoStream> videoOnlyStreams,
final List<VideoStream> segmentedVideoStreams,
final List<AudioStream> segmentedAudioStreams,
final List<VideoStream> segmentedVideoOnlyStreams) {
this.videoStreams = videoStreams;
this.audioStreams = audioStreams;
this.videoOnlyStreams = videoOnlyStreams;
@ -110,19 +110,20 @@ public class DashMpdParser {
* It has video, video only and audio streams and will only add to the list if it don't
* find a similar stream in the respective lists (calling {@link Stream#equalStats}).
* <p>
* Info about dash MPD can be found here
* Info about dash MPD can be found
* <a href="https://www.brendanlong.com/the-structure-of-an-mpeg-dash-mpd.html">here</a>.
*
* @param streamInfo where the parsed streams will be added
* @see <a href="https://www.brendanlong.com/the-structure-of-an-mpeg-dash-mpd.html">www.brendanlog.com</a>
*/
public static ParserResult getStreams(final StreamInfo streamInfo)
throws DashMpdParsingException, ReCaptchaException {
String dashDoc;
Downloader downloader = NewPipe.getDownloader();
final String dashDoc;
final Downloader downloader = NewPipe.getDownloader();
try {
dashDoc = downloader.get(streamInfo.getDashMpdUrl()).responseBody();
} catch (IOException ioe) {
throw new DashMpdParsingException("Could not get dash mpd: " + streamInfo.getDashMpdUrl(), ioe);
} catch (final IOException ioe) {
throw new DashMpdParsingException(
"Could not get dash mpd: " + streamInfo.getDashMpdUrl(), ioe);
}
try {
@ -144,25 +145,31 @@ public class DashMpdParser {
for (int i = 0; i < representationList.getLength(); i++) {
final Element representation = (Element) representationList.item(i);
try {
final String mimeType = ((Element) representation.getParentNode()).getAttribute("mimeType");
final String mimeType
= ((Element) representation.getParentNode()).getAttribute("mimeType");
final String id = representation.getAttribute("id");
final String url = representation.getElementsByTagName("BaseURL").item(0).getTextContent();
final String url = representation
.getElementsByTagName("BaseURL").item(0).getTextContent();
final ItagItem itag = ItagItem.getItag(Integer.parseInt(id));
final Node segmentationList = representation.getElementsByTagName("SegmentList").item(0);
final Node segmentationList
= representation.getElementsByTagName("SegmentList").item(0);
// If SegmentList is not null this means that BaseUrl is not representing the
// url to the stream. Instead we need to add the "media=" value from the
// <SegementURL/> tags inside the <SegmentList/> tag in order to get a full
// working url. However each of these is just pointing to a part of the video,
// so we can not return a URL with a working stream here. Instead of putting
// those streams into the list of regular stream urls we put them in a for
// example "segmentedVideoStreams" list.
// if SegmentList is not null this means that BaseUrl is not representing the url to the stream.
// instead we need to add the "media=" value from the <SegementURL/> tags inside the <SegmentList/>
// tag in order to get a full working url. However each of these is just pointing to a part of the
// video, so we can not return a URL with a working stream here.
// Instead of putting those streams into the list of regular stream urls wie put them in a
// for example "segmentedVideoStreams" list.
if (itag != null) {
final MediaFormat mediaFormat = MediaFormat.getFromMimeType(mimeType);
if (itag.itagType.equals(ItagItem.ItagType.AUDIO)) {
if (segmentationList == null) {
final AudioStream audioStream = new AudioStream(url, mediaFormat, itag.avgBitrate);
if (!Stream.containSimilarStream(audioStream, streamInfo.getAudioStreams())) {
final AudioStream audioStream
= new AudioStream(url, mediaFormat, itag.avgBitrate);
if (!Stream.containSimilarStream(audioStream,
streamInfo.getAudioStreams())) {
audioStreams.add(audioStream);
}
} else {
@ -170,7 +177,8 @@ public class DashMpdParser {
new AudioStream(id, mediaFormat, itag.avgBitrate));
}
} else {
boolean isVideoOnly = itag.itagType.equals(ItagItem.ItagType.VIDEO_ONLY);
final boolean isVideoOnly
= itag.itagType.equals(ItagItem.ItagType.VIDEO_ONLY);
if (segmentationList == null) {
final VideoStream videoStream = new VideoStream(url,
@ -179,10 +187,12 @@ public class DashMpdParser {
isVideoOnly);
if (isVideoOnly) {
if (!Stream.containSimilarStream(videoStream, streamInfo.getVideoOnlyStreams())) {
if (!Stream.containSimilarStream(videoStream,
streamInfo.getVideoOnlyStreams())) {
videoOnlyStreams.add(videoStream);
}
} else if (!Stream.containSimilarStream(videoStream, streamInfo.getVideoStreams())) {
} else if (!Stream.containSimilarStream(videoStream,
streamInfo.getVideoStreams())) {
videoStreams.add(videoStream);
}
} else {
@ -198,8 +208,7 @@ public class DashMpdParser {
}
}
}
}
} catch (Exception ignored) {
} catch (final Exception ignored) {
}
}
return new ParserResult(
@ -209,7 +218,7 @@ public class DashMpdParser {
segmentedVideoStreams,
segmentedAudioStreams,
segmentedVideoOnlyStreams);
} catch (Exception e) {
} catch (final Exception e) {
throw new DashMpdParsingException("Could not parse Dash mpd", e);
}
}