fix JPEG orientation setting

main.cc

@@ -15,6 +15,7 @@

                                
                                
                                
                            
                                
                                    
                                        
                                            15  
                                            #include <ctime>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            16  
                                            #include <sstream>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            17  
                                            #include <iomanip>
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        18 +
                                        #include <unordered_map>
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            19  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            20  
                                            static inline uint8_t clamp(int v) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            21  
                                                return v < 0 ? 0 : (v > 255 ? 255 : v);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -30,6 +31,14 @@ inline void set_expand_in_direction(Gtk::Widget &widget, Gtk::Orientation orient

                                
                                
                                
                            
                                
                                    
                                        
                                            31  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            32  
                                            }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            33  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        34 +
                                        std::string write_parameters(std::unordered_map<std::string, std::string> const parameters) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        35 +
                                            std::stringstream str;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        36 +
                                            for(auto const &param: parameters) {
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        37 +
                                                str << param.first << '=' << param.second << ';';
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        38 +
                                            }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        39 +
                                            return str.str();
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        40 +
                                        }
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        41 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            42  
                                            std::map<std::string, int> const ORIENTATIONS = {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            43  
                                                {"", 0},
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            44  
                                                {"normal", 0},
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -195,6 +204,8 @@ class PanoramaCamera : public Gtk::Application {

                                
                                
                                
                            
                                
                                    
                                        
                                            204  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            205  
                                                sigc::connection compressed_image_connection, frame_available_connection, accelerometer_connection;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            206  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        207 +
                                            std::unordered_map<std::string, std::string> parameters;
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        208 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            209  
                                                int device_rotation_degrees = 0;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            210  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            211  
                                                void on_compressed_image(DroidMediaData *mem) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -333,12 +344,12 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            344  
                                                    format_adjustment->signal_value_changed().connect([this]() {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            345  
                                                        int value = format_adjustment->get_value(), w = cam->picture_sizes.at(cam->picture_sizes.size() - 1 - value).first, h = cam->picture_sizes.at(cam->picture_sizes.size() - 1 - value).second;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            346  
                                                        droid_media_camera_stop_preview(cam->camera);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        336 -
                                                    std::string param_str = "picture-size=" + std::to_string(w) + "x" + std::to_string(h) + ";preview-size=1024x768;video-size=176x144;sensitivity=100;exposure-time=83200;flash-mode=off;";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        337 -
                                                    std::cout << param_str << '\n';
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        347 +
                                                    parameters["picture-size"] = std::to_string(w) + "x" + std::to_string(h);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            348  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        339 -
                                                    droid_media_camera_set_parameters(cam->camera, param_str.c_str());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        349 +
                                                    std::string new_params = write_parameters(parameters);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        350 +
                                                    droid_media_camera_set_parameters(cam->camera, new_params.c_str());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            351  
                                                        droid_media_camera_start_preview(cam->camera);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        341 -
                                                    droid_media_camera_set_parameters(cam->camera, param_str.c_str());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        352 +
                                                    droid_media_camera_set_parameters(cam->camera, new_params.c_str());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            353  
                                                        if(format_label) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            354  
                                                            format_label->set_text(std::to_string(w) + "×" + std::to_string(h));
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            355  
                                                        }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -347,14 +358,16 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            358  
                                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            359  
                                                    std::cout << droid_media_camera_get_parameters(cam->camera) << '\n';
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            360  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        361 +
                                                parameters["picture-size"] = "1920x1080";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        362 +
                                                parameters["preview-size"] = "1024x768";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        363 +
                                                parameters["video-size"] = "176x144";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        364 +
                                                parameters["sensitivity"] = "100";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        365 +
                                                parameters["exposure-time"] = "83200";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        366 +
                                                parameters["flash-mode"] = "off";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        367 +
                                        
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            368  
                                                    droid_media_camera_set_parameters(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            369  
                                                        cam->camera,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        352 -
                                                    "picture-size=1920x1080;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        353 -
                                                    "preview-size=1024x768;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        354 -
                                                    "video-size=176x144;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        355 -
                                                    "sensitivity=100;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        356 -
                                                    "exposure-time=83200;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        357 -
                                                    "flash-mode=off;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        370 +
                                                    write_parameters(parameters).c_str()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            371  
                                                    );
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            372  
                                                    
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            373  
                                                    compressed_image_connection = cam->signal_compressed_image.connect(sigc::mem_fun(*this, &PanoramaCamera::on_compressed_image));
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -373,12 +386,7 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            386  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            387  
                                                    droid_media_camera_set_parameters(
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            388  
                                                        cam->camera,
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        376 -
                                                    "picture-size=1920x1080;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        377 -
                                                    "preview-size=1024x576;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        378 -
                                                    "video-size=176x144;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        379 -
                                                    "sensitivity=100;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        380 -
                                                    "exposure-time=83200;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        381 -
                                                    "flash-mode=off;"
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        389 +
                                                    write_parameters(parameters).c_str()
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            390  
                                                    );
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            391  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            392  
                                                    fprintf(stderr, "start_preview OK\n");
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        

@@ -423,8 +431,9 @@ public:

                                
                                
                                
                            
                                
                                    
                                        
                                            431  
                                                void on_orientation_changed(std::string const &orientation) {
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            432  
                                                    device_rotation_degrees = ORIENTATIONS.at(orientation);
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            433  
                                                    int actual_orientation = (cam->physical_info.orientation + device_rotation_degrees) % 360;
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        426 -
                                                std::string param_str = "jpeg-orientation=" + std::to_string(actual_orientation); + ";";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        427 -
                                                droid_media_camera_set_parameters(cam->camera, param_str.c_str());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        434 +
                                                std::cout << "rotation is " << actual_orientation << " degrees!\n";
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        435 +
                                                parameters["jpeg-orientation"] = std::to_string(actual_orientation);
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        436 +
                                                droid_media_camera_set_parameters(cam->camera, write_parameters(parameters).c_str());
                                        
                                        
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            437  
                                                }
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            438  
                                            
                                        
                                        
                                            
                                            
                                            
                                            
                                        
                                    
                                
                                
                                
                            
                                
                                    
                                        
                                            439  
                                                void on_activate() override {