diff options
| author | Eric Laurent <elaurent@google.com> | 2010-06-22 18:29:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-22 18:29:57 -0700 |
| commit | dadd0d1e7d5fbb88fd3420438c590a0bb4c18af5 (patch) | |
| tree | 44ad049a0b4cc00150f502e296dfb82d257f6913 /include | |
| parent | 41b2d090b23889c56bf0a889a8c9c2fb934015e8 (diff) | |
| parent | a514bdb58b5de4986679f72b7204b4764f7a2778 (diff) | |
| download | frameworks_av-dadd0d1e7d5fbb88fd3420438c590a0bb4c18af5.zip frameworks_av-dadd0d1e7d5fbb88fd3420438c590a0bb4c18af5.tar.gz frameworks_av-dadd0d1e7d5fbb88fd3420438c590a0bb4c18af5.tar.bz2 | |
Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into gingerbread
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IMediaPlayerService.h | 7 | ||||
| -rw-r--r-- | include/media/mediaplayer.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index 31c0991..e892875 100644 --- a/include/media/IMediaPlayerService.h +++ b/include/media/IMediaPlayerService.h @@ -40,8 +40,11 @@ public: virtual sp<IMediaRecorder> createMediaRecorder(pid_t pid) = 0; virtual sp<IMediaMetadataRetriever> createMetadataRetriever(pid_t pid) = 0; - virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, const char* url, const KeyedVector<String8, String8> *headers = NULL) = 0; - virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, int fd, int64_t offset, int64_t length) = 0; + virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, + const char* url, const KeyedVector<String8, String8> *headers = NULL, + int audioSessionId = 0) = 0; + virtual sp<IMediaPlayer> create(pid_t pid, const sp<IMediaPlayerClient>& client, + int fd, int64_t offset, int64_t length, int audioSessionId) = 0; virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0; virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, int* pFormat) = 0; virtual sp<IOMX> getOMX() = 0; diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index dc783ce..62a4e50 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -172,6 +172,8 @@ public: status_t getMetadata(bool update_only, bool apply_filter, Parcel *metadata); status_t suspend(); status_t resume(); + status_t setAudioSessionId(int sessionId); + int getAudioSessionId(); private: void clear_l(); status_t seekTo_l(int msec); @@ -198,6 +200,7 @@ private: float mRightVolume; int mVideoWidth; int mVideoHeight; + int mAudioSessionId; }; }; // namespace android |