Removing code that changes the gstreamer settings for non phone hardware. These... 74/3274/1
authorbrianjjones <brian.j.jones@intel.com>
Wed, 3 Apr 2013 21:08:21 +0000 (14:08 -0700)
committerbrianjjones <brian.j.jones@intel.com>
Wed, 3 Apr 2013 21:08:21 +0000 (14:08 -0700)
src/cam_app.c

index e89705a..afdbe5d 100755 (executable)
@@ -6378,10 +6378,6 @@ Eina_Bool cam_app_focus_guide_create(void *data)
        }
        evas_object_show(ad->focus_edje);
 
-#ifdef CAMERA_MACHINE_I686
-       evas_object_hide(ad->focus_edje);
-#endif
-
        return EINA_TRUE;
 }
 
@@ -7538,10 +7534,6 @@ gboolean cam_app_set_recording_mode(void *data, int mode)
                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 @@ gboolean cam_app_init_attribute(void *data, CamMode mode)
        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 @@ gboolean cam_app_init_attribute(void *data, CamMode mode)
                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 @@ gboolean cam_app_init_attribute(void *data, CamMode mode)
                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 @@ gboolean cam_app_init_attribute(void *data, CamMode mode)
                        DEBUG_TRACE("recording_video_format:%d", recording_video_format);
                        ret &= cam_mm_set_video_source_format(recording_video_format);
                }
-#endif
                ret &= cam_mm_set_audio_recording(camapp->audio_recording);
                ret &= cam_app_set_recording_mode(ad, camapp->recording_mode);
                DEBUG_TRACE("camapp->size_limit = %d" , camapp->size_limit);