Commit bbba88cb authored May 11, 2011 by Andreas Huber

Squashed commit of the following:

commit c80992e419ed567abef451042f09c4958534b90d
Author: Andreas Huber <andih@google.com>
Date:   Wed May 11 14:00:07 2011 -0700

    Support for the mp3 audio decoder as a software OMX component.

    Change-Id: I66e10c4d0be4c3aecdef1c21b15a2c7359ceb807

commit a358d0e1bf2a88897887445f42ccdda0f5f2f528
Author: Andreas Huber <andih@google.com>
Date:   Wed May 11 13:11:23 2011 -0700

    Support for G.711 alaw and mulaw decoders as software OMX components

    Change-Id: Ia5c76c02cb83a9f94ce39a27b2251e5880218f03

commit 79088b9c9a5c8b8c97ea66cb4f90a2b0f0d34553
Author: Andreas Huber <andih@google.com>
Date:   Thu May 5 15:43:32 2011 -0700

    Instead of using an RGB surface and conversion yuv420->rgb565

    convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead.

    Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5
    related-to-bug: 4394005

commit 69469d3bd84425777b11b9fc938c5e0c61af26a7
Author: Andreas Huber <andih@google.com>
Date:   Tue May 10 15:46:42 2011 -0700

    voip mustn't link against libstagefright.so

    Change-Id: I4d0ba9a8b9dc9380b792a1bd04bcda231964862c

commit 2a9a9eeeeeb36ae3a9e680469c3016d509ff08c3
Author: Andreas Huber <andih@google.com>
Date:   Tue May 10 14:37:10 2011 -0700

    Remove most non-OMX software decoders by default

    Change-Id: Ic56514bc1b56b8fa952e8c4a164ea7379ecb69d0

commit a4de62c37b335c318217765403a9fb282b20a216
Author: Andreas Huber <andih@google.com>
Date:   Mon May 9 16:50:02 2011 -0700

    Conditionally build the old-style software decoders.

    Change-Id: I5de609e1d76c92d26d6eb81d1551462258f3f15f

commit 5d8b039f9449dc3dad1e77c42c80cc0b54b0c846
Author: Andreas Huber <andih@google.com>
Date:   Mon May 9 16:13:12 2011 -0700

    Support for MPEG4 and H.263 video decoders as soft OMX components.

    Change-Id: I5e3a4835afab89f98e3aa128d013628f5830eafe

commit b25a1bfbeb0ff6e62e1cc694ce2599c91489c7d0
Author: Andreas Huber <andih@google.com>
Date:   Mon May 9 11:49:10 2011 -0700

    Boost Soft OMX thread priority, fix timestamp handling in vorbis Soft OMX decoder.

    Change-Id: I68d26d4999f06fcc451d69e5303663fab0cba9e8

commit c0574362f8dc3319ce84d981097867062a698527
Author: Andreas Huber <andih@google.com>
Date:   Mon May 9 11:28:53 2011 -0700

    Support for the AMR decoders (NB and WB) as Soft OMX components.

    Change-Id: Ia565f59833fb52653e23f26536e7e41fc329a754

commit 3e5575a8f0e27a490cb7bde77bd9456087837f08
Author: Andreas Huber <andih@google.com>
Date:   Wed May 4 13:41:25 2011 -0700

    Signal an error if the aac decoder failed to initialize from codec specific data.

    Change-Id: I01da7831bdf722edd7d6dc5974486daa2cf2b209
    related-to-bug: 4272179

commit f94aeaa9886e772ff4823e671ed237096649f4af
Author: Andreas Huber <andih@google.com>
Date:   Tue May 3 13:07:38 2011 -0700

    Software OMX nodes don't (yet?) support native_window mode.

    Change-Id: I7d9ca9164ef4abf66b573ca21dba12d672f8b12d

commit eefdfabac8dc659e00daa56da69aea705c49cb67
Author: Andreas Huber <andih@google.com>
Date:   Tue May 3 12:57:16 2011 -0700

    Fixing the OMX tests to refer to appropriate files from test content.

    Change-Id: I5b61c3498749bfb876abbd3946a5132356e3f6ff

commit f31b7326aef14b6a1b7946520a9688f092e844d5
Author: Andreas Huber <andih@google.com>
Date:   Tue May 3 11:08:38 2011 -0700

    Soft OMX components are now dynamiclly loaded/unloaded, not directly linked against.

    Change-Id: I1e2ecfbfab67a8869886f738eaf0c7b3c948b6d9

commit b7f0343879e4df06f0a1c9bfece24df557954e2f
Author: Andreas Huber <andih@google.com>
Date:   Mon May 2 15:58:36 2011 -0700

    Support for the AVC software decoder as an OMX component.

    Change-Id: I13c12df435ba4afbd968a9fc659f66b91c818bc2

commit 5bb9e616d6c8e1b13d531fe996b9a9affdfb2977
Author: Andreas Huber <andih@google.com>
Date:   Fri Apr 29 12:05:37 2011 -0700

    Fix Vorbis OMX decoder's component role.

    Change-Id: I5e871e5e11b3f951c93590210e63fd7987c467b5

commit 089c91f2333062e196c7afd5fb0ca914878aa474
Author: Andreas Huber <andih@google.com>
Date:   Fri Apr 29 12:05:18 2011 -0700

    Support vorbis_decoder OMX testing.

    Change-Id: I1985be178a12ae3f8768bc72067d9236238be170

commit 56e241fa36fc37219bc536b823bdc2ab82dc1fad
Author: Andreas Huber <andih@google.com>
Date:   Fri Apr 29 12:01:46 2011 -0700

    SoftVorbis OMX component now respects the number of valid frames per page.

    Change-Id: I82a117a064d9b083fc58a54ad900a987a763ef03

commit fcd618ec520c376fdb78f4cbb44b8d9f5d213e2b
Author: Andreas Huber <andih@google.com>
Date:   Fri Apr 29 10:59:38 2011 -0700

    Support for the vorbis audio decoder as a soft OMX component.

    Change-Id: Iaeb057e58ca306d3dce205c0445b74d5aefef492

commit d1fcc3203fc8003ad79c6e96b3a1fc4261743f16
Author: Andreas Huber <andih@google.com>
Date:   Fri Apr 29 10:07:50 2011 -0700

    VPX decoder now properly resizes buffers after a port settings change.

    Change-Id: I110749a31b6cba087891d8e5dfe420830bdbf831

commit 35c7168243cb69849d88911144a2c7fdfed5c54e
Author: Andreas Huber <andih@google.com>
Date:   Thu Apr 28 13:23:34 2011 -0700

    Support for the VPX video decoder as a Software OMX component.

    Change-Id: Ic345add2d6d768d4af631160153f2e9b97fcea71

commit 923b2534b4211fc5405377b5190bfa6f2dd27f32
Author: Andreas Huber <andih@google.com>
Date:   Thu Apr 28 11:34:40 2011 -0700

    Table-based registration of soft omx components.

    Change-Id: I7f45f0fa5b3a7950776e69c66349731f7674e937

commit 04a88f3edb2266a463da9c4481b80178be460902
Author: Andreas Huber <andih@google.com>
Date:   Thu Apr 28 11:22:31 2011 -0700

    Apparently OMX_GetParameter is valid in any state other than OMX_StateInvalid

    OMX_SetParameter is still constrained to OMX_StateLoaded or a disabled port.

    Change-Id: I1032d7cf4011982d306aa369d4158a82830d26fb

commit 9d70ca68445e7c40f5c9b2d12466e468f514de88
Author: Andreas Huber <andih@google.com>
Date:   Wed Apr 27 15:03:18 2011 -0700

    Use the new soft OMX aac decoder for HTTP live playback.

    Change-Id: Ifbcfb732a9edb855cb46b49f6d0ac942170ee28f

commit 213fe4a10ea93cce08e8622dc3908053f29878a1
Author: Andreas Huber <andih@google.com>
Date:   Tue Apr 12 16:39:45 2011 -0700

    Foundation for supporting software decoders as OMX components

    Change-Id: I7fdab256563b35d1d090617abaea9a26b198d816

Change-Id: I83e9236beed4af985d10333c203f065df9e09a42

parent 6e9fd1a2

include/media/stagefright/OMXCodec.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,7 @@ private:

		void setAMRFormat(bool isWAMR, int32_t bitRate);
		void setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate);
		void setG711Format(int32_t numChannels);

		status_t setVideoPortFormatType(
		OMX_U32 portIndex,

include/media/stagefright/openmax/OMX_Video.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ typedef enum OMX_VIDEO_CODINGTYPE {
		OMX_VIDEO_CodingRV, /*< all versions of Real Video /
		OMX_VIDEO_CodingAVC, /*< H.264/AVC /
		OMX_VIDEO_CodingMJPEG, /*< Motion JPEG /
		OMX_VIDEO_CodingVPX, /*< Google VPX, formerly known as On2 VP8 /
		OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /*< Reserved region for introducing Khronos Standard Extensions /
		OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /*< Reserved region for introducing Vendor Extensions /
		OMX_VIDEO_CodingMax = 0x7FFFFFFF

media/libstagefright/ACodec.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1644,7 +1644,7 @@ void ACodec::UninitializedState::onSetup(
		if (!strcasecmp(mime.c_str(), MEDIA_MIMETYPE_VIDEO_AVC)) {
		componentName = "OMX.Nvidia.h264.decode";
		} else if (!strcasecmp(mime.c_str(), MEDIA_MIMETYPE_AUDIO_AAC)) {
		componentName = "OMX.Nvidia.aac.decoder";
		componentName = "OMX.google.aac.decoder";
		} else if (!strcasecmp(mime.c_str(), MEDIA_MIMETYPE_AUDIO_MPEG)) {
		componentName = "OMX.Nvidia.mp3.decoder";
		} else {

media/libstagefright/Android.mk

+26 −10

Original line number	Diff line number	Diff line
		@@ -3,6 +3,8 @@ include $(CLEAR_VARS)

		include frameworks/base/media/libstagefright/codecs/common/Config.mk

		BUILD_WITH_SOFTWARE_DECODERS := true

		LOCAL_SRC_FILES:= \
		ACodec.cpp \
		AACExtractor.cpp \
		@@ -45,7 +47,6 @@ LOCAL_SRC_FILES:= \
		ShoutcastSource.cpp \
		StagefrightMediaScanner.cpp \
		StagefrightMetadataRetriever.cpp \
		ThreadedSource.cpp \
		ThrottledSource.cpp \
		TimeSource.cpp \
		TimedEventQueue.cpp \
		@@ -82,28 +83,39 @@ LOCAL_SHARED_LIBRARIES := \

		LOCAL_STATIC_LIBRARIES := \
		libstagefright_color_conversion \
		libstagefright_aacdec \
		libstagefright_aacenc \
		libstagefright_amrnbdec \
		libstagefright_amrnbenc \
		libstagefright_amrwbdec \
		libstagefright_amrwbenc \
		libstagefright_avcdec \
		libstagefright_avcenc \
		libstagefright_m4vh263dec \
		libstagefright_m4vh263enc \
		libstagefright_mp3dec \
		libstagefright_vorbisdec \
		libstagefright_matroska \
		libstagefright_vpxdec \
		libvpx \
		libstagefright_mpeg2ts \
		libstagefright_httplive \
		libstagefright_rtsp \
		libstagefright_id3 \
		libstagefright_g711dec \
		libFLAC \

		ifeq ($(BUILD_WITH_SOFTWARE_DECODERS),true)

		LOCAL_SRC_FILES += \
		ThreadedSource.cpp \

		LOCAL_STATIC_LIBRARIES += \
		libstagefright_aacdec \
		libstagefright_amrnbdec \
		libstagefright_amrwbdec \
		libstagefright_avcdec \
		libstagefright_g711dec \
		libstagefright_mp3dec \
		libstagefright_m4vh263dec \
		libstagefright_vorbisdec \
		libstagefright_vpxdec \
		libvpx \

		endif


		################################################################################

		# The following was shamelessly copied from external/webkit/Android.mk and
		@@ -180,6 +192,10 @@ endif

		LOCAL_CFLAGS += -Wno-multichar

		ifeq ($(BUILD_WITH_SOFTWARE_DECODERS),true)
		LOCAL_CFLAGS += -DHAVE_SOFTWARE_DECODERS
		endif

		LOCAL_MODULE:= libstagefright

		include $(BUILD_SHARED_LIBRARY)

media/libstagefright/AwesomePlayer.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -942,7 +942,9 @@ void AwesomePlayer::initRenderer_l() {
		// before creating a new one.
		IPCThreadState::self()->flushCommands();

		if (USE_SURFACE_ALLOC && strncmp(component, "OMX.", 4) == 0) {
		if (USE_SURFACE_ALLOC
		&& !strncmp(component, "OMX.", 4)
		&& strncmp(component, "OMX.google.", 11)) {
		// Hardware decoders avoid the CPU color conversion by decoding
		// directly to ANativeBuffers, so we must use a renderer that
		// just pushes those buffers to the ANativeWindow.

Original line number	Diff line number	Diff line
		@@ -85,6 +85,7 @@ typedef enum OMX_VIDEO_CODINGTYPE {
		OMX_VIDEO_CodingRV, /*< all versions of Real Video /
		OMX_VIDEO_CodingAVC, /*< H.264/AVC /
		OMX_VIDEO_CodingMJPEG, /*< Motion JPEG /
		OMX_VIDEO_CodingVPX, /*< Google VPX, formerly known as On2 VP8 /
		OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /*< Reserved region for introducing Khronos Standard Extensions /
		OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /*< Reserved region for introducing Vendor Extensions /
		OMX_VIDEO_CodingMax = 0x7FFFFFFF