summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-11-10 08:31:35 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-11-10 08:31:35 +0000
commit3174488eff4fe2484535aa840925ca3926e7c061 (patch)
tree732cb49314667b1779c208584ab1c56437785a07
parent2fb6dcf316834b2ba7761754472b30bd6cc94767 (diff)
parent72dada9cdc9027e5c4c00103e7ad68be0954481d (diff)
Merge "Only log first input reader length" into mainline-prod
-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(