OSDN Git Service

camera_metadata: add lens facing EXTERNAL enum
authorZhijun He <zhijunhe@google.com>
Mon, 12 Jan 2015 23:06:16 +0000 (15:06 -0800)
committerZhijun He <zhijunhe@google.com>
Wed, 18 Mar 2015 01:01:16 +0000 (18:01 -0700)
This is for usb camera support

Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b

camera/docs/docs.html
camera/docs/metadata_properties.xml
camera/include/system/camera_metadata_tags.h
camera/src/camera_metadata_tag_info.c

index 0674494..aad0c40 100644 (file)
@@ -11500,6 +11500,11 @@ the output diopter value should be changing toward 0.<wbr/></p>
                     <span class="entry_type_enum_name">BACK</span>
                     <span class="entry_type_enum_notes"><p>The camera device faces the opposite direction as the device's screen.<wbr/></p></span>
                   </li>
+                  <li>
+                    <span class="entry_type_enum_name">EXTERNAL</span>
+                    <span class="entry_type_enum_notes"><p>The camera device is an external camera,<wbr/> and has no fixed facing relative to the
+device's screen.<wbr/></p></span>
+                  </li>
                 </ul>
 
             </td> <!-- entry_type -->
index d7ce6df..b92cf42 100644 (file)
@@ -3293,6 +3293,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             <notes>
               The camera device faces the opposite direction as the device's screen.
             </notes></value>
+            <value>EXTERNAL
+            <notes>
+              The camera device is an external camera, and has no fixed facing relative to the
+              device's screen.
+            </notes></value>
           </enum>
           <description>Direction the camera faces relative to
           device screen.</description>
index e6349c2..a82dd00 100644 (file)
@@ -611,6 +611,7 @@ typedef enum camera_metadata_enum_android_lens_optical_stabilization_mode {
 typedef enum camera_metadata_enum_android_lens_facing {
     ANDROID_LENS_FACING_FRONT,
     ANDROID_LENS_FACING_BACK,
+    ANDROID_LENS_FACING_EXTERNAL,
 } camera_metadata_enum_android_lens_facing_t;
 
 // ANDROID_LENS_STATE
index 14174c3..0fcf529 100644 (file)
@@ -1441,6 +1441,10 @@ int camera_metadata_enum_snprint(uint32_t tag,
                     msg = "BACK";
                     ret = 0;
                     break;
+                case ANDROID_LENS_FACING_EXTERNAL:
+                    msg = "EXTERNAL";
+                    ret = 0;
+                    break;
                 default:
                     msg = "error: enum value out of range";
             }