Merge "AudioFormat: Uncomment conversion for EAC3-JOC" into pi-dev (c0ed0692) · Commits · e / os / android_frameworks_base

core/jni/android_media_AudioFormat.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -81,8 +81,8 @@ static inline audio_format_t audioFormatToNative(int audioFormat)
	return AUDIO_FORMAT_AAC; // FIXME temporary value, needs addition of xHE-AAC		return AUDIO_FORMAT_AAC; // FIXME temporary value, needs addition of xHE-AAC
	case ENCODING_AC4:		case ENCODING_AC4:
	return AUDIO_FORMAT_AC4;		return AUDIO_FORMAT_AC4;
	// case ENCODING_E_AC3_JOC: // FIXME Not defined on the native side yet		case ENCODING_E_AC3_JOC:
	// return AUDIO_FORMAT_E_AC3_JOC;		return AUDIO_FORMAT_E_AC3_JOC;
	case ENCODING_DEFAULT:		case ENCODING_DEFAULT:
	return AUDIO_FORMAT_DEFAULT;		return AUDIO_FORMAT_DEFAULT;
	default:		default:
	@@ -133,8 +133,8 @@ static inline int audioFormatFromNative(audio_format_t nativeFormat)
	// return ENCODING_AAC_XHE;		// return ENCODING_AAC_XHE;
	case AUDIO_FORMAT_AC4:		case AUDIO_FORMAT_AC4:
	return ENCODING_AC4;		return ENCODING_AC4;
	// case AUDIO_FORMAT_E_AC3_JOC: // FIXME Not defined on the native side yet		case AUDIO_FORMAT_E_AC3_JOC:
	// return ENCODING_E_AC3_JOC;		return ENCODING_E_AC3_JOC;
	case AUDIO_FORMAT_DEFAULT:		case AUDIO_FORMAT_DEFAULT:
	return ENCODING_DEFAULT;		return ENCODING_DEFAULT;
	default:		default: