diff options
| author | Andreas Huber <andih@google.com> | 2012-09-25 16:15:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-25 16:15:53 -0700 |
| commit | c910b7accbed385ce5905e800c16d92290ccd997 (patch) | |
| tree | a4c08fd6c9754b1cd8eddb96be1acb3dc71c51c4 | |
| parent | c7d9afdc7d2181aef7688638fff52859bcdabd65 (diff) | |
| parent | 92f655fe351a5f2eb7d36123d2b687d6e7e3e913 (diff) | |
| download | frameworks_av-c910b7accbed385ce5905e800c16d92290ccd997.zip frameworks_av-c910b7accbed385ce5905e800c16d92290ccd997.tar.gz frameworks_av-c910b7accbed385ce5905e800c16d92290ccd997.tar.bz2 | |
Merge "Add some more logging, reduce startup delay to 1 sec." into jb-mr1-dev
| -rw-r--r-- | media/libstagefright/wifi-display/source/Converter.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/media/libstagefright/wifi-display/source/Converter.cpp b/media/libstagefright/wifi-display/source/Converter.cpp index 577e762..a979a42 100644 --- a/media/libstagefright/wifi-display/source/Converter.cpp +++ b/media/libstagefright/wifi-display/source/Converter.cpp @@ -248,6 +248,8 @@ status_t Converter::feedEncoderInputBuffers() { if (buffer != NULL) { CHECK(buffer->meta()->findInt64("timeUs", &timeUs)); + ALOGV("in: %s timeUs = %lld us", mIsVideo ? "video" : "audio", timeUs); + memcpy(mEncoderInputBuffers.itemAt(bufferIndex)->data(), buffer->data(), buffer->size()); @@ -298,6 +300,8 @@ status_t Converter::doMoreWork() { notify->setInt32("what", kWhatEOS); notify->post(); } else { + ALOGV("out: %s timeUs = %lld us", mIsVideo ? "video" : "audio", timeUs); + sp<ABuffer> buffer = new ABuffer(size); buffer->meta()->setInt64("timeUs", timeUs); diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index bd84c66..be9b159 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -415,8 +415,8 @@ status_t WifiDisplaySource::PlaybackSession::play() { } status_t WifiDisplaySource::PlaybackSession::finishPlay() { - // XXX Give the dongle 3 secs to bind its sockets. - (new AMessage(kWhatFinishPlay, id()))->post(3000000ll); + // XXX Give the dongle a second to bind its sockets. + (new AMessage(kWhatFinishPlay, id()))->post(1000000ll); return OK; } |