diff options
author | Andreas Huber <andih@google.com> | 2013-06-03 08:48:27 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-03 08:48:27 -0700 |
commit | 7c684c622110af460025eff85082030947278430 (patch) | |
tree | 3e29ab57fde237f80242d1c479968126d757368f /include | |
parent | faca94d1773afb50fb8aa4eb00ca213d7c9d2bec (diff) | |
parent | f9bb8358e454be6dc88403171db7e0e182407f17 (diff) | |
download | frameworks_av-7c684c622110af460025eff85082030947278430.zip frameworks_av-7c684c622110af460025eff85082030947278430.tar.gz frameworks_av-7c684c622110af460025eff85082030947278430.tar.bz2 |
am f9bb8358: am b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.
* commit 'f9bb8358e454be6dc88403171db7e0e182407f17':
Update HTTP proxy configuration for all media playback inside stagefright.
Diffstat (limited to 'include')
-rw-r--r-- | include/media/IMediaPlayerService.h | 3 | ||||
-rw-r--r-- | include/media/MediaPlayerInterface.h | 5 | ||||
-rw-r--r-- | include/media/mediaplayer.h | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h index 182d563..fef7af2 100644 --- a/include/media/IMediaPlayerService.h +++ b/include/media/IMediaPlayerService.h @@ -89,6 +89,9 @@ public: virtual void addBatteryData(uint32_t params) = 0; virtual status_t pullBatteryData(Parcel* reply) = 0; + + virtual status_t updateProxyConfig( + const char *host, int32_t port, const char *exclusionList) = 0; }; // ---------------------------------------------------------------------------- diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h index 8fc72c3..9a75f81 100644 --- a/include/media/MediaPlayerInterface.h +++ b/include/media/MediaPlayerInterface.h @@ -198,6 +198,11 @@ public: return INVALID_OPERATION; } + virtual status_t updateProxyConfig( + const char *host, int32_t port, const char *exclusionList) { + return INVALID_OPERATION; + } + private: friend class MediaPlayerService; diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index e5aa033..14381c7 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -232,6 +232,9 @@ public: status_t setRetransmitEndpoint(const char* addrString, uint16_t port); status_t setNextMediaPlayer(const sp<MediaPlayer>& player); + status_t updateProxyConfig( + const char *host, int32_t port, const char *exclusionList); + private: void clear_l(); status_t seekTo_l(int msec); |