diff options
| author | Marco Nelissen <marcone@google.com> | 2013-11-04 21:54:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-04 21:54:06 -0800 |
| commit | 921688852b72bfa921913b8afe18c0d749c6797d (patch) | |
| tree | 832a17b24c6c1ad774708af9b289df8925ba9881 /media | |
| parent | 2922d230155cb1be7acc0c11bef6f0ca0345bdb7 (diff) | |
| parent | f8a1169d98a09d1473f289c363353d08301576f6 (diff) | |
| download | frameworks_av-921688852b72bfa921913b8afe18c0d749c6797d.zip frameworks_av-921688852b72bfa921913b8afe18c0d749c6797d.tar.gz frameworks_av-921688852b72bfa921913b8afe18c0d749c6797d.tar.bz2 | |
am f8a1169d: Merge "Notify current video size if available" into klp-dev
* commit 'f8a1169d98a09d1473f289c363353d08301576f6':
Notify current video size if available
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp index d8b35d7..f1782cc 100644 --- a/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp +++ b/media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp @@ -201,7 +201,16 @@ void NuPlayer::HTTPLiveSource::onSessionNotify(const sp<AMessage> &msg) { switch (what) { case LiveSession::kWhatPrepared: { - notifyVideoSizeChanged(0, 0); + // notify the current size here if we have it, otherwise report an initial size of (0,0) + sp<AMessage> format = getFormat(false /* audio */); + int32_t width; + int32_t height; + if (format != NULL && + format->findInt32("width", &width) && format->findInt32("height", &height)) { + notifyVideoSizeChanged(width, height); + } else { + notifyVideoSizeChanged(0, 0); + } uint32_t flags = FLAG_CAN_PAUSE; if (mLiveSession->isSeekable()) { |