summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp
diff options
context:
space:
mode:
Diffstat (limited to 'media/libstagefright/rtsp')
-rw-r--r--media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp6
-rw-r--r--media/libstagefright/rtsp/APacketSource.cpp4
-rw-r--r--media/libstagefright/rtsp/ARTPConnection.cpp4
-rw-r--r--media/libstagefright/rtsp/ARTPSession.cpp6
-rw-r--r--media/libstagefright/rtsp/ARTPWriter.cpp4
-rw-r--r--media/libstagefright/rtsp/ARTSPConnection.cpp4
-rw-r--r--media/libstagefright/rtsp/ASessionDescription.cpp2
-rw-r--r--media/libstagefright/rtsp/MyHandler.h30
-rw-r--r--media/libstagefright/rtsp/UDPPusher.cpp6
9 files changed, 33 insertions, 33 deletions
diff --git a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
index 11d9c22..b0c7007 100644
--- a/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
+++ b/media/libstagefright/rtsp/AMPEG4AudioAssembler.cpp
@@ -196,7 +196,7 @@ static status_t parseAudioSpecificConfig(ABitReader *bits, sp<ABuffer> *asc) {
unsigned syncExtensionType = bits->getBits(11);
if (syncExtensionType == 0x2b7) {
- LOGI("found syncExtension");
+ ALOGI("found syncExtension");
CHECK_EQ(parseAudioObjectType(bits, &extensionAudioObjectType),
(status_t)OK);
@@ -217,7 +217,7 @@ static status_t parseAudioSpecificConfig(ABitReader *bits, sp<ABuffer> *asc) {
// Apparently an extension is always considered an even
// multiple of 8 bits long.
- LOGI("Skipping %d bits after sync extension",
+ ALOGI("Skipping %d bits after sync extension",
8 - (numBitsInExtension & 7));
bits->skipBits(8 - (numBitsInExtension & 7));
@@ -424,7 +424,7 @@ sp<ABuffer> AMPEG4AudioAssembler::removeLATMFraming(const sp<ABuffer> &buffer) {
}
if (offset < buffer->size()) {
- LOGI("ignoring %d bytes of trailing data", buffer->size() - offset);
+ ALOGI("ignoring %d bytes of trailing data", buffer->size() - offset);
}
CHECK_LE(offset, buffer->size());
diff --git a/media/libstagefright/rtsp/APacketSource.cpp b/media/libstagefright/rtsp/APacketSource.cpp
index 3f4cdb5..6cf1301 100644
--- a/media/libstagefright/rtsp/APacketSource.cpp
+++ b/media/libstagefright/rtsp/APacketSource.cpp
@@ -193,7 +193,7 @@ static sp<ABuffer> MakeAVCCodecSpecificData(
if (i == 0) {
FindAVCDimensions(nal, width, height);
- LOGI("dimensions %dx%d", *width, *height);
+ ALOGI("dimensions %dx%d", *width, *height);
}
}
@@ -371,7 +371,7 @@ static sp<ABuffer> MakeMPEG4VideoCodecSpecificData(
return NULL;
}
- LOGI("VOL dimensions = %dx%d", *width, *height);
+ ALOGI("VOL dimensions = %dx%d", *width, *height);
size_t len1 = config->size() + GetSizeWidth(config->size()) + 1;
size_t len2 = len1 + GetSizeWidth(len1) + 1 + 13;
diff --git a/media/libstagefright/rtsp/ARTPConnection.cpp b/media/libstagefright/rtsp/ARTPConnection.cpp
index c5d8740..853ea14 100644
--- a/media/libstagefright/rtsp/ARTPConnection.cpp
+++ b/media/libstagefright/rtsp/ARTPConnection.cpp
@@ -396,7 +396,7 @@ status_t ARTPConnection::receive(StreamInfo *s, bool receiveRTP) {
buffer->setRange(0, nbytes);
- // LOGI("received %d bytes.", buffer->size());
+ // ALOGI("received %d bytes.", buffer->size());
status_t err;
if (receiveRTP) {
@@ -606,7 +606,7 @@ status_t ARTPConnection::parseSR(
uint32_t rtpTime = u32at(&data[16]);
#if 0
- LOGI("XXX timeUpdate: ssrc=0x%08x, rtpTime %u == ntpTime %.3f",
+ ALOGI("XXX timeUpdate: ssrc=0x%08x, rtpTime %u == ntpTime %.3f",
id,
rtpTime,
(ntpTime >> 32) + (double)(ntpTime & 0xffffffff) / (1ll << 32));
diff --git a/media/libstagefright/rtsp/ARTPSession.cpp b/media/libstagefright/rtsp/ARTPSession.cpp
index c6bcb12..5783beb 100644
--- a/media/libstagefright/rtsp/ARTPSession.cpp
+++ b/media/libstagefright/rtsp/ARTPSession.cpp
@@ -159,7 +159,7 @@ void ARTPSession::onMessageReceived(const sp<AMessage> &msg) {
printf("access unit complete size=%d\tntp-time=0x%016llx\n",
accessUnit->size(), ntpTime);
#else
- LOGI("access unit complete, size=%d, ntp-time=%llu",
+ ALOGI("access unit complete, size=%d, ntp-time=%llu",
accessUnit->size(), ntpTime);
hexdump(accessUnit->data(), accessUnit->size());
#endif
@@ -170,7 +170,7 @@ void ARTPSession::onMessageReceived(const sp<AMessage> &msg) {
CHECK(!memcmp("\x00\x00\x00\x01", accessUnit->data(), 4));
unsigned x = accessUnit->data()[4];
- LOGI("access unit complete: nalType=0x%02x, nalRefIdc=0x%02x",
+ ALOGI("access unit complete: nalType=0x%02x, nalRefIdc=0x%02x",
x & 0x1f, (x & 0x60) >> 5);
#endif
@@ -181,7 +181,7 @@ void ARTPSession::onMessageReceived(const sp<AMessage> &msg) {
int32_t damaged;
if (accessUnit->meta()->findInt32("damaged", &damaged)
&& damaged != 0) {
- LOGI("ignoring damaged AU");
+ ALOGI("ignoring damaged AU");
} else
#endif
{
diff --git a/media/libstagefright/rtsp/ARTPWriter.cpp b/media/libstagefright/rtsp/ARTPWriter.cpp
index b602511..0d07043 100644
--- a/media/libstagefright/rtsp/ARTPWriter.cpp
+++ b/media/libstagefright/rtsp/ARTPWriter.cpp
@@ -269,7 +269,7 @@ void ARTPWriter::onRead(const sp<AMessage> &msg) {
status_t err = mSource->read(&mediaBuf);
if (err != OK) {
- LOGI("reached EOS.");
+ ALOGI("reached EOS.");
Mutex::Autolock autoLock(mLock);
mFlags |= kFlagEOS;
@@ -520,7 +520,7 @@ void ARTPWriter::dumpSessionDesc() {
sdp.append("a=fmtp:" PT_STR " octed-align\r\n");
}
- LOGI("%s", sdp.c_str());
+ ALOGI("%s", sdp.c_str());
}
void ARTPWriter::makeH264SPropParamSets(MediaBuffer *buffer) {
diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp
index d8107bc..12cca13 100644
--- a/media/libstagefright/rtsp/ARTSPConnection.cpp
+++ b/media/libstagefright/rtsp/ARTSPConnection.cpp
@@ -624,7 +624,7 @@ bool ARTSPConnection::receiveRTSPReponse() {
sp<ARTSPResponse> response = new ARTSPResponse;
response->mStatusLine = statusLine;
- LOGI("status: %s", response->mStatusLine.c_str());
+ ALOGI("status: %s", response->mStatusLine.c_str());
ssize_t space1 = response->mStatusLine.find(" ");
if (space1 < 0) {
@@ -740,7 +740,7 @@ bool ARTSPConnection::receiveRTSPReponse() {
msg->setMessage("reply", reply);
msg->setString("request", request.c_str(), request.size());
- LOGI("re-sending request with authentication headers...");
+ ALOGI("re-sending request with authentication headers...");
onSendRequest(msg);
return true;
diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp
index 56fdd9d..a9b3330 100644
--- a/media/libstagefright/rtsp/ASessionDescription.cpp
+++ b/media/libstagefright/rtsp/ASessionDescription.cpp
@@ -80,7 +80,7 @@ bool ASessionDescription::parse(const void *data, size_t size) {
return false;
}
- LOGI("%s", line.c_str());
+ ALOGI("%s", line.c_str());
switch (line.c_str()[0]) {
case 'v':
diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h
index 21ef298..53691d1 100644
--- a/media/libstagefright/rtsp/MyHandler.h
+++ b/media/libstagefright/rtsp/MyHandler.h
@@ -155,7 +155,7 @@ struct MyHandler : public AHandler {
mSessionURL.append(StringPrintf("%u", port));
mSessionURL.append(path);
- LOGI("rewritten session url: '%s'", mSessionURL.c_str());
+ ALOGI("rewritten session url: '%s'", mSessionURL.c_str());
}
mSessionHost = host;
@@ -283,7 +283,7 @@ struct MyHandler : public AHandler {
if (!GetAttribute(transport.c_str(),
"server_port",
&server_port)) {
- LOGI("Missing 'server_port' field in Transport response.");
+ ALOGI("Missing 'server_port' field in Transport response.");
return false;
}
@@ -354,7 +354,7 @@ struct MyHandler : public AHandler {
int32_t result;
CHECK(msg->findInt32("result", &result));
- LOGI("connection request completed with result %d (%s)",
+ ALOGI("connection request completed with result %d (%s)",
result, strerror(-result));
if (result == OK) {
@@ -392,7 +392,7 @@ struct MyHandler : public AHandler {
int32_t result;
CHECK(msg->findInt32("result", &result));
- LOGI("DESCRIBE completed with result %d (%s)",
+ ALOGI("DESCRIBE completed with result %d (%s)",
result, strerror(-result));
if (result == OK) {
@@ -499,7 +499,7 @@ struct MyHandler : public AHandler {
int32_t result;
CHECK(msg->findInt32("result", &result));
- LOGI("SETUP(%d) completed with result %d (%s)",
+ ALOGI("SETUP(%d) completed with result %d (%s)",
index, result, strerror(-result));
if (result == OK) {
@@ -540,7 +540,7 @@ struct MyHandler : public AHandler {
} else {
mKeepAliveTimeoutUs = timeoutSecs * 1000000ll;
- LOGI("server specified timeout of %lu secs.",
+ ALOGI("server specified timeout of %lu secs.",
timeoutSecs);
}
}
@@ -625,7 +625,7 @@ struct MyHandler : public AHandler {
int32_t result;
CHECK(msg->findInt32("result", &result));
- LOGI("PLAY completed with result %d (%s)",
+ ALOGI("PLAY completed with result %d (%s)",
result, strerror(-result));
if (result == OK) {
@@ -682,7 +682,7 @@ struct MyHandler : public AHandler {
int32_t result;
CHECK(msg->findInt32("result", &result));
- LOGI("OPTIONS completed with result %d (%s)",
+ ALOGI("OPTIONS completed with result %d (%s)",
result, strerror(-result));
int32_t generation;
@@ -759,7 +759,7 @@ struct MyHandler : public AHandler {
int32_t result;
CHECK(msg->findInt32("result", &result));
- LOGI("TEARDOWN completed with result %d (%s)",
+ ALOGI("TEARDOWN completed with result %d (%s)",
result, strerror(-result));
sp<AMessage> reply = new AMessage('disc', id());
@@ -793,11 +793,11 @@ struct MyHandler : public AHandler {
if (mNumAccessUnitsReceived == 0) {
#if 1
- LOGI("stream ended? aborting.");
+ ALOGI("stream ended? aborting.");
(new AMessage('abor', id()))->post();
break;
#else
- LOGI("haven't seen an AU in a looong time.");
+ ALOGI("haven't seen an AU in a looong time.");
#endif
}
@@ -848,7 +848,7 @@ struct MyHandler : public AHandler {
int32_t eos;
if (msg->findInt32("eos", &eos)) {
- LOGI("received BYE on track index %d", trackIndex);
+ ALOGI("received BYE on track index %d", trackIndex);
#if 0
track->mPacketSource->signalEOS(ERROR_END_OF_STREAM);
#endif
@@ -961,7 +961,7 @@ struct MyHandler : public AHandler {
int32_t result;
CHECK(msg->findInt32("result", &result));
- LOGI("PLAY completed with result %d (%s)",
+ ALOGI("PLAY completed with result %d (%s)",
result, strerror(-result));
mCheckPending = false;
@@ -983,7 +983,7 @@ struct MyHandler : public AHandler {
ALOGV("rtp-info: %s", response->mHeaders.valueAt(i).c_str());
- LOGI("seek completed.");
+ ALOGI("seek completed.");
}
}
@@ -1101,7 +1101,7 @@ struct MyHandler : public AHandler {
if (!ASessionDescription::parseNTPRange(val.c_str(), &npt1, &npt2)) {
// This is a live stream and therefore not seekable.
- LOGI("This is a live stream");
+ ALOGI("This is a live stream");
return;
}
diff --git a/media/libstagefright/rtsp/UDPPusher.cpp b/media/libstagefright/rtsp/UDPPusher.cpp
index 576b3ca..6a4c87b 100644
--- a/media/libstagefright/rtsp/UDPPusher.cpp
+++ b/media/libstagefright/rtsp/UDPPusher.cpp
@@ -71,7 +71,7 @@ void UDPPusher::start() {
bool UDPPusher::onPush() {
uint32_t length;
if (fread(&length, 1, sizeof(length), mFile) < sizeof(length)) {
- LOGI("No more data to push.");
+ ALOGI("No more data to push.");
return false;
}
@@ -93,7 +93,7 @@ bool UDPPusher::onPush() {
uint32_t timeMs;
if (fread(&timeMs, 1, sizeof(timeMs), mFile) < sizeof(timeMs)) {
- LOGI("No more data to push.");
+ ALOGI("No more data to push.");
return false;
}
@@ -113,7 +113,7 @@ void UDPPusher::onMessageReceived(const sp<AMessage> &msg) {
case kWhatPush:
{
if (!onPush() && !(ntohs(mRemoteAddr.sin_port) & 1)) {
- LOGI("emulating BYE packet");
+ ALOGI("emulating BYE packet");
sp<ABuffer> buffer = new ABuffer(8);
uint8_t *data = buffer->data();
generated by cgit v1.1 at 2024-05-17 09:38:53 +0000