Remove OMX.PV.* components from OMXCodec.cpp (5592bcc5) · Commits · e / os / android_frameworks_base

media/libstagefright/OMXCodec.cpp

+6 −30

Original line number	Diff line number	Diff line
		@@ -156,19 +156,15 @@ static const CodecInfo kDecoderInfo[] = {
		// { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.Nvidia.mp3.decoder" },
		// { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.TI.MP3.decode" },
		{ MEDIA_MIMETYPE_AUDIO_MPEG, "MP3Decoder" },
		// { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.PV.mp3dec" },
		// { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.TI.AMR.decode" },
		// { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.Nvidia.amr.decoder" },
		{ MEDIA_MIMETYPE_AUDIO_AMR_NB, "AMRNBDecoder" },
		// { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.PV.amrdec" },
		// { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.Nvidia.amrwb.decoder" },
		{ MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.TI.WBAMR.decode" },
		{ MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBDecoder" },
		// { MEDIA_MIMETYPE_AUDIO_AMR_WB, "OMX.PV.amrdec" },
		// { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.Nvidia.aac.decoder" },
		{ MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.decode" },
		{ MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder" },
		// { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacdec" },
		{ MEDIA_MIMETYPE_AUDIO_G711_ALAW, "G711Decoder" },
		{ MEDIA_MIMETYPE_AUDIO_G711_MLAW, "G711Decoder" },
		// { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.Nvidia.mp4.decode" },
		@@ -177,20 +173,17 @@ static const CodecInfo kDecoderInfo[] = {
		{ MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.Decoder" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.SEC.MPEG4.Decoder" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Decoder" },
		// { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.PV.mpeg4dec" },
		// { MEDIA_MIMETYPE_VIDEO_H263, "OMX.Nvidia.h263.decode" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.7x30.video.decoder.h263" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.video.decoder.h263" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "OMX.SEC.H263.Decoder" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "M4vH263Decoder" },
		// { MEDIA_MIMETYPE_VIDEO_H263, "OMX.PV.h263dec" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.Nvidia.h264.decode" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.7x30.video.decoder.avc" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.video.decoder.avc" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.Video.Decoder" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.SEC.AVC.Decoder" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "AVCDecoder" },
		// { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.PV.avcdec" },
		{ MEDIA_MIMETYPE_AUDIO_VORBIS, "VorbisDecoder" },
		{ MEDIA_MIMETYPE_VIDEO_VPX, "VPXDecoder" },
		};
		@@ -202,28 +195,24 @@ static const CodecInfo kEncoderInfo[] = {
		{ MEDIA_MIMETYPE_AUDIO_AMR_WB, "AMRWBEncoder" },
		{ MEDIA_MIMETYPE_AUDIO_AAC, "OMX.TI.AAC.encode" },
		{ MEDIA_MIMETYPE_AUDIO_AAC, "AACEncoder" },
		// { MEDIA_MIMETYPE_AUDIO_AAC, "OMX.PV.aacenc" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.7x30.video.encoder.mpeg4" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.video.encoder.mpeg4" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.encoder" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.Nvidia.mp4.encoder" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.SEC.MPEG4.Encoder" },
		{ MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Encoder" },
		// { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.PV.mpeg4enc" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.7x30.video.encoder.h263" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.video.encoder.h263" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "OMX.TI.Video.encoder" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "OMX.Nvidia.h263.encoder" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "OMX.SEC.H263.Encoder" },
		{ MEDIA_MIMETYPE_VIDEO_H263, "M4vH263Encoder" },
		// { MEDIA_MIMETYPE_VIDEO_H263, "OMX.PV.h263enc" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.7x30.video.encoder.avc" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.video.encoder.avc" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.Video.encoder" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.Nvidia.h264.encoder" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "OMX.SEC.AVC.Encoder" },
		{ MEDIA_MIMETYPE_VIDEO_AVC, "AVCEncoder" },
		// { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.PV.avcenc" },
		};

		#undef OPTIONAL
		@@ -318,16 +307,15 @@ static void InitOMXParams(T *params) {
		}

		static bool IsSoftwareCodec(const char *componentName) {
		if (!strncmp("OMX.PV.", componentName, 7)) {
		return true;
		if (!strncmp("OMX.", componentName, 4)) {
		return false;
		}

		return false;
		return true;
		}

		// A sort order in which non-OMX components are first,
		// followed by software codecs, i.e. OMX.PV.*, followed
		// by all the others.
		// followed by software codecs, and followed by all the others.
		static int CompareSoftwareCodecsFirst(
		const String8 elem1, const String8 elem2) {
		bool isNotOMX1 = strncmp(elem1->string(), "OMX.", 4);
		@@ -368,9 +356,6 @@ uint32_t OMXCodec::getComponentQuirks(
		quirks \|= kDecoderLiesAboutNumberOfChannels;
		}

		if (!strcmp(componentName, "OMX.PV.avcdec")) {
		quirks \|= kWantsNALFragments;
		}
		if (!strcmp(componentName, "OMX.TI.MP3.decode")) {
		quirks \|= kNeedsFlushBeforeDisable;
		quirks \|= kDecoderLiesAboutNumberOfChannels;
		@@ -3881,17 +3866,8 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) {
		CHECK(!"Unknown compression format.");
		}

		if (!strcmp(mComponentName, "OMX.PV.avcdec")) {
		// This component appears to be lying to me.
		mOutputFormat->setInt32(
		kKeyWidth, (video_def->nFrameWidth + 15) & -16);
		mOutputFormat->setInt32(
		kKeyHeight, (video_def->nFrameHeight + 15) & -16);
		} else {
		mOutputFormat->setInt32(kKeyWidth, video_def->nFrameWidth);
		mOutputFormat->setInt32(kKeyHeight, video_def->nFrameHeight);
		}

		mOutputFormat->setInt32(kKeyColorFormat, video_def->eColorFormat);
		break;
		}