Skip to content

SDK / exoplayer

Go to a project
Commit a1d5626f by eguven Committed by Oliver Woodman
Options

Fixed DefaultExtractorInput.read(...) to allow to read bytes in the peek buffer 

when the dataSource reaches to the end.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=110131793
parent 80bd91e6
Inline Side-by-side
Showing with 60 additions and 27 deletions
library/src/androidTest/java/com/google/android/exoplayer/extractor/DefaultExtractorInputTest.java
......@@ -43,8 +43,7 @@ public class DefaultExtractorInputTest extends TestCase {
}
public void testRead() throws IOException, InterruptedException {
FakeDataSource testDataSource = buildDataSource();
DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNBOUNDED);
DefaultExtractorInput input = createDefaultExtractorInput();
byte[] target = new byte[TEST_DATA.length];
// We expect to perform three reads of three bytes, as setup in buildTestDataSource.
int bytesRead = 0;
......@@ -61,9 +60,34 @@ public class DefaultExtractorInputTest extends TestCase {
assertEquals(-1, expectedEndOfInput);
}
public void testReadPeeked() throws IOException, InterruptedException {
DefaultExtractorInput input = createDefaultExtractorInput();
byte[] target = new byte[TEST_DATA.length];
input.advancePeekPosition(TEST_DATA.length);
int bytesRead = input.read(target, 0, TEST_DATA.length);
assertEquals(TEST_DATA.length, bytesRead);
// Check the read data is correct.
assertTrue(Arrays.equals(TEST_DATA, target));
}
public void testReadMoreDataPeeked() throws IOException, InterruptedException {
DefaultExtractorInput input = createDefaultExtractorInput();
byte[] target = new byte[TEST_DATA.length];
input.advancePeekPosition(TEST_DATA.length);
int bytesRead = input.read(target, 0, TEST_DATA.length + 1);
assertEquals(TEST_DATA.length, bytesRead);
// Check the read data is correct.
assertTrue(Arrays.equals(TEST_DATA, target));
}
public void testReadFullyOnce() throws IOException, InterruptedException {
FakeDataSource testDataSource = buildDataSource();
DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNBOUNDED);
DefaultExtractorInput input = createDefaultExtractorInput();
byte[] target = new byte[TEST_DATA.length];
input.readFully(target, 0, TEST_DATA.length);
// Check that we read the whole of TEST_DATA.
......@@ -83,8 +107,7 @@ public class DefaultExtractorInputTest extends TestCase {
public void testReadFullyTwice() throws IOException, InterruptedException {
// Read TEST_DATA in two parts.
FakeDataSource testDataSource = buildDataSource();
DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNBOUNDED);
DefaultExtractorInput input = createDefaultExtractorInput();
byte[] target = new byte[5];
input.readFully(target, 0, 5);
assertTrue(Arrays.equals(Arrays.copyOf(TEST_DATA, 5), target));
......@@ -97,8 +120,7 @@ public class DefaultExtractorInputTest extends TestCase {
public void testReadFullyTooMuch() throws IOException, InterruptedException {
// Read more than TEST_DATA. Should fail with an EOFException. Position should not update.
FakeDataSource testDataSource = buildDataSource();
DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNBOUNDED);
DefaultExtractorInput input = createDefaultExtractorInput();
try {
byte[] target = new byte[TEST_DATA.length + 1];
input.readFully(target, 0, TEST_DATA.length + 1);
......@@ -110,8 +132,7 @@ public class DefaultExtractorInputTest extends TestCase {
// Read more than TEST_DATA with allowEndOfInput set. Should fail with an EOFException because
// the end of input isn't encountered immediately. Position should not update.
testDataSource = buildDataSource();
input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNBOUNDED);
input = createDefaultExtractorInput();
try {
byte[] target = new byte[TEST_DATA.length + 1];
input.readFully(target, 0, TEST_DATA.length + 1, true);
......@@ -138,8 +159,7 @@ public class DefaultExtractorInputTest extends TestCase {
public void testSkipFullyOnce() throws IOException, InterruptedException {
// Skip TEST_DATA.
FakeDataSource testDataSource = buildDataSource();
DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNBOUNDED);
DefaultExtractorInput input = createDefaultExtractorInput();
input.skipFully(TEST_DATA.length);
assertEquals(TEST_DATA.length, input.getPosition());
// Check that we fail with EOFException we skip again.
......@@ -153,8 +173,7 @@ public class DefaultExtractorInputTest extends TestCase {
public void testSkipFullyTwice() throws IOException, InterruptedException {
// Skip TEST_DATA in two parts.
FakeDataSource testDataSource = buildDataSource();
DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNBOUNDED);
DefaultExtractorInput input = createDefaultExtractorInput();
input.skipFully(5);
assertEquals(5, input.getPosition());
input.skipFully(4);
......@@ -163,8 +182,7 @@ public class DefaultExtractorInputTest extends TestCase {
public void testSkipFullyTooMuch() throws IOException, InterruptedException {
// Skip more than TEST_DATA. Should fail with an EOFException. Position should not update.
FakeDataSource testDataSource = buildDataSource();
DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNBOUNDED);
DefaultExtractorInput input = createDefaultExtractorInput();
try {
input.skipFully(TEST_DATA.length + 1);
fail();
......@@ -227,4 +245,8 @@ public class DefaultExtractorInputTest extends TestCase {
return testDataSource;
}
private static DefaultExtractorInput createDefaultExtractorInput() throws IOException {
FakeDataSource testDataSource = buildDataSource();
return new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNBOUNDED);
}
}
library/src/main/java/com/google/android/exoplayer/extractor/DefaultExtractorInput.java
......@@ -54,18 +54,29 @@ public final class DefaultExtractorInput implements ExtractorInput {
if (Thread.interrupted()) {
throw new InterruptedException();
}
int peekBytes = Math.min(peekBufferLength, length);
System.arraycopy(peekBuffer, 0, target, offset, peekBytes);
offset += peekBytes;
length -= peekBytes;
int bytesRead = length != 0 ? dataSource.read(target, offset, length) : 0;
if (bytesRead == C.RESULT_END_OF_INPUT) {
return C.RESULT_END_OF_INPUT;
int totalBytesRead = 0;
if (peekBufferLength > 0) {
int peekBytes = Math.min(peekBufferLength, length);
System.arraycopy(peekBuffer, 0, target, offset, peekBytes);
updatePeekBuffer(peekBytes);
totalBytesRead += peekBytes;
}
updatePeekBuffer(peekBytes);
bytesRead += peekBytes;
position += bytesRead;
return bytesRead;
if (totalBytesRead != length) {
int readBytes = dataSource.read(target, offset + totalBytesRead, length - totalBytesRead);
if (readBytes == C.RESULT_END_OF_INPUT) {
if (totalBytesRead == 0) {
return C.RESULT_END_OF_INPUT;
}
} else {
totalBytesRead += readBytes;
}
}
position += totalBytesRead;
return totalBytesRead;
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment