Merge "stagefright: Additional types for Colorconvertor" into ics (ac58f33d) · Commits · e / os / android_frameworks_base

include/media/stagefright/ColorConverter.h

+45 −0

Original line number	Original line	Diff line number	Diff line
	@@ -83,6 +83,51 @@ private:
	ColorConverter &operator=(const ColorConverter &);		ColorConverter &operator=(const ColorConverter &);
	};		};

			#ifdef QCOM_HARDWARE
			//------------------------------------------
			enum ColorConvertFormat {
			RGB565 = 1,
			YCbCr420Tile,
			YCbCr420SP,
			YCbCr420P,
			YCrCb420P,
			};

			/* 64 bit flag variable, reserving bits as needed */
			enum ColorConvertFlags {
			COLOR_CONVERT_ALIGN_NONE = 1,
			COLOR_CONVERT_CENTER_OUTPUT = 1<<1,
			COLOR_CONVERT_ALIGN_16 = 1<<4,
			COLOR_CONVERT_ALIGN_2048 = 1<<11,
			COLOR_CONVERT_ALIGN_8192 = 1<<13,
			};

			struct ColorConvertParams {
			size_t width;
			size_t height;

			size_t cropWidth;
			size_t cropHeight;

			size_t cropLeft;
			size_t cropRight;
			size_t cropTop;
			size_t cropBottom;

			ColorConvertFormat colorFormat;
			const void * data;
			int fd;

			uint64_t flags;
			};

			typedef int (* ConvertFn)(ColorConvertParams src,
			ColorConvertParams dst, uint8_t *adjustedClip);

			int convert(ColorConvertParams src, ColorConvertParams dst,
			uint8_t *adjustedClip);
			#endif

	} // namespace android		} // namespace android

	#endif // COLOR_CONVERTER_H_		#endif // COLOR_CONVERTER_H_

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,10 @@ LOCAL_C_INCLUDES := \
	$(TOP)/frameworks/base/include/media/stagefright/openmax \		$(TOP)/frameworks/base/include/media/stagefright/openmax \
	$(TOP)/hardware/msm7k		$(TOP)/hardware/msm7k

			ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
			LOCAL_CFLAGS += -DQCOM_HARDWARE
			endif

	LOCAL_MODULE:= libstagefright_color_conversion		LOCAL_MODULE:= libstagefright_color_conversion

	include $(BUILD_STATIC_LIBRARY)		include $(BUILD_STATIC_LIBRARY)