diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-27 10:04:01 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-01-27 10:04:01 -0800 |
| commit | 9391844deb3f6a442745cea62f78aca2cea19e50 (patch) | |
| tree | c8868256f6cbd8e683b45c7fa4e3d56aa26d2574 /include/media/mediaplayer.h | |
| parent | b7909adcef247c627fbe8026624b9ecbeba47655 (diff) | |
| parent | b955b7224382b488a4d8d5663c92118feb8deb1e (diff) | |
| download | frameworks_av-9391844deb3f6a442745cea62f78aca2cea19e50.zip frameworks_av-9391844deb3f6a442745cea62f78aca2cea19e50.tar.gz frameworks_av-9391844deb3f6a442745cea62f78aca2cea19e50.tar.bz2 | |
resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp
Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72
Diffstat (limited to 'include/media/mediaplayer.h')
| -rw-r--r-- | include/media/mediaplayer.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 9cc208e..5830933 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -232,17 +232,6 @@ public: bool isLooping(); status_t setVolume(float leftVolume, float rightVolume); void notify(int msg, int ext1, int ext2, const Parcel *obj = NULL); - static status_t decode( - const sp<IMediaHTTPService> &httpService, - const char* url, - uint32_t *pSampleRate, - int* pNumChannels, - audio_format_t* pFormat, - const sp<IMemoryHeap>& heap, - size_t *pSize); - static status_t decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, - int* pNumChannels, audio_format_t* pFormat, - const sp<IMemoryHeap>& heap, size_t *pSize); status_t invoke(const Parcel& request, Parcel *reply); status_t setMetadataFilter(const Parcel& filter); status_t getMetadata(bool update_only, bool apply_filter, Parcel *metadata); |