diff options
author | Andreas Huber <andih@google.com> | 2012-09-10 11:36:44 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-10 11:36:45 -0700 |
commit | 66765846726c02db16a0f024f2217990a90802c0 (patch) | |
tree | 9a3b2e33498ef1744f2e353b335f096c230200f6 /media/libstagefright | |
parent | e0f8517eac5dbd4e25aa61fff66c76a42d8fbefc (diff) | |
parent | 1646a0fed94c30a44128b3c379736def4b332033 (diff) | |
download | frameworks_av-66765846726c02db16a0f024f2217990a90802c0.zip frameworks_av-66765846726c02db16a0f024f2217990a90802c0.tar.gz frameworks_av-66765846726c02db16a0f024f2217990a90802c0.tar.bz2 |
Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.cpp | 8 | ||||
-rw-r--r-- | media/libstagefright/wifi-display/source/Serializer.cpp | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index a6aae56..ab16407 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -647,11 +647,10 @@ status_t WifiDisplaySource::PlaybackSession::setupPacketizer() { service->connectDisplay(mBufferQueue); } -#if 0 sp<AudioSource> audioSource = new AudioSource( - AUDIO_SOURCE_MIC, + AUDIO_SOURCE_REMOTE_SUBMIX, 48000 /* sampleRate */, - 2 /* channelCount */); // XXX AUDIO_CHANNEL_IN_STEREO? + 2 /* channelCount */); if (audioSource->initCheck() == OK) { audioSource->setUseLooperTime(true); @@ -670,11 +669,12 @@ status_t WifiDisplaySource::PlaybackSession::setupPacketizer() { looper()->registerHandler(converter); mTracks.add(index, new Track(converter)); + + ALOGI("Successfully instantiated audio source."); } else { ALOGW("Unable to instantiate audio source"); } #endif -#endif return OK; } diff --git a/media/libstagefright/wifi-display/source/Serializer.cpp b/media/libstagefright/wifi-display/source/Serializer.cpp index bd53fc8..0c54bf7 100644 --- a/media/libstagefright/wifi-display/source/Serializer.cpp +++ b/media/libstagefright/wifi-display/source/Serializer.cpp @@ -275,14 +275,7 @@ status_t Serializer::onStart() { } if (err == OK) { -#if 0 schedulePoll(); -#else - // XXX the dongle doesn't appear to have setup the RTP connection - // fully at the time PLAY is called. We have to delay sending data - // for a little bit. - schedulePoll(500000ll); -#endif } return err; |