[Tizen-submit] 2516: Changes to Tizen:2.0:Main/ug-camera-efl

noreply at tizen.org noreply at tizen.org
Thu Apr 18 21:29:49 GMT 2013


Hi,
brianjjones have made the following changes to ug-camera-efl in project Tizen:2.0:Main. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #2516

  submit:       Tizen:2.0:IVI/ug-camera-efl  -> Tizen:2.0:Main


Message:
Submitter: brianjjones <brian.j.jones at intel.com>
Comments: Closes app now when you hit the back button.  This is a temp fix to keep media working elsewhere
Git project: profile/ivi/ug-camera-efl
Tag: submit/2.0/20130418.212042
Commit: 1124b5f Closes app now when you hit the back button.  This is a temp fix to keep media working elsewhere (forwarded request 2515 from tizenrobot)

State:   new        2013-04-18T14:00:27 diegobowen
Comment: <no comment>
spec files:
-----------
--- ug-camera-efl.spec
+++ ug-camera-efl.spec
@@ -9,7 +9,7 @@
 Summary:    SLP Camera UI Gadget
 Version:    0.1.110
 Release:    1
-VCS:        apps/home/ug-camera-efl#2.0_release-0-g0b1815f
+VCS:        profile/ivi/ug-camera-efl#submit/2.0/20130418.212042-0-g1124b5f
 Group:      TO_BE/FILLED_IN
 License:    Flora Software License
 Source0:    %{name}-%{version}.tar.gz

other changes:
--------------

++++++ ug-camera-efl-0.1.110.tar.gz
--- /src/cam_app.c
+++ /src/cam_app.c
@@ -6378,10 +6378,6 @@
 	}
 	evas_object_show(ad->focus_edje);
 
-#ifdef	CAMERA_MACHINE_I686
-	evas_object_hide(ad->focus_edje);
-#endif
-
 	return EINA_TRUE;
 }
 
@@ -7538,10 +7534,6 @@
 		file_format = RECORDER_FILE_FORMAT_MP4;
 		channel = 2;
 	}
-#ifdef CAMERA_MACHINE_I686
-	video_codec = RECORDER_VIDEO_CODEC_THEORA;
-	audio_codec = RECORDER_AUDIO_CODEC_VORBIS;
-#endif
 
 	if (!cam_mm_set_codec(audio_codec, video_codec))
 		return FALSE;
@@ -7632,11 +7624,6 @@
 	cam_mm_get_video_size( &camapp->default_preview_width, &camapp->default_preview_height);
 	DEBUG_TRACE("default_width = %d,default_height = %d", camapp->default_preview_width, camapp->default_preview_height);
 
-#ifdef CAMERA_MACHINE_I686
-	width = 320;
-	height = 240;
-#endif
-
 	if (CAM_CAMERA_MODE == mode) {
 		width = CAM_RESOLUTION_W(camapp->photo_resolution);
 		height = CAM_RESOLUTION_H(camapp->photo_resolution);
@@ -7644,14 +7631,9 @@
 		ret &= cam_mm_set_image_size(width, height);
 		ret &= cam_mm_set_image_count(camapp->image_count);
 		ret &= cam_mm_set_image_enc_quality(camapp->image_quality);
-#ifdef CAMERA_MACHINE_I686
-		ret &= cam_mm_set_fps(CAMERA_ATTR_FPS_15);
-		ret &= cam_mm_set_video_source_format(CAMERA_PIXEL_FORMAT_I420);
-#else
 		ret &= cam_mm_set_fps(CAMERA_ATTR_FPS_AUTO);
 		ret &= cam_mm_get_video_source_format(NULL, &capture_video_format);
 		ret &= cam_mm_set_video_source_format(capture_video_format);
-#endif
 		ret &= cam_app_set_capture_format_shooting_mode(camapp->shooting_mode);
 
 		if (cam_is_enabled_menu(ad, CAM_MENU_SAVE_AS_FLIP))
@@ -7667,11 +7649,6 @@
 		ret &= cam_mm_set_image_size(CAM_RESOLUTION_W(camapp->photo_resolution), CAM_RESOLUTION_H(camapp->photo_resolution));
 		ret &= cam_mm_set_image_enc_quality(camapp->image_quality);
 		ret &= cam_mm_set_video_profile();
-#ifdef CAMERA_MACHINE_I686
-		ret &= cam_mm_set_fps(CAMERA_ATTR_FPS_15);
-		ret &= cam_mm_set_video_source_format(CAMERA_PIXEL_FORMAT_I420);
-		DEBUG_TRACE("");
-#else
 		DEBUG_TRACE("");
 		ret &= cam_mm_set_fps(camapp->fps);
 		if (camapp->anti_shake) {
@@ -7681,7 +7658,6 @@
 			DEBUG_TRACE("recording_video_format:%d", recording_video_format);
 			ret &= cam_mm_set_video_source_format(recording_video_format);
 		}
-#endif

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list