diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-03 14:04:24 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-03 14:04:24 -0800 |
commit | ad04d9201452001dbaac4349f084cc9316190b89 (patch) | |
tree | e8a8fbc4b27adf44a21e884351eecf47fca7e0b6 /include/media/mediarecorder.h | |
parent | 99ffda877980468a9ae31e013cd10fb3645df1b0 (diff) | |
download | frameworks_av-ad04d9201452001dbaac4349f084cc9316190b89.zip frameworks_av-ad04d9201452001dbaac4349f084cc9316190b89.tar.gz frameworks_av-ad04d9201452001dbaac4349f084cc9316190b89.tar.bz2 |
auto import from //depot/cupcake/@132589
Diffstat (limited to 'include/media/mediarecorder.h')
-rw-r--r-- | include/media/mediarecorder.h | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index 8991f08..436e8f1 100644 --- a/include/media/mediarecorder.h +++ b/include/media/mediarecorder.h @@ -19,7 +19,6 @@ #define ANDROID_MEDIARECORDER_H #include <utils.h> -#include <media/IMediaPlayerClient.h> namespace android { @@ -88,24 +87,7 @@ enum media_recorder_states { MEDIA_RECORDER_RECORDING = 1 << 4, }; -// The "msg" code passed to the listener in notify. -enum { - MEDIA_RECORDER_EVENT_ERROR = 1 -}; - -enum { - MEDIA_RECORDER_ERROR_UNKNOWN = 1 -}; - -// ---------------------------------------------------------------------------- -// ref-counted object for callbacks -class MediaRecorderListener: virtual public RefBase -{ -public: - virtual void notify(int msg, int ext1, int ext2) = 0; -}; - -class MediaRecorder : public BnMediaPlayerClient +class MediaRecorder { public: MediaRecorder(); @@ -123,7 +105,6 @@ public: status_t setOutputFile(int fd, int64_t offset, int64_t length); status_t setVideoSize(int width, int height); status_t setVideoFrameRate(int frames_per_second); - status_t setListener(const sp<MediaRecorderListener>& listener); status_t prepare(); status_t getMaxAmplitude(int* max); status_t start(); @@ -132,22 +113,18 @@ public: status_t init(); status_t close(); status_t release(); - void notify(int msg, int ext1, int ext2); private: void doCleanUp(); status_t doReset(); - sp<IMediaRecorder> mMediaRecorder; - sp<MediaRecorderListener> mListener; - media_recorder_states mCurrentState; - bool mIsAudioSourceSet; - bool mIsVideoSourceSet; - bool mIsAudioEncoderSet; - bool mIsVideoEncoderSet; - bool mIsOutputFileSet; - Mutex mLock; - Mutex mNotifyLock; + sp<IMediaRecorder> mMediaRecorder; + media_recorder_states mCurrentState; + bool mIsAudioSourceSet; + bool mIsVideoSourceSet; + bool mIsAudioEncoderSet; + bool mIsVideoEncoderSet; + bool mIsOutputFileSet; }; }; // namespace android |