Merge "Add some explicit error log messages" into gingerbread (82a39f4a) · Commits · e / os / android_frameworks_base

media/libstagefright/CameraSource.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,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");
		}

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -811,8 +811,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).
		@@ -832,6 +831,8 @@ status_t OMXCodec::isColorFormatSupported(
		break;
		}
		}

		LOGE("color format %d is not supported", colorFormat);
		return UNKNOWN_ERROR;
		}