diff options
author | Steve Kondik <steve@cyngn.com> | 2015-11-19 00:33:58 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-11-24 04:02:48 -0800 |
commit | 3a0bcf107182665d5b8628245750f1e210ef0936 (patch) | |
tree | 5e530ee0e0da1b786466dcbf8362d671c6ea6057 /include/media/stagefright | |
parent | 29c75250c58bdcc3b38513813ba521cba82d5c61 (diff) | |
download | frameworks_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/media/stagefright')
-rw-r--r-- | include/media/stagefright/AudioSource.h | 6 | ||||
-rw-r--r-- | include/media/stagefright/FileSource.h | 8 | ||||
-rw-r--r-- | include/media/stagefright/Utils.h | 2 |
3 files changed, 10 insertions, 6 deletions
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_ |