diff options
| author | Andreas Huber <andih@google.com> | 2010-08-24 17:56:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 17:56:12 -0700 |
| commit | 5ac7b5def64625fdc9cfaf1bbdd013f5ada241f3 (patch) | |
| tree | 4db7bc90964226796b53d3092b6f1ad00a769992 /media/libstagefright/include | |
| parent | 627c790c1f7c8fd44dc50abb03885aa5a075d418 (diff) | |
| parent | aae7b2274a1521a1a82bbe560e03a046d116bb40 (diff) | |
| download | frameworks_av-5ac7b5def64625fdc9cfaf1bbdd013f5ada241f3.zip frameworks_av-5ac7b5def64625fdc9cfaf1bbdd013f5ada241f3.tar.gz frameworks_av-5ac7b5def64625fdc9cfaf1bbdd013f5ada241f3.tar.bz2 | |
am 67ca90b3: am 6b6ae996: Merge "A first shot at proper support for seeking of rtsp streams." into gingerbread
Merge commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2'
* commit '67ca90b339feb8bb6889ca289a9dbc82c447b0d2':
A first shot at proper support for seeking of rtsp streams.
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/ARTSPController.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/include/ARTSPController.h b/media/libstagefright/include/ARTSPController.h index 2542e4e..7020564 100644 --- a/media/libstagefright/include/ARTSPController.h +++ b/media/libstagefright/include/ARTSPController.h @@ -33,6 +33,8 @@ struct ARTSPController : public MediaExtractor { status_t connect(const char *url); void disconnect(); + void seek(int64_t timeUs); + virtual size_t countTracks(); virtual sp<MediaSource> getTrack(size_t index); diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index f34eb45..f5df1b5 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -182,6 +182,7 @@ private: sp<ALooper> mLooper; sp<ARTSPController> mRTSPController; + int64_t mRTSPTimeOffset; sp<ARTPSession> mRTPSession; sp<UDPPusher> mRTPPusher, mRTCPPusher; |