touch to focus

main.cc

@@ -76,6 +76,23 @@ std::vector<std::pair<int, int>> parse_size_list(std::string const &sizes) {

                                
                                
                                
                            
                                
                                    
                                        
                                            76  
                                                return result;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            77  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            78  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        79 +
                                        std::vector<int> parse_tuple(std::string const &value) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        80 +
                                            std::vector<int> result;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        81 +
                                            std::stringstream str(value);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        82 +
                                            if(str.get() != '(') {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        83 +
                                                return result;   // which is currently empty
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        84 +
                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        85 +
                                            while(str.peek() != ')') {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        86 +
                                                int a;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        87 +
                                                str >> a;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        88 +
                                                if(str.peek() == ',') {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        89 +
                                                    str.get();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        90 +
                                                } 
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        91 +
                                                result.push_back(a);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        92 +
                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        93 +
                                            return result;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        94 +
                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        95 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            96  
                                            class AndroCamera : public Glib::Object {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            97  
                                            private:
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            98  
                                                int camera_id;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -158,6 +175,7 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            175  
                                                std::unordered_map<std::string, std::string> parameters;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            176  
                                                DroidMediaCameraInfo physical_info;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            177  
                                                std::vector<std::pair<int, int>> picture_sizes, preview_sizes, video_sizes;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        178 +
                                            std::vector<int> active_array;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            179  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            180  
                                                explicit AndroCamera(int camera_id) : Glib::Object(), camera_id(camera_id) {}
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            181  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -190,6 +208,7 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            208  
                                                    picture_sizes = parse_size_list(parameters.at("picture-size-values"));
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            209  
                                                    video_sizes = parse_size_list(parameters.at("video-size-values"));
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            210  
                                                    preview_sizes = parse_size_list(parameters.at("preview-size-values"));
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        211 +
                                                active_array = parse_tuple(parameters.at("active-array-size"));
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            212  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            213  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            214  
                                                void disconnect() {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -219,6 +238,7 @@ class PanoramaCamera : public Gtk::Application {

                                
                                
                                
                            
                                
                                    
                                        
                                            238  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            239  
                                                Glib::RefPtr<Gtk::CssProvider> css;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            240  
                                                Glib::RefPtr<Gdk::Surface> window_surface;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        241 +
                                            Glib::RefPtr<Gtk::GestureClick> clicker;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            242  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            243  
                                                sigc::connection compressed_image_connection, frame_available_connection, accelerometer_connection;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            244  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -382,6 +402,7 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            402  
                                                    parameters["sensitivity"] = "100";
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            403  
                                                    parameters["exposure-time"] = "83200";
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            404  
                                                    parameters["flash-mode"] = "off";
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        405 +
                                                parameters["focus-mode"] = "auto";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            406  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            407  
                                                    droid_media_camera_set_parameters(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            408  
                                                        cam->camera,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -523,6 +544,34 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            544  
                                                        droid_media_camera_take_picture(cam->camera, 0);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            545  
                                                    });
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            546  
                                                    box->append(*capture_button);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        547 +
                                                clicker = Gtk::GestureClick::create();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        548 +
                                                clicker->signal_released().connect([this](int n_presses, double x, double y) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        549 +
                                                    // TODO: handle differing aspect ratios
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        550 +
                                                    int actual_orientation = (cam->physical_info.orientation + device_rotation_degrees) % 360;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        551 +
                                                    int focus_x, focus_y;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        552 +
                                                    if(actual_orientation == 0) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        553 +
                                                        focus_x = x / drawing->get_width() * (cam->active_array.at(2) - cam->active_array.at(0)) + cam->active_array.at(0);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        554 +
                                                        focus_y = y / drawing->get_height() * (cam->active_array.at(3) - cam->active_array.at(1)) + cam->active_array.at(1);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        555 +
                                                    } else if(actual_orientation == 90) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        556 +
                                                        focus_x = y / drawing->get_height() * (cam->active_array.at(2) - cam->active_array.at(0)) + cam->active_array.at(0);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        557 +
                                                        focus_y = (1 - x / drawing->get_width()) * (cam->active_array.at(3) - cam->active_array.at(1)) + cam->active_array.at(1);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        558 +
                                                    } else if(actual_orientation == 180) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        559 +
                                                        focus_x = (1 - x / drawing->get_width()) * (cam->active_array.at(2) - cam->active_array.at(0)) + cam->active_array.at(0);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        560 +
                                                        focus_y = (1 - y / drawing->get_height()) * (cam->active_array.at(3) - cam->active_array.at(1)) + cam->active_array.at(1);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        561 +
                                                    } else if(actual_orientation == 270) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        562 +
                                                        focus_x = (1 - y / drawing->get_height()) * (cam->active_array.at(2) - cam->active_array.at(0)) + cam->active_array.at(0);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        563 +
                                                        focus_y = x / drawing->get_width() * (cam->active_array.at(3) - cam->active_array.at(1)) + cam->active_array.at(1);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        564 +
                                                    }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        565 +
                                                    int focus_area_size = (cam->active_array.at(3) - cam->active_array.at(1) + cam->active_array.at(2) - cam->active_array.at(0)) / 128;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        566 +
                                                    std::ostringstream str;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        567 +
                                                    str.imbue(std::locale::classic());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        568 +
                                                    str << '(' << focus_x - focus_area_size << ',' << focus_y - focus_area_size << ',' << focus_x + focus_area_size << ',' << focus_y + focus_area_size << ',' << 1000 << ')';
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        569 +
                                                    std::cout << "focus is " << str.str() << '\n';
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        570 +
                                                    parameters["focus-areas"] = str.str();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        571 +
                                                    droid_media_camera_set_parameters(cam->camera, write_parameters(parameters).c_str());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        572 +
                                                    std::cout << "AF result: " << droid_media_camera_start_auto_focus(cam->camera) << '\n';
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        573 +
                                                });
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        574 +
                                                drawing->add_controller(clicker);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            575  
                                                    drawing->set_hexpand(true);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            576  
                                                    drawing->set_vexpand(true);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            577  
                                                    window->set_child(*box);