diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-24 17:10:07 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-04-30 16:56:10 -0700 |
| commit | 3a474aa67fc31505740526dd249d96204c08bf79 (patch) | |
| tree | 4db784ee57ffad037fa2ded86d0fd8b3a40173d5 /include/media/mediaplayer.h | |
| parent | a8df0b716bdfda1e10790e6f7297eeff83d2e52a (diff) | |
| download | frameworks_av-3a474aa67fc31505740526dd249d96204c08bf79.zip frameworks_av-3a474aa67fc31505740526dd249d96204c08bf79.tar.gz frameworks_av-3a474aa67fc31505740526dd249d96204c08bf79.tar.bz2 | |
stagefright: support setting/getting playback/sync config in MediaSync
Bug: 18249558
Bug: 19666434
Bug: 20057497
Change-Id: I5868b17423d7c20cfaf4a399f3eb67bfba440605
Diffstat (limited to 'include/media/mediaplayer.h')
| -rw-r--r-- | include/media/mediaplayer.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 256fa9a..3fe749c 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -20,6 +20,8 @@ #include <arpa/inet.h> #include <binder/IMemory.h> + +#include <media/AudioResamplerPublic.h> #include <media/IMediaPlayerClient.h> #include <media/IMediaPlayer.h> #include <media/IMediaDeathNotifier.h> @@ -32,8 +34,9 @@ class ANativeWindow; namespace android { -class Surface; +struct AVSyncSettings; class IGraphicBufferProducer; +class Surface; enum media_event_type { MEDIA_NOP = 0, // interface test message @@ -223,7 +226,12 @@ public: status_t stop(); status_t pause(); bool isPlaying(); - status_t setPlaybackRate(float rate); + status_t setPlaybackSettings(const AudioPlaybackRate& rate); + status_t getPlaybackSettings(AudioPlaybackRate* rate /* nonnull */); + status_t setSyncSettings(const AVSyncSettings& sync, float videoFpsHint); + status_t getSyncSettings( + AVSyncSettings* sync /* nonnull */, + float* videoFps /* nonnull */); status_t getVideoWidth(int *w); status_t getVideoHeight(int *h); status_t seekTo(int msec); @@ -278,7 +286,6 @@ private: int mVideoWidth; int mVideoHeight; int mAudioSessionId; - float mPlaybackRate; float mSendLevel; struct sockaddr_in mRetransmitEndpoint; bool mRetransmitEndpointValid; |