-
Notifications
You must be signed in to change notification settings - Fork 6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Removed the PES_STRIPPED flag. It's unnecessary. We can strip PES in the TS extractor instead. - Made nearly all of the object classes in DvbParser immutable. Else it's non-obvious that none of this state can be mutated. - Made a a lot of the methods in DvbParser static for the same reason. - Removed unnecessary null checks, code that was never executed, unused fields etc. - Add proper flushing of DvbParser, to prevent corrupt output following a seek.
- Loading branch information
Showing
24 changed files
with
1,091 additions
and
1,593 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,4 +7,4 @@ | |
| } | ||
| -keepclassmembers class com.google.android.exoplayer2.text.dvb.DvbDecoder { | ||
| public <init>(java.util.List); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
111 changes: 111 additions & 0 deletions
111
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| /* | ||
| * Copyright (C) 2017 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.android.exoplayer2.extractor.ts; | ||
|
|
||
| import com.google.android.exoplayer2.C; | ||
| import com.google.android.exoplayer2.Format; | ||
| import com.google.android.exoplayer2.extractor.ExtractorOutput; | ||
| import com.google.android.exoplayer2.extractor.TrackOutput; | ||
| import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator; | ||
| import com.google.android.exoplayer2.util.MimeTypes; | ||
| import com.google.android.exoplayer2.util.ParsableByteArray; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Parses DVB subtitle data and extracts individual frames. | ||
| */ | ||
| public final class DvbSubtitleReader implements ElementaryStreamReader { | ||
|
|
||
| private final String language; | ||
| private final List<byte[]> initializationData; | ||
|
|
||
| private TrackOutput output; | ||
| private boolean writingSample; | ||
| private int bytesToCheck; | ||
| private int sampleBytesWritten; | ||
| private long sampleTimeUs; | ||
|
|
||
| /** | ||
| * @param language The subtitle language code. | ||
| * @param initializationData Initialization data to be included in the track {@link Format}. | ||
| */ | ||
| public DvbSubtitleReader(String language, byte[] initializationData) { | ||
| this.language = language; | ||
| this.initializationData = Collections.singletonList(initializationData); | ||
| } | ||
|
|
||
| @Override | ||
| public void seek() { | ||
| writingSample = false; | ||
| } | ||
|
|
||
| @Override | ||
| public void createTracks(ExtractorOutput extractorOutput, TrackIdGenerator idGenerator) { | ||
| idGenerator.generateNewId(); | ||
| this.output = extractorOutput.track(idGenerator.getTrackId(), C.TRACK_TYPE_TEXT); | ||
| output.format(Format.createImageSampleFormat(idGenerator.getFormatId(), | ||
| MimeTypes.APPLICATION_DVBSUBS, null, Format.NO_VALUE, initializationData, language, null)); | ||
| } | ||
|
|
||
| @Override | ||
| public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) { | ||
| if (!dataAlignmentIndicator) { | ||
| return; | ||
| } | ||
| writingSample = true; | ||
| sampleTimeUs = pesTimeUs; | ||
| sampleBytesWritten = 0; | ||
| bytesToCheck = 2; | ||
| } | ||
|
|
||
| @Override | ||
| public void packetFinished() { | ||
| if (writingSample) { | ||
| output.sampleMetadata(sampleTimeUs, C.BUFFER_FLAG_KEY_FRAME, sampleBytesWritten, 0, null); | ||
| writingSample = false; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void consume(ParsableByteArray data) { | ||
| if (writingSample) { | ||
| if (bytesToCheck == 2 && !checkNextByte(data, 0x20)) { | ||
| // Failed to check data_identifier | ||
| return; | ||
| } | ||
| if (bytesToCheck == 1 && !checkNextByte(data, 0x00)) { | ||
| // Check and discard the subtitle_stream_id | ||
| return; | ||
| } | ||
| int bytesAvailable = data.bytesLeft(); | ||
| output.sampleData(data, bytesAvailable); | ||
| sampleBytesWritten += bytesAvailable; | ||
| } | ||
| } | ||
|
|
||
| private boolean checkNextByte(ParsableByteArray data, int expectedValue) { | ||
| if (data.bytesLeft() == 0) { | ||
| return false; | ||
| } | ||
| if (data.readUnsignedByte() != expectedValue) { | ||
| writingSample = false; | ||
| } | ||
| bytesToCheck--; | ||
| return writingSample; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.