Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 24530 into eclair

Browse Source 
* changes:
  Add component name to informational logging in OMXCodec.cpp
This commit is contained in:
Android (Google) Code Review
2009-09-10 13:27:50 -04:00
parent 2d3f9c5593 e087373d0b
commit d9ca6a79c6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/libstagefright/OMXCodec.cpp
View File

@@ -80,6 +80,7 @@ static const CodecInfo kEncoderInfo[] = {
{ "video/avc", "OMX.PV.avcenc" }, { "video/avc", "OMX.PV.avcenc" },
}; };
#define CODEC_LOGI(x, ...) LOGI("[%s] "x, mComponentName, ##__VA_ARGS__)
#define CODEC_LOGV(x, ...) LOGV("[%s] "x, mComponentName, ##__VA_ARGS__) #define CODEC_LOGV(x, ...) LOGV("[%s] "x, mComponentName, ##__VA_ARGS__)
struct OMXCodecObserver : public BnOMXObserver { struct OMXCodecObserver : public BnOMXObserver {
@@ -424,7 +425,7 @@ status_t OMXCodec::setVideoPortFormatType(
// CHECK_EQ(format.nIndex, index); // CHECK_EQ(format.nIndex, index);
#if 1 #if 1
LOGI("portIndex: %ld, index: %ld, eCompressionFormat=%d eColorFormat=%d", CODEC_LOGI("portIndex: %ld, index: %ld, eCompressionFormat=%d eColorFormat=%d",
portIndex, portIndex,
index, format.eCompressionFormat, format.eColorFormat); index, format.eCompressionFormat, format.eColorFormat);
#endif #endif
@@ -457,7 +458,7 @@ status_t OMXCodec::setVideoPortFormatType(
return UNKNOWN_ERROR; return UNKNOWN_ERROR;
} }
LOGI("found a match."); CODEC_LOGI("found a match.");
status_t err = mOMX->set_parameter( status_t err = mOMX->set_parameter(
mNode, OMX_IndexParamVideoPortFormat, mNode, OMX_IndexParamVideoPortFormat,
&format, sizeof(format)); &format, sizeof(format));
@@ -467,7 +468,7 @@ status_t OMXCodec::setVideoPortFormatType(
void OMXCodec::setVideoInputFormat( void OMXCodec::setVideoInputFormat(
const char *mime, OMX_U32 width, OMX_U32 height) { const char *mime, OMX_U32 width, OMX_U32 height) {
LOGI("setVideoInputFormat width=%ld, height=%ld", width, height); CODEC_LOGI("setVideoInputFormat width=%ld, height=%ld", width, height);
OMX_VIDEO_CODINGTYPE compressionFormat = OMX_VIDEO_CodingUnused; OMX_VIDEO_CODINGTYPE compressionFormat = OMX_VIDEO_CodingUnused;
if (!strcasecmp("video/avc", mime)) { if (!strcasecmp("video/avc", mime)) {
@@ -527,7 +528,7 @@ void OMXCodec::setVideoInputFormat(
CHECK_EQ(err, OK); CHECK_EQ(err, OK);
def.nBufferSize = (width * height * 2); // (width * height * 3) / 2; def.nBufferSize = (width * height * 2); // (width * height * 3) / 2;
LOGI("Setting nBufferSize = %ld", def.nBufferSize); CODEC_LOGI("Setting nBufferSize = %ld", def.nBufferSize);
CHECK_EQ(def.eDomain, OMX_PortDomainVideo); CHECK_EQ(def.eDomain, OMX_PortDomainVideo);
@@ -543,7 +544,7 @@ void OMXCodec::setVideoInputFormat(
void OMXCodec::setVideoOutputFormat( void OMXCodec::setVideoOutputFormat(
const char *mime, OMX_U32 width, OMX_U32 height) { const char *mime, OMX_U32 width, OMX_U32 height) {
LOGI("setVideoOutputFormat width=%ld, height=%ld", width, height); CODEC_LOGI("setVideoOutputFormat width=%ld, height=%ld", width, height);
OMX_VIDEO_CODINGTYPE compressionFormat = OMX_VIDEO_CodingUnused; OMX_VIDEO_CODINGTYPE compressionFormat = OMX_VIDEO_CodingUnused;
if (!strcasecmp("video/avc", mime)) { if (!strcasecmp("video/avc", mime)) {