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

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

Browse Source 
Merge commit '82a39f4aabb5b44801690a95fcf61d4f2ab97a8e' into gingerbread-plus-aosp

* commit '82a39f4aabb5b44801690a95fcf61d4f2ab97a8e':
  Add some explicit error log messages
This commit is contained in:
James Dong
2010-09-15 14:55:46 -07:00
committed by Android Git Automerger
parent beb55f572f 82a39f4aab
commit 0cd2472bf8
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

@@ -93,6 +93,9 @@ static int32_t getColorFormat(const char* colorFormat) {
return OMX_COLOR_Format16bitRGB565; return OMX_COLOR_Format16bitRGB565;
} }
LOGE("Uknown color format (%s), please add it to "
"CameraSource::getColorFormat", colorFormat);
CHECK_EQ(0, "Unknown color format"); 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()) { if (mSampleSizes.empty() || // no samples written
err = ERROR_MALFORMED; (!mIsAudio && mNumStssTableEntries == 0) || // no sync frames for video
} else if (OK != checkCodecSpecificData()) { (OK != checkCodecSpecificData())) { // no codec specific data
err = ERROR_MALFORMED; err = ERROR_MALFORMED;
} }
mOwner->trackProgressStatus(this, -1, err); mOwner->trackProgressStatus(this, -1, err);
@@ -1794,13 +1794,13 @@ status_t MPEG4Writer::Track::checkCodecSpecificData() const {
!strcasecmp(MEDIA_MIMETYPE_VIDEO_AVC, mime)) { !strcasecmp(MEDIA_MIMETYPE_VIDEO_AVC, mime)) {
if (!mCodecSpecificData || if (!mCodecSpecificData ||
mCodecSpecificDataSize <= 0) { mCodecSpecificDataSize <= 0) {
// Missing codec specific data LOGE("Missing codec specific data");
return ERROR_MALFORMED; return ERROR_MALFORMED;
} }
} else { } else {
if (mCodecSpecificData || if (mCodecSpecificData ||
mCodecSpecificDataSize > 0) { mCodecSpecificDataSize > 0) {
// Unexepected codec specific data found LOGE("Unexepected codec specific data found");
return ERROR_MALFORMED; return ERROR_MALFORMED;
} }
} }

5
media/libstagefright/OMXCodec.cpp
View File

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