Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e28f62b authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am c910b7ac: Merge "Add some more logging, reduce startup delay to 1 sec." into jb-mr1-dev 

* commit 'c910b7ac':
  Add some more logging, reduce startup delay to 1 sec.
parents 0c82e022 c910b7ac

media/libstagefright/wifi-display/source/Converter.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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);

media/libstagefright/wifi-display/source/PlaybackSession.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

}