summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMingming Yin <mingming@codeaurora.org>2012-12-27 17:43:05 -0800
committerKonsta <konsta09@gmail.com>2013-03-06 09:51:55 +0200
commita35c8f521c9cbb64f3d32df5ded7eab2db2727ee (patch)
tree6b41434b68ca73397fff0950f7aac2ac44de77bd /include
parent720055270a0412311d39ca77ff1c0e6d744d6b5e (diff)
downloadframeworks_av-a35c8f521c9cbb64f3d32df5ded7eab2db2727ee.zip
frameworks_av-a35c8f521c9cbb64f3d32df5ded7eab2db2727ee.tar.gz
frameworks_av-a35c8f521c9cbb64f3d32df5ded7eab2db2727ee.tar.bz2
qcom-fm: audio: add support for FM feature
Change-Id: Idd5c7a0364710d54809ef5d4c7b2404b22dc4cf6 Conflicts: include/media/IAudioFlinger.h media/libmediaplayerservice/StagefrightRecorder.cpp media/libstagefright/Android.mk
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioSystem.h9
-rwxr-xr-xinclude/media/IAudioFlinger.h7
-rw-r--r--include/media/stagefright/FMA2DPWriter.h84
3 files changed, 95 insertions, 5 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index d8c57d3..31b1b08 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2012, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2008 The Android Open Source Project
+ * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ *
* Not a Contribution, Apache license notifications and license are retained
* for attribution purposes only.
*
- * Copyright (C) 2008 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
@@ -120,6 +120,9 @@ public:
audio_channel_mask_t channelMask, size_t* buffSize);
static status_t setVoiceVolume(float volume);
+#ifdef QCOM_FM_ENABLED
+ static status_t setFmVolume(float volume);
+#endif
// return the number of audio frames written by AudioFlinger to audio HAL and
// audio dsp to DAC since the output on which the specified stream is playing
diff --git a/include/media/IAudioFlinger.h b/include/media/IAudioFlinger.h
index 0700a68..396f87b 100755
--- a/include/media/IAudioFlinger.h
+++ b/include/media/IAudioFlinger.h
@@ -1,10 +1,10 @@
/*
+ * Copyright (C) 2007 The Android Open Source Project
* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ *
* Not a Contribution, Apache license notifications and license are retained
* for attribution purposes only.
*
- * Copyright (C) 2007 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
@@ -219,6 +219,9 @@ public:
// that looks on primary device for a stream with fast flag, primary flag, or first one.
virtual int32_t getPrimaryOutputSamplingRate() = 0;
virtual int32_t getPrimaryOutputFrameCount() = 0;
+#ifdef QCOM_FM_ENABLED
+ virtual status_t setFmVolume(float volume) = 0;
+#endif
};
diff --git a/include/media/stagefright/FMA2DPWriter.h b/include/media/stagefright/FMA2DPWriter.h
new file mode 100644
index 0000000..f1c1694
--- /dev/null
+++ b/include/media/stagefright/FMA2DPWriter.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ *
+ * Not a Contribution, Apache license notifications and license are retained
+ * for attribution purposes only
+ *
+ * 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 FM_A2DP_WRITER_H_
+
+#define FM_A2DP_WRITER_H_
+
+#include <stdio.h>
+
+#include <media/stagefright/MediaWriter.h>
+#include <utils/threads.h>
+#include <media/AudioRecord.h>
+#include <utils/List.h>
+#include <semaphore.h>
+#include <media/mediarecorder.h>
+
+namespace android {
+
+struct MediaSource;
+struct MetaData;
+
+struct audioBufferstruct {
+ public:
+ audioBufferstruct (void *buff, size_t bufflen)
+ :audioBuffer(buff), bufferlen(bufflen){}
+
+ void *audioBuffer;
+ size_t bufferlen;
+ };
+
+struct FMA2DPWriter : public MediaWriter {
+ FMA2DPWriter();
+
+ status_t initCheck() const;
+ virtual status_t addSource(const sp<MediaSource> &source);
+ virtual bool reachedEOS();
+ virtual status_t start(MetaData *params = NULL);
+ virtual status_t stop();
+ virtual status_t pause();
+ virtual status_t allocateBufferPool();
+
+protected:
+ virtual ~FMA2DPWriter();
+
+private:
+ List<audioBufferstruct > mFreeQ,mDataQ;
+ Mutex mFreeQLock,mDataQLock;
+ sem_t mReaderThreadWakeupsem,mWriterThreadWakeupsem;
+ pthread_t mReaderThread,mWriterThread;
+ bool mStarted;
+ volatile bool mDone;
+ int32_t mAudioChannels;
+ int32_t mSampleRate;
+ audio_format_t mAudioFormat;
+ audio_source_t mAudioSource;
+ size_t mBufferSize;
+ static void *ReaderThreadWrapper(void *);
+ static void *WriterThreadWrapper(void *);
+ status_t readerthread();
+ status_t writerthread();
+ FMA2DPWriter(const FMA2DPWriter &);
+ FMA2DPWriter &operator=(const FMA2DPWriter &);
+};
+
+} // namespace android
+
+#endif // FM_A2DP_WRITER_H_