commit 334655795fb9b23eb8d011c6f7ccf807816f74f0
author Jeff Brown <jeffbrown@google.com> Tue Jul 12 12:15:30 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 12 12:15:30 2011 -0700
tree d3f7a22c8290c5546d518d050f1704e9d9e1fbf0
parent 6d566304093bc0f79b47d96ed8d840620c163264
parent 2dade0141b45b3538183bd2d6c0c53a0345e92af

Merge "Remove the simulator target from all makefiles. Bug: 5010576"

libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp

diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
index 39204cd..588428e 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
@@ -42,7 +42,8 @@
 namespace android {
 struct VideoEditorAudioEncoderSource : public MediaSource {
     public:
-        static sp<VideoEditorAudioEncoderSource> Create();
+        static sp<VideoEditorAudioEncoderSource> Create(
+            const sp<MetaData> &format);
         virtual status_t start(MetaData *params = NULL);
         virtual status_t stop();
         virtual sp<MetaData> getFormat();
@@ -68,8 +69,9 @@
         MediaBufferChain* mLastBufferLink;
         int32_t mNbBuffer;
         State mState;
+        sp<MetaData> mEncFormat;
 
-        VideoEditorAudioEncoderSource();
+        VideoEditorAudioEncoderSource(const sp<MetaData> &format);
 
         // Don't call me.
         VideoEditorAudioEncoderSource(const VideoEditorAudioEncoderSource&);
@@ -77,20 +79,23 @@
             const VideoEditorAudioEncoderSource&);
 };
 
-sp<VideoEditorAudioEncoderSource> VideoEditorAudioEncoderSource::Create() {
+sp<VideoEditorAudioEncoderSource> VideoEditorAudioEncoderSource::Create(
+    const sp<MetaData> &format) {
 
     LOGV("VideoEditorAudioEncoderSource::Create");
     sp<VideoEditorAudioEncoderSource> aSource =
-        new VideoEditorAudioEncoderSource();
+        new VideoEditorAudioEncoderSource(format);
 
     return aSource;
 }
 
-VideoEditorAudioEncoderSource::VideoEditorAudioEncoderSource():
+VideoEditorAudioEncoderSource::VideoEditorAudioEncoderSource(
+    const sp<MetaData> &format):
         mFirstBufferLink(NULL),
         mLastBufferLink(NULL),
         mNbBuffer(0),
-        mState(CREATED) {
+        mState(CREATED),
+        mEncFormat(format) {
     LOGV("VideoEditorAudioEncoderSource::VideoEditorAudioEncoderSource");
 }
 
@@ -152,10 +157,7 @@
 
 sp<MetaData> VideoEditorAudioEncoderSource::getFormat() {
     LOGV("VideoEditorAudioEncoderSource::getFormat");
-
-   LOGV("VideoEditorAudioEncoderSource::getFormat :THIS IS NOT IMPLEMENTED");
-
-    return NULL;
+    return mEncFormat;
 }
 
 status_t VideoEditorAudioEncoderSource::read(MediaBuffer **buffer,
@@ -428,7 +430,8 @@
     encoderMetadata->setInt32(kKeyChannelCount, iNbChannel);
 
     // Create the encoder source
-    pEncoderContext->mEncoderSource = VideoEditorAudioEncoderSource::Create();
+    pEncoderContext->mEncoderSource = VideoEditorAudioEncoderSource::Create(
+        encoderMetadata);
     VIDEOEDITOR_CHECK(NULL != pEncoderContext->mEncoderSource.get(),
         M4ERR_STATE);