Merge branch 'gingerbread' into gingerbread-release (5ea6ccf2) · Commits · e / os / android_frameworks_av

include/media/IOMX.h

+6 −3

Original line number	Diff line number	Diff line
		@@ -115,7 +115,8 @@ public:
		const char *componentName,
		OMX_COLOR_FORMATTYPE colorFormat,
		size_t encodedWidth, size_t encodedHeight,
		size_t displayWidth, size_t displayHeight) = 0;
		size_t displayWidth, size_t displayHeight,
		int32_t rotationDegrees) = 0;

		// Note: These methods are _not_ virtual, it exists as a wrapper around
		// the virtual "createRenderer" method above facilitating extraction
		@@ -125,14 +126,16 @@ public:
		const char *componentName,
		OMX_COLOR_FORMATTYPE colorFormat,
		size_t encodedWidth, size_t encodedHeight,
		size_t displayWidth, size_t displayHeight);
		size_t displayWidth, size_t displayHeight,
		int32_t rotationDegrees);

		sp<IOMXRenderer> createRendererFromJavaSurface(
		JNIEnv *env, jobject javaSurface,
		const char *componentName,
		OMX_COLOR_FORMATTYPE colorFormat,
		size_t encodedWidth, size_t encodedHeight,
		size_t displayWidth, size_t displayHeight);
		size_t displayWidth, size_t displayHeight,
		int32_t rotationDegrees);
		};

		struct omx_message {

include/media/stagefright/HardwareAPI.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,14 @@ extern android::VideoRenderer *createRenderer(
		size_t displayWidth, size_t displayHeight,
		size_t decodedWidth, size_t decodedHeight);

		extern android::VideoRenderer *createRendererWithRotation(
		const android::sp<android::ISurface> &surface,
		const char *componentName,
		OMX_COLOR_FORMATTYPE colorFormat,
		size_t displayWidth, size_t displayHeight,
		size_t decodedWidth, size_t decodedHeight,
		int32_t rotationDegrees);

		extern android::OMXPluginBase *createOMXPlugin();

		#endif // HARDWARE_API_H_

include/media/stagefright/MPEG4Writer.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,7 @@ private:
		bool exceedsFileDurationLimit();
		bool isFileStreamable() const;
		void trackProgressStatus(const Track* track, int64_t timeUs, status_t err = OK);
		void writeCompositionMatrix(int32_t degrees);

		MPEG4Writer(const MPEG4Writer &);
		MPEG4Writer &operator=(const MPEG4Writer &);

include/media/stagefright/MetaData.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ enum {
		kKeyMIMEType = 'mime', // cstring
		kKeyWidth = 'widt', // int32_t
		kKeyHeight = 'heig', // int32_t
		kKeyRotation = 'rotA', // int32_t (angle in degrees)
		kKeyIFramesInterval = 'ifiv', // int32_t
		kKeyStride = 'strd', // int32_t
		kKeySliceHeight = 'slht', // int32_t
		@@ -90,6 +91,7 @@ enum {
		// Track authoring progress status
		// kKeyTrackTimeStatus is used to track progress in elapsed time
		kKeyTrackTimeStatus = 'tktm', // int64_t
		kKeyRotationDegree = 'rdge', // int32_t (clockwise, in degree)

		kKeyNotRealTime = 'ntrt', // bool (int32_t)

media/libmedia/IOMX.cpp

+14 −6

Original line number	Diff line number	Diff line
		@@ -38,11 +38,13 @@ sp<IOMXRenderer> IOMX::createRenderer(
		const char *componentName,
		OMX_COLOR_FORMATTYPE colorFormat,
		size_t encodedWidth, size_t encodedHeight,
		size_t displayWidth, size_t displayHeight) {
		size_t displayWidth, size_t displayHeight,
		int32_t rotationDegrees) {
		return createRenderer(
		surface->getISurface(),
		componentName, colorFormat, encodedWidth, encodedHeight,
		displayWidth, displayHeight);
		displayWidth, displayHeight,
		rotationDegrees);
		}

		sp<IOMXRenderer> IOMX::createRendererFromJavaSurface(
		@@ -50,7 +52,8 @@ sp<IOMXRenderer> IOMX::createRendererFromJavaSurface(
		const char *componentName,
		OMX_COLOR_FORMATTYPE colorFormat,
		size_t encodedWidth, size_t encodedHeight,
		size_t displayWidth, size_t displayHeight) {
		size_t displayWidth, size_t displayHeight,
		int32_t rotationDegrees) {
		jclass surfaceClass = env->FindClass("android/view/Surface");
		if (surfaceClass == NULL) {
		LOGE("Can't find android/view/Surface");
		@@ -67,7 +70,8 @@ sp<IOMXRenderer> IOMX::createRendererFromJavaSurface(

		return createRenderer(
		surface, componentName, colorFormat, encodedWidth,
		encodedHeight, displayWidth, displayHeight);
		encodedHeight, displayWidth, displayHeight,
		rotationDegrees);
		}

		class BpOMX : public BpInterface<IOMX> {
		@@ -349,7 +353,8 @@ public:
		const char *componentName,
		OMX_COLOR_FORMATTYPE colorFormat,
		size_t encodedWidth, size_t encodedHeight,
		size_t displayWidth, size_t displayHeight) {
		size_t displayWidth, size_t displayHeight,
		int32_t rotationDegrees) {
		Parcel data, reply;
		data.writeInterfaceToken(IOMX::getInterfaceDescriptor());

		@@ -360,6 +365,7 @@ public:
		data.writeInt32(encodedHeight);
		data.writeInt32(displayWidth);
		data.writeInt32(displayHeight);
		data.writeInt32(rotationDegrees);

		remote()->transact(CREATE_RENDERER, data, &reply);

		@@ -682,11 +688,13 @@ status_t BnOMX::onTransact(
		size_t encodedHeight = (size_t)data.readInt32();
		size_t displayWidth = (size_t)data.readInt32();
		size_t displayHeight = (size_t)data.readInt32();
		int32_t rotationDegrees = data.readInt32();

		sp<IOMXRenderer> renderer =
		createRenderer(isurface, componentName, colorFormat,
		encodedWidth, encodedHeight,
		displayWidth, displayHeight);
		displayWidth, displayHeight,
		rotationDegrees);

		reply->writeStrongBinder(renderer->asBinder());