commit 2f39c0b0fcbc5b857df2823247d163f2ba1c14a8
author Phil Burk <philburk@google.com> Thu Feb 06 14:52:15 2020 -0800
committer Phil Burk <philburk@google.com> Tue Feb 18 17:08:03 2020 -0800
tree 300a4c9fd1024832b9728666572da7e0ae4a26b4
parent b5c0071bb7a1c6524deb42ac6643d8fae3106248

aaudio: use unique_ptr in FixedBlockAdapter

Code cleanup.

Test: atest CtsNativeMediaAAudioTestCases
Change-Id: I980862379ade9b6cc62f1743c916208e3911a00a

media/libaaudio/src/utility/FixedBlockReader.cpp

diff --git a/media/libaaudio/src/utility/FixedBlockReader.cpp b/media/libaaudio/src/utility/FixedBlockReader.cpp
index 21ea70e..7931fa0 100644
--- a/media/libaaudio/src/utility/FixedBlockReader.cpp
+++ b/media/libaaudio/src/utility/FixedBlockReader.cpp
@@ -39,7 +39,7 @@
     if (bytesToRead > dataAvailable) {
         bytesToRead = dataAvailable;
     }
-    memcpy(buffer, mStorage + mPosition, bytesToRead);
+    memcpy(buffer, &mStorage[mPosition], bytesToRead);
     mPosition += bytesToRead;
     return bytesToRead;
 }
@@ -60,7 +60,7 @@
             bytesLeft -= mSize;
         } else {
             // Just need a partial block so we have to use storage.
-            result = mFixedBlockProcessor.onProcessFixedBlock(mStorage, mSize);
+            result = mFixedBlockProcessor.onProcessFixedBlock(mStorage.get(), mSize);
             mPosition = 0;
         }
     }