commit 2fdabbab3cbfb68755036607cda15f7123f42b9b
author Glenn Kasten <gkasten@google.com> Fri Nov 02 10:20:53 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 02 10:20:54 2012 -0700
tree de1be6a9cfc1d0ec04f8309edf57903b13b3b309
parent bf227b35dfd635d066f78818462da453fa15666d
parent c5b0fa3b2f6d9ac3aa274b973c331399312adf76

Merge "AudioTrack comments"

media/libstagefright/include/FragmentedMP4Parser.h

diff --git a/media/libstagefright/include/FragmentedMP4Parser.h b/media/libstagefright/include/FragmentedMP4Parser.h
index 0edafb9..dbe02b8 100644
--- a/media/libstagefright/include/FragmentedMP4Parser.h
+++ b/media/libstagefright/include/FragmentedMP4Parser.h
@@ -263,7 +263,7 @@
 
     void copyBuffer(
             sp<ABuffer> *dst,
-            size_t offset, uint64_t size, size_t extra = 0) const;
+            size_t offset, uint64_t size) const;
 
     DISALLOW_EVIL_CONSTRUCTORS(FragmentedMP4Parser);
 };

media/libstagefright/mp4/FragmentedMP4Parser.cpp

diff --git a/media/libstagefright/mp4/FragmentedMP4Parser.cpp b/media/libstagefright/mp4/FragmentedMP4Parser.cpp
index 7fe4e63..54c3d63 100644
--- a/media/libstagefright/mp4/FragmentedMP4Parser.cpp
+++ b/media/libstagefright/mp4/FragmentedMP4Parser.cpp
@@ -1971,8 +1971,8 @@
 }
 
 void FragmentedMP4Parser::copyBuffer(
-        sp<ABuffer> *dst, size_t offset, uint64_t size, size_t extra) const {
-    sp<ABuffer> buf = new ABuffer(size + extra);
+        sp<ABuffer> *dst, size_t offset, uint64_t size) const {
+    sp<ABuffer> buf = new ABuffer(size);
     memcpy(buf->data(), mBuffer->data() + offset, size);
 
     *dst = buf;