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

am 0cd2472b: am 82a39f4a: Merge "Add some explicit error log messages" into gingerbread

Browse Source 
Merge commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f'

* commit '0cd2472bf8a0062b56b9cd4613c44791b32fe42f':
  Add some explicit error log messages
This commit is contained in:
James Dong
2010-09-15 19:02:45 -07:00
committed by Android Git Automerger
parent 6918ab4a05 0cd2472bf8
commit 3dee32bfcd
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/libstagefright/CameraSource.cpp
View File

@@ -98,6 +98,9 @@ static int32_t getColorFormat(const char* colorFormat) {
return OMX_COLOR_Format16bitRGB565;
}
LOGE("Uknown color format (%s), please add it to "
"CameraSource::getColorFormat", colorFormat);
CHECK_EQ(0, "Unknown color format");
}

10
media/libstagefright/MPEG4Writer.cpp
View File

@@ -1675,9 +1675,9 @@ status_t MPEG4Writer::Track::threadEntry() {
}
if (mSampleSizes.empty()) {
err = ERROR_MALFORMED;
} else if (OK != checkCodecSpecificData()) {
if (mSampleSizes.empty() || // no samples written
(!mIsAudio && mNumStssTableEntries == 0) || // no sync frames for video
(OK != checkCodecSpecificData())) { // no codec specific data
err = ERROR_MALFORMED;
}
mOwner->trackProgressStatus(this, -1, err);
@@ -1794,13 +1794,13 @@ status_t MPEG4Writer::Track::checkCodecSpecificData() const {
!strcasecmp(MEDIA_MIMETYPE_VIDEO_AVC, mime)) {
if (!mCodecSpecificData ||
mCodecSpecificDataSize <= 0) {
// Missing codec specific data
LOGE("Missing codec specific data");
return ERROR_MALFORMED;
}
} else {
if (mCodecSpecificData ||
mCodecSpecificDataSize > 0) {
// Unexepected codec specific data found
LOGE("Unexepected codec specific data found");
return ERROR_MALFORMED;
}
}

5
media/libstagefright/OMXCodec.cpp
View File

@@ -826,8 +826,7 @@ status_t OMXCodec::isColorFormatSupported(
if (OMX_ErrorNone != mOMX->getParameter(
mNode, OMX_IndexParamVideoPortFormat,
&portFormat, sizeof(portFormat))) {
return UNKNOWN_ERROR;
break;
}
// Make sure that omx component does not overwrite
// the incremented index (bug 2897413).
@@ -847,6 +846,8 @@ status_t OMXCodec::isColorFormatSupported(
break;
}
}
LOGE("color format %d is not supported", colorFormat);
return UNKNOWN_ERROR;
}