Merge "Fix missing breaks in the profile/level conversion code in M4vH263 encoder" (4f4d72de) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp

+6 −1

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@ static status_t ConvertOmxProfileLevel(
		profileLevel = CORE_PROFILE_LEVEL2;
		break;
		}
		break;
		default:
		LOGE("Unsupported profile (%d) for H263", omxProfile);
		return BAD_VALUE;
		@@ -75,6 +76,7 @@ static status_t ConvertOmxProfileLevel(
		omxLevel);
		return BAD_VALUE;
		}
		break;
		case OMX_VIDEO_MPEG4ProfileSimpleScalable:
		switch (omxLevel) {
		case OMX_VIDEO_MPEG4Level0b:
		@@ -91,6 +93,7 @@ static status_t ConvertOmxProfileLevel(
		"scalable profile", omxLevel);
		return BAD_VALUE;
		}
		break;
		case OMX_VIDEO_MPEG4ProfileCore:
		switch (omxLevel) {
		case OMX_VIDEO_MPEG4Level1:
		@@ -104,6 +107,7 @@ static status_t ConvertOmxProfileLevel(
		"profile", omxLevel);
		return BAD_VALUE;
		}
		break;
		case OMX_VIDEO_MPEG4ProfileCoreScalable:
		switch (omxLevel) {
		case OMX_VIDEO_MPEG4Level1:
		@@ -120,6 +124,7 @@ static status_t ConvertOmxProfileLevel(
		"scalable profile", omxLevel);
		return BAD_VALUE;
		}
		break;
		default:
		LOGE("Unsupported MPEG4 profile (%d)", omxProfile);
		return BAD_VALUE;