Merge commit 'remotes/goog/eclair' into eclair-release (714bd637) · Commits · e / os / platform_frameworks_native

include/ui/CameraParameters.h

+7 −5

Original line number	Diff line number	Diff line
		@@ -215,15 +215,17 @@ public:
		// Values for flash mode settings.
		// Flash will not be fired.
		static const char FLASH_MODE_OFF[];
		// Flash will be fired automatically when required. The timing is decided by
		// camera driver.
		// Flash will be fired automatically when required. The flash may be fired
		// during preview, auto-focus, or snapshot depending on the driver.
		static const char FLASH_MODE_AUTO[];
		// Flash will always be fired. The timing is decided by camera driver.
		// Flash will always be fired during snapshot. The flash may also be
		// fired during preview or auto-focus depending on the driver.
		static const char FLASH_MODE_ON[];
		// Flash will be fired in red-eye reduction mode.
		static const char FLASH_MODE_RED_EYE[];
		// Constant emission of light. This can be used for video recording.
		static const char FLASH_MODE_VIDEO_LIGHT[];
		// Constant emission of light during preview, auto-focus and snapshot.
		// This can also be used for video recording.
		static const char FLASH_MODE_TORCH[];

		// Values for scene mode settings.
		static const char SCENE_MODE_AUTO[];

libs/ui/CameraParameters.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ const char CameraParameters::FLASH_MODE_OFF[] = "off";
		const char CameraParameters::FLASH_MODE_AUTO[] = "auto";
		const char CameraParameters::FLASH_MODE_ON[] = "on";
		const char CameraParameters::FLASH_MODE_RED_EYE[] = "red-eye";
		const char CameraParameters::FLASH_MODE_VIDEO_LIGHT[] = "video-light";
		const char CameraParameters::FLASH_MODE_TORCH[] = "torch";

		// Values for scene mode settings.
		const char CameraParameters::SCENE_MODE_AUTO[] = "auto";

opengl/tests/gl2_basic/gl2_basic.cpp

+95 −17

Original line number	Diff line number	Diff line
		@@ -175,23 +175,89 @@ void renderFrame() {
		checkGlError("glDrawArrays");
		}

		#if 0

		void PrintEGLConfig(EGLDisplay dpy, EGLConfig config) {
		int attrib[] = {EGL_RED_SIZE, EGL_GREEN_SIZE, EGL_BLUE_SIZE, EGL_ALPHA_SIZE,
		EGL_DEPTH_SIZE, EGL_SURFACE_TYPE, EGL_RENDERABLE_TYPE
		void printEGLConfiguration(EGLDisplay dpy, EGLConfig config) {

		#define X(VAL) {VAL, #VAL}
		struct {EGLint attribute; const char* name;} names[] = {
		X(EGL_BUFFER_SIZE),
		X(EGL_ALPHA_SIZE),
		X(EGL_BLUE_SIZE),
		X(EGL_GREEN_SIZE),
		X(EGL_RED_SIZE),
		X(EGL_DEPTH_SIZE),
		X(EGL_STENCIL_SIZE),
		X(EGL_CONFIG_CAVEAT),
		X(EGL_CONFIG_ID),
		X(EGL_LEVEL),
		X(EGL_MAX_PBUFFER_HEIGHT),
		X(EGL_MAX_PBUFFER_PIXELS),
		X(EGL_MAX_PBUFFER_WIDTH),
		X(EGL_NATIVE_RENDERABLE),
		X(EGL_NATIVE_VISUAL_ID),
		X(EGL_NATIVE_VISUAL_TYPE),
		X(EGL_PRESERVED_RESOURCES),
		X(EGL_SAMPLES),
		X(EGL_SAMPLE_BUFFERS),
		X(EGL_SURFACE_TYPE),
		X(EGL_TRANSPARENT_TYPE),
		X(EGL_TRANSPARENT_RED_VALUE),
		X(EGL_TRANSPARENT_GREEN_VALUE),
		X(EGL_TRANSPARENT_BLUE_VALUE),
		X(EGL_BIND_TO_TEXTURE_RGB),
		X(EGL_BIND_TO_TEXTURE_RGBA),
		X(EGL_MIN_SWAP_INTERVAL),
		X(EGL_MAX_SWAP_INTERVAL),
		X(EGL_LUMINANCE_SIZE),
		X(EGL_ALPHA_MASK_SIZE),
		X(EGL_COLOR_BUFFER_TYPE),
		X(EGL_RENDERABLE_TYPE),
		X(EGL_CONFORMANT),
		};
		for(size_t i = 0; i < sizeof(attrib)/sizeof(attrib[0]); i++) {
		int value = 0;
		int a = attrib[i];
		if (eglGetConfigAttrib(dpy, config, a, &value)) {
		printf(" 0x%04x: %d", a, value);
		#undef X

		for (size_t j = 0; j < sizeof(names) / sizeof(names[0]); j++) {
		EGLint value = -1;
		EGLint returnVal = eglGetConfigAttrib(dpy, config, names[j].attribute, &value);
		EGLint error = eglGetError();
		if (returnVal && error == EGL_SUCCESS) {
		printf(" %s: ", names[j].name);
		printf("%d (0x%x)", value, value);
		}
		}
		printf("\n");
		}

		#endif
		int printEGLConfigurations(EGLDisplay dpy) {
		EGLint numConfig = 0;
		EGLint returnVal = eglGetConfigs(dpy, NULL, 0, &numConfig);
		checkEglError("eglGetConfigs", returnVal);
		if (!returnVal) {
		return false;
		}

		printf("Number of EGL configuration: %d\n", numConfig);

		EGLConfig* configs = (EGLConfig) malloc(sizeof(EGLConfig) numConfig);
		if (! configs) {
		printf("Could not allocate configs.\n");
		return false;
		}

		returnVal = eglGetConfigs(dpy, configs, numConfig, &numConfig);
		checkEglError("eglGetConfigs", returnVal);
		if (!returnVal) {
		free(configs);
		return false;
		}

		for(int i = 0; i < numConfig; i++) {
		printf("Configuration %d\n", i);
		printEGLConfiguration(dpy, configs[i]);
		}

		free(configs);
		return true;
		}

		int main(int argc, char** argv) {
		EGLBoolean returnValue;
		@@ -199,7 +265,7 @@ int main(int argc, char** argv) {

		EGLint context_attribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
		EGLint s_configAttribs[] = {
		EGL_SURFACE_TYPE, EGL_PBUFFER_BIT\|EGL_WINDOW_BIT,
		EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
		EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
		EGL_NONE };
		EGLint majorVersion;
		@@ -226,6 +292,13 @@ int main(int argc, char** argv) {
		return 0;
		}

		if (!printEGLConfigurations(dpy)) {
		printf("printEGLConfigurations failed\n");
		return 0;
		}

		checkEglError("printEGLConfigurations");

		EGLNativeWindowType window = android_createDisplaySurface();
		returnValue = EGLUtils::selectConfigForNativeWindow(dpy, s_configAttribs, window, &myConfig);
		if (returnValue) {
		@@ -233,6 +306,11 @@ int main(int argc, char** argv) {
		return 0;
		}

		checkEglError("EGLUtils::selectConfigForNativeWindow");

		printf("Chose this configuration:\n");
		printEGLConfiguration(dpy, myConfig);

		surface = eglCreateWindowSurface(dpy, myConfig, window, NULL);
		checkEglError("eglCreateWindowSurface");
		if (surface == EGL_NO_SURFACE) {

opengl/tests/tritex/tritex.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ int init_gl_surface(void)
		EGLConfig myConfig = {0};
		EGLint attrib[] =
		{
		EGL_SURFACE_TYPE, EGL_PBUFFER_BIT\|EGL_WINDOW_BIT,
		EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
		EGL_DEPTH_SIZE, 16,
		EGL_NONE
		};