summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-11-19 00:33:58 -0800
committerSteve Kondik <steve@cyngn.com>2015-11-24 04:02:48 -0800
commit3a0bcf107182665d5b8628245750f1e210ef0936 (patch)
tree5e530ee0e0da1b786466dcbf8362d671c6ea6057 /include
parent29c75250c58bdcc3b38513813ba521cba82d5c61 (diff)
downloadframeworks_av-3a0bcf107182665d5b8628245750f1e210ef0936.zip
frameworks_av-3a0bcf107182665d5b8628245750f1e210ef0936.tar.gz
frameworks_av-3a0bcf107182665d5b8628245750f1e210ef0936.tar.bz2
stagefright: Act V: I am become death, the destroyer of worlds
* In which our hero unites the legions of distant worlds together as one at last to fight anew until the segfaults boil the lands and the New Version cometh. Change-Id: I869b2ab254968ed7a133827ea9e5ba6056f68a5c
Diffstat (limited to 'include')
-rw-r--r--include/media/IMediaRecorder.h3
-rw-r--r--include/media/MediaRecorderBase.h7
-rwxr-xr-xinclude/media/mediarecorder.h4
-rw-r--r--include/media/stagefright/AudioSource.h6
-rw-r--r--include/media/stagefright/FileSource.h8
-rw-r--r--include/media/stagefright/Utils.h2
6 files changed, 20 insertions, 10 deletions
diff --git a/include/media/IMediaRecorder.h b/include/media/IMediaRecorder.h
index 339bd9e..7e6befd 100644
--- a/include/media/IMediaRecorder.h
+++ b/include/media/IMediaRecorder.h
@@ -51,7 +51,6 @@ public:
virtual status_t prepare() = 0;
virtual status_t getMaxAmplitude(int* max) = 0;
virtual status_t start() = 0;
- virtual status_t pause() = 0;
virtual status_t stop() = 0;
virtual status_t reset() = 0;
virtual status_t init() = 0;
@@ -59,6 +58,8 @@ public:
virtual status_t release() = 0;
virtual status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface) = 0;
virtual sp<IGraphicBufferProducer> querySurfaceMediaSource() = 0;
+
+ virtual status_t pause() = 0;
};
// ----------------------------------------------------------------------------
diff --git a/include/media/MediaRecorderBase.h b/include/media/MediaRecorderBase.h
index 48d8b70..4290563 100644
--- a/include/media/MediaRecorderBase.h
+++ b/include/media/MediaRecorderBase.h
@@ -53,7 +53,6 @@ struct MediaRecorderBase {
virtual status_t prepare() = 0;
virtual status_t start() = 0;
virtual status_t stop() = 0;
- virtual status_t pause() = 0;
virtual status_t close() = 0;
virtual status_t reset() = 0;
virtual status_t getMaxAmplitude(int *max) = 0;
@@ -61,13 +60,17 @@ struct MediaRecorderBase {
virtual status_t setInputSurface(const sp<IGraphicBufferConsumer>& surface) = 0;
virtual sp<IGraphicBufferProducer> querySurfaceMediaSource() const = 0;
-
protected:
String16 mOpPackageName;
private:
MediaRecorderBase(const MediaRecorderBase &);
MediaRecorderBase &operator=(const MediaRecorderBase &);
+
+public:
+ virtual status_t pause() = 0;
+
+
};
} // namespace android
diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h
index 96c84bb..0cf1146 100755
--- a/include/media/mediarecorder.h
+++ b/include/media/mediarecorder.h
@@ -249,7 +249,6 @@ public:
status_t getMaxAmplitude(int* max);
virtual status_t start();
virtual status_t stop();
- virtual status_t pause();
status_t reset();
status_t init();
status_t close();
@@ -278,6 +277,9 @@ protected:
bool mIsOutputFileSet;
Mutex mLock;
Mutex mNotifyLock;
+
+public:
+ virtual status_t pause();
};
}; // namespace android
diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h
index e48765e..699b1b4 100644
--- a/include/media/stagefright/AudioSource.h
+++ b/include/media/stagefright/AudioSource.h
@@ -46,8 +46,6 @@ struct AudioSource : public MediaSource, public MediaBufferObserver {
virtual status_t stop() { return reset(); }
virtual sp<MetaData> getFormat();
- virtual status_t pause();
-
// Returns the maximum amplitude since last call.
int16_t getMaxAmplitude();
@@ -113,6 +111,10 @@ protected:
AudioSource(const AudioSource &);
AudioSource &operator=(const AudioSource &);
+
+public:
+ virtual status_t pause();
+
};
} // namespace android
diff --git a/include/media/stagefright/FileSource.h b/include/media/stagefright/FileSource.h
index 21844ca..7051b20 100644
--- a/include/media/stagefright/FileSource.h
+++ b/include/media/stagefright/FileSource.h
@@ -39,14 +39,14 @@ public:
virtual status_t getSize(off64_t *size);
- virtual String8 getUri() {
- return mUri;
- }
-
virtual sp<DecryptHandle> DrmInitialization(const char *mime);
virtual void getDrmInfo(sp<DecryptHandle> &handle, DrmManagerClient **client);
+ virtual String8 getUri() {
+ return mUri;
+ }
+
protected:
virtual ~FileSource();
diff --git a/include/media/stagefright/Utils.h b/include/media/stagefright/Utils.h
index 5e9d7d4..1e9de1a 100644
--- a/include/media/stagefright/Utils.h
+++ b/include/media/stagefright/Utils.h
@@ -85,6 +85,8 @@ void writeToAMessage(sp<AMessage> msg, const AVSyncSettings &sync, float videoFp
void readFromAMessage(
const sp<AMessage> &msg, AVSyncSettings *sync /* nonnull */, float *videoFps /* nonnull */);
+audio_format_t getPCMFormat(const sp<AMessage> &format);
+
} // namespace android
#endif // UTILS_H_