diff options
author | Andreas Huber <andih@google.com> | 2010-09-21 15:17:42 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 15:17:42 -0700 |
commit | 4d6205a5ceb3e53cdcbf4f473e7bb1509503c1c5 (patch) | |
tree | d49e1542fdd694cc4965662cd2b4799de0526ee4 /media/libstagefright/rtsp/UDPPusher.cpp | |
parent | ee7797e08ca6cdcc1a4d3663f83946a11287ab74 (diff) | |
parent | 43d4f743a9990cebc999d670ffb5a06133b80a54 (diff) | |
download | frameworks_av-4d6205a5ceb3e53cdcbf4f473e7bb1509503c1c5.zip frameworks_av-4d6205a5ceb3e53cdcbf4f473e7bb1509503c1c5.tar.gz frameworks_av-4d6205a5ceb3e53cdcbf4f473e7bb1509503c1c5.tar.bz2 |
am 67738486: Merge "Remove stagefright foundation\'s incompatible logging interface and update callsites." into gingerbread
Merge commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc' into gingerbread-plus-aosp
* commit '67738486d9d1bdc2e6fb0c04698fd74de689acbc':
Remove stagefright foundation's incompatible logging interface and update callsites.
Diffstat (limited to 'media/libstagefright/rtsp/UDPPusher.cpp')
-rw-r--r-- | media/libstagefright/rtsp/UDPPusher.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/media/libstagefright/rtsp/UDPPusher.cpp b/media/libstagefright/rtsp/UDPPusher.cpp index 28a343f..576b3ca 100644 --- a/media/libstagefright/rtsp/UDPPusher.cpp +++ b/media/libstagefright/rtsp/UDPPusher.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "UDPPusher" +#include <utils/Log.h> + #include "UDPPusher.h" #include <media/stagefright/foundation/ABuffer.h> @@ -67,7 +71,7 @@ void UDPPusher::start() { bool UDPPusher::onPush() { uint32_t length; if (fread(&length, 1, sizeof(length), mFile) < sizeof(length)) { - LOG(INFO) << "No more data to push."; + LOGI("No more data to push."); return false; } @@ -77,7 +81,7 @@ bool UDPPusher::onPush() { sp<ABuffer> buffer = new ABuffer(length); if (fread(buffer->data(), 1, length, mFile) < length) { - LOG(ERROR) << "File truncated?."; + LOGE("File truncated?."); return false; } @@ -89,7 +93,7 @@ bool UDPPusher::onPush() { uint32_t timeMs; if (fread(&timeMs, 1, sizeof(timeMs), mFile) < sizeof(timeMs)) { - LOG(INFO) << "No more data to push."; + LOGI("No more data to push."); return false; } @@ -109,7 +113,7 @@ void UDPPusher::onMessageReceived(const sp<AMessage> &msg) { case kWhatPush: { if (!onPush() && !(ntohs(mRemoteAddr.sin_port) & 1)) { - LOG(INFO) << "emulating BYE packet"; + LOGI("emulating BYE packet"); sp<ABuffer> buffer = new ABuffer(8); uint8_t *data = buffer->data(); |