Merge remote-tracking branch 'origin/ds41t' into ds41t

yeshbourne · Sep 29, 2016 · 9686fbc · 9686fbc
2 parents 95c69ab + 610b60d
commit 9686fbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/device.cpp b/src/device.cpp
@@ -389,7 +389,7 @@ void rs_device_base::start_video_streaming()
                     for (int i = 4, j = 0; i < 12; ++i, ++j)
                         exposure |= ((data[i] & 0x01) << j);
 
-                    exposure_value[0] = exposure;
+                    exposure_value[0] = exposure * 0.2 * 10.;
                 }
             }
 

diff --git a/src/zr300.cpp b/src/zr300.cpp
@@ -643,16 +643,15 @@ namespace rsimpl
                         rs_option options[] = { RS_OPTION_FISHEYE_GAIN };
                         device->get_options(options, 1, gain);
                         values[0] = frame_ref->get_frame_metadata(RS_FRAME_METADATA_ACTUAL_EXPOSURE);
-                        values[0] /= 0.2; // Embedded Fisheye exposure value is in units of 0.2 mSec
                         values[1] = gain[0];
                     }
                     else
                     {
                         rs_option options[] = { RS_OPTION_FISHEYE_EXPOSURE, RS_OPTION_FISHEYE_GAIN };
                         device->get_options(options, 2, values);
-                        values[0] /= 10.; // Fisheye exposure value by extension control is in units of 10 mSec
                     }
 
+                    values[0] /= 10.; // Fisheye exposure value by extension control is in units of 10 mSec
                     frame_counter = device->get_frame_counter_by_usb_cmd();
                     push_back_exp_and_cnt(exposure_and_frame_counter(values[0], frame_counter));
                 }