summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantiago Seifert <aquilescanta@google.com>2020-11-05 16:35:00 +0000
committerSantiago Seifert <aquilescanta@google.com>2020-11-05 16:35:00 +0000
commit2eee34d2861ba2fba8bc4a23157acfd7dc7a53dd (patch)
tree4402ee737e72dc7013977554b347a5acca186162
parente97f73dd910958992945fc0142112080f7d3409d (diff)
Only log first input reader length
It's not feasible to reliably differentiate a different segment parsing from a seek. Bug: 158742256 Test: atest CtsMediaParserTestCases Test: atest CtsMediaParserHostTestCases Change-Id: I7d62f1c2b9334bf601f38ce915b0fafdc76fbec1
-rw-r--r--apex/media/framework/java/android/media/MediaParser.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/apex/media/framework/java/android/media/MediaParser.java b/apex/media/framework/java/android/media/MediaParser.java
index 045b4136a710..8bdca766e0dd 100644
--- a/apex/media/framework/java/android/media/MediaParser.java
+++ b/apex/media/framework/java/android/media/MediaParser.java
@@ -1186,11 +1186,10 @@ public final class MediaParser {
// TODO: For efficiency, the same implementation should be used, by providing a
// clearBuffers() method, or similar.
long resourceLength = seekableInputReader.getLength();
- if (resourceLength == -1) {
- mResourceByteCount = -1;
- }
- if (mResourceByteCount != -1) {
- mResourceByteCount += resourceLength;
+ if (mResourceByteCount == 0) {
+ // For resource byte count metric collection, we only take into account the length
+ // of the first provided input reader.
+ mResourceByteCount = resourceLength;
}
mExtractorInput =
new DefaultExtractorInput(