OpusOutputBuffer: instead of size field use data.limit

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=115436131
emildesign · Mar 10, 2016 · b26c324 · b26c324
1 parent 98f99dd
commit b26c324
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/...s/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java b/...s/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java
@@ -235,7 +235,7 @@ private void renderBuffer() throws OpusDecoderException, AudioTrack.Initializati
 
     int handleBufferResult;
     handleBufferResult = audioTrack.handleBuffer(outputBuffer.data, outputBuffer.data.position(),
-        outputBuffer.size, outputBuffer.timestampUs);
+        outputBuffer.data.remaining(), outputBuffer.timestampUs);
 
     // If we are out of sync, allow currentPositionUs to jump backwards.
     if ((handleBufferResult & AudioTrack.RESULT_POSITION_DISCONTINUITY) != 0) {

diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoder.java b/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoder.java
@@ -167,18 +167,17 @@ public boolean decode(InputBuffer inputBuffer, OpusOutputBuffer outputBuffer) {
       exception = new OpusDecoderException("Decode error: " + opusGetErrorMessage(result));
       return false;
     }
-    outputBuffer.size = result;
     outputBuffer.data.position(0);
+    outputBuffer.data.limit(result);
     if (skipSamples > 0) {
       int bytesPerSample = channelCount * 2;
       int skipBytes = skipSamples * bytesPerSample;
-      if (outputBuffer.size <= skipBytes) {
-        skipSamples -= outputBuffer.size / bytesPerSample;
-        outputBuffer.size = 0;
+      if (result <= skipBytes) {
+        skipSamples -= result / bytesPerSample;
         outputBuffer.setFlag(Buffer.FLAG_DECODE_ONLY);
+        outputBuffer.data.position(result);
       } else {
         skipSamples = 0;
-        outputBuffer.size -= skipBytes;
         outputBuffer.data.position(skipBytes);
       }
     }

diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusOutputBuffer.java b/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusOutputBuffer.java
@@ -28,7 +28,6 @@ public final class OpusOutputBuffer extends OutputBuffer {
   private final DecoderWrapper<?, OpusOutputBuffer, ?> owner;
 
   public ByteBuffer data;
-  public int size;
 
   /* package */ OpusOutputBuffer(DecoderWrapper<?, OpusOutputBuffer, ?> owner) {
     this.owner = owner;