diff options
author | Andreas Huber <andih@google.com> | 2012-09-07 16:02:47 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-07 16:02:48 -0700 |
commit | d0c3da34ad99506ccdc05d4b626c81d9cf43834a (patch) | |
tree | 89115d5bda15810c42ce06d61f23fd7b48678eed /media | |
parent | cdf8ad7cf7b08666c023da28d64e5b44000ade11 (diff) | |
parent | 52299d853b340690dfc63890a26710fb53283b3c (diff) | |
download | frameworks_av-d0c3da34ad99506ccdc05d4b626c81d9cf43834a.zip frameworks_av-d0c3da34ad99506ccdc05d4b626c81d9cf43834a.tar.gz frameworks_av-d0c3da34ad99506ccdc05d4b626c81d9cf43834a.tar.bz2 |
Merge "Less verbose logging, lots of references." into jb-mr1-dev
Diffstat (limited to 'media')
3 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/wifi-display/ANetworkSession.cpp b/media/libstagefright/wifi-display/ANetworkSession.cpp index 1c4f535..435e72f 100644 --- a/media/libstagefright/wifi-display/ANetworkSession.cpp +++ b/media/libstagefright/wifi-display/ANetworkSession.cpp @@ -428,8 +428,10 @@ status_t ANetworkSession::Session::writeMore() { status_t err = OK; if (n > 0) { +#if 0 ALOGI("out:"); hexdump(mOutBuffer.c_str(), n); +#endif mOutBuffer.erase(0, n); } else if (n < 0) { diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index 5665093..abd7ec3 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -637,8 +637,8 @@ status_t WifiDisplaySource::PlaybackSession::setupPacketizer() { CHECK(service != NULL); // Add one reference to account for the serializer. - // Add another one for unknown reasons. - err = source->setMaxAcquiredBufferCount(numInputBuffers + 2); + // Add another two for unknown reasons. + err = source->setMaxAcquiredBufferCount(31 /* numInputBuffers + 1 */); CHECK_EQ(err, (status_t)OK); mBufferQueue = source->getBufferQueue(); diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp index 0786f2b..8e8f04a 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_NDEBUG 0 +//#define LOG_NDEBUG 0 #define LOG_TAG "WifiDisplaySource" #include <utils/Log.h> |