Initial checkin of AudioSource and AMRWriter, a pair of classes supporting pure-audio recording in stagefright.

related-to-bug: 2295449

2 files changed, 78 insertions, 4 deletions

diff --git a/include/media/stagefright/AMRWriter.h b/include/media/stagefright/AMRWriter.h
new file mode 100644
index 0000000..6ee9869
--- /dev/null
+++ b/include/media/stagefright/AMRWriter.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef AMR_WRITER_H_
+
+#define AMR_WRITER_H_
+
+#include <stdio.h>
+
+#include <utils/RefBase.h>
+#include <utils/threads.h>
+
+namespace android {
+
+struct MediaSource;
+
+struct AMRWriter : public RefBase {
+    AMRWriter(const char *filename);
+    AMRWriter(int fd);
+
+    status_t initCheck() const;
+
+    status_t addSource(const sp<MediaSource> &source);
+
+    status_t start();
+    void stop();
+
+protected:
+    virtual ~AMRWriter();
+
+private:
+    Mutex mLock;
+
+    FILE *mFile;
+    status_t mInitCheck;
+    sp<MediaSource> mSource;
+    bool mStarted;
+    volatile bool mDone;
+    pthread_t mThread;
+
+    static void *ThreadWrapper(void *);
+    void threadFunc();
+
+    AMRWriter(const AMRWriter &);
+    AMRWriter &operator=(const AMRWriter &);
+};
+
+}  // namespace android
+
+#endif  // AMR_WRITER_H_
diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h
index e129958..eb00140 100644
--- a/include/media/stagefright/AudioSource.h
+++ b/include/media/stagefright/AudioSource.h
@@ -18,16 +18,20 @@
 
 #define AUDIO_SOURCE_H_
 
+#include <media/AudioSystem.h>
 #include <media/stagefright/MediaSource.h>
 
 namespace android {
 
 class AudioRecord;
+struct MediaBufferGroup;
 
-class AudioSource {
-public:
-    AudioSource(int inputSource);
-    virtual ~AudioSource();
+struct AudioSource : public MediaSource {
+    // Note that the "channels" parameter is _not_ the number of channels,
+    // but a bitmask of AudioSystem::audio_channels constants.
+    AudioSource(
+            int inputSource, uint32_t sampleRate,
+            uint32_t channels = AudioSystem::CHANNEL_IN_MONO);
 
     status_t initCheck() const;
 
@@ -38,9 +42,16 @@ public:
     virtual status_t read(
             MediaBuffer **buffer, const ReadOptions *options = NULL);
 
+protected:
+    virtual ~AudioSource();
+
 private:
+    enum { kMaxBufferSize = 8192 };
+
     AudioRecord *mRecord;
     status_t mInitCheck;
+    bool mStarted;
+    MediaBufferGroup *mGroup;
 
     AudioSource(const AudioSource &);
     AudioSource &operator=(const AudioSource &);