summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp/ASessionDescription.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-09-21 15:17:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-21 15:17:42 -0700
commit4d6205a5ceb3e53cdcbf4f473e7bb1509503c1c5 (patch)
treed49e1542fdd694cc4965662cd2b4799de0526ee4 /media/libstagefright/rtsp/ASessionDescription.cpp
parentee7797e08ca6cdcc1a4d3663f83946a11287ab74 (diff)
parent43d4f743a9990cebc999d670ffb5a06133b80a54 (diff)
downloadframeworks_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/ASessionDescription.cpp')
-rw-r--r--media/libstagefright/rtsp/ASessionDescription.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp
index 4ea7fda..0db3595 100644
--- a/media/libstagefright/rtsp/ASessionDescription.cpp
+++ b/media/libstagefright/rtsp/ASessionDescription.cpp
@@ -14,6 +14,10 @@
* limitations under the License.
*/
+//#define LOG_NDEBUG 0
+#define LOG_TAG "ASessionDescription"
+#include <utils/Log.h>
+
#include "ASessionDescription.h"
#include <media/stagefright/foundation/ADebug.h>
@@ -49,7 +53,7 @@ bool ASessionDescription::parse(const void *data, size_t size) {
mFormats.push(AString("[root]"));
AString desc((const char *)data, size);
- LOG(INFO) << desc;
+ LOGI("%s", desc.c_str());
size_t i = 0;
for (;;) {
@@ -102,7 +106,7 @@ bool ASessionDescription::parse(const void *data, size_t size) {
key.trim();
value.trim();
- LOG(VERBOSE) << "adding '" << key << "' => '" << value << "'";
+ LOGV("adding '%s' => '%s'", key.c_str(), value.c_str());
mTracks.editItemAt(mTracks.size() - 1).add(key, value);
break;
@@ -110,7 +114,8 @@ bool ASessionDescription::parse(const void *data, size_t size) {
case 'm':
{
- LOG(VERBOSE) << "new section '" << AString(line, 2, line.size() - 2) << "'";
+ LOGV("new section '%s'",
+ AString(line, 2, line.size() - 2).c_str());
mTracks.push(Attribs());
mFormats.push(AString(line, 2, line.size() - 2));
@@ -129,7 +134,7 @@ bool ASessionDescription::parse(const void *data, size_t size) {
key.trim();
value.trim();
- LOG(VERBOSE) << "adding '" << key << "' => '" << value << "'";
+ LOGV("adding '%s' => '%s'", key.c_str(), value.c_str());
mTracks.editItemAt(mTracks.size() - 1).add(key, value);
break;