-rw-r--r-- | camera/docs/docs.html | 32 | ||||
-rw-r--r-- | camera/docs/metadata_definitions.xml | 32 | ||||
-rw-r--r-- | camera/include/system/camera_metadata_tags.h | 8 | ||||
-rw-r--r-- | camera/src/camera_metadata_tag_info.c | 64 |
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index fa707ed..743e2e9 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -5052,13 +5052,13 @@ consistent field of views between different modes.<wbr/></p> <ul class="entry_type_enum"> <li> - <span class="entry_type_enum_name">TRUE (v3.2)</span> - <span class="entry_type_enum_notes"><p>AF regions (<a href="#controls_android.control.afRegions">android.<wbr/>control.<wbr/>af<wbr/>Regions</a>) have been set by the camera client.<wbr/></p></span> - </li> - <li> <span class="entry_type_enum_name">FALSE (v3.2)</span> <span class="entry_type_enum_notes"><p>AF regions (<a href="#controls_android.control.afRegions">android.<wbr/>control.<wbr/>af<wbr/>Regions</a>) have not been set by the camera client.<wbr/></p></span> </li> + <li> + <span class="entry_type_enum_name">TRUE (v3.2)</span> + <span class="entry_type_enum_notes"><p>AF regions (<a href="#controls_android.control.afRegions">android.<wbr/>control.<wbr/>af<wbr/>Regions</a>) have been set by the camera client.<wbr/></p></span> + </li> </ul> </td> <!-- entry_type --> @@ -5114,13 +5114,13 @@ set to MAXIMUM_<wbr/>RESOLUTION.<wbr/></p> <ul class="entry_type_enum"> <li> - <span class="entry_type_enum_name">TRUE (v3.2)</span> - <span class="entry_type_enum_notes"><p>AE regions (<a href="#controls_android.control.aeRegions">android.<wbr/>control.<wbr/>ae<wbr/>Regions</a>) have been set by the camera client.<wbr/></p></span> - </li> - <li> <span class="entry_type_enum_name">FALSE (v3.2)</span> <span class="entry_type_enum_notes"><p>AE regions (<a href="#controls_android.control.aeRegions">android.<wbr/>control.<wbr/>ae<wbr/>Regions</a>) have not been set by the camera client.<wbr/></p></span> </li> + <li> + <span class="entry_type_enum_name">TRUE (v3.2)</span> + <span class="entry_type_enum_notes"><p>AE regions (<a href="#controls_android.control.aeRegions">android.<wbr/>control.<wbr/>ae<wbr/>Regions</a>) have been set by the camera client.<wbr/></p></span> + </li> </ul> </td> <!-- entry_type --> @@ -5176,13 +5176,13 @@ set to MAXIMUM_<wbr/>RESOLUTION.<wbr/></p> <ul class="entry_type_enum"> <li> - <span class="entry_type_enum_name">TRUE (v3.2)</span> - <span class="entry_type_enum_notes"><p>AWB regions (<a href="#controls_android.control.awbRegions">android.<wbr/>control.<wbr/>awb<wbr/>Regions</a>) have been set by the camera client.<wbr/></p></span> - </li> - <li> <span class="entry_type_enum_name">FALSE (v3.2)</span> <span class="entry_type_enum_notes"><p>AWB regions (<a href="#controls_android.control.awbRegions">android.<wbr/>control.<wbr/>awb<wbr/>Regions</a>) have not been set by the camera client.<wbr/></p></span> </li> + <li> + <span class="entry_type_enum_name">TRUE (v3.2)</span> + <span class="entry_type_enum_notes"><p>AWB regions (<a href="#controls_android.control.awbRegions">android.<wbr/>control.<wbr/>awb<wbr/>Regions</a>) have been set by the camera client.<wbr/></p></span> + </li> </ul> </td> <!-- entry_type --> @@ -20463,13 +20463,13 @@ service.<wbr/></p> <ul class="entry_type_enum"> <li> - <span class="entry_type_enum_name">TRUE (v3.2)</span> - <span class="entry_type_enum_notes"><p>Crop region (<a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a>) has been set by the + <span class="entry_type_enum_name">FALSE (v3.2)</span> + <span class="entry_type_enum_notes"><p>Crop region (<a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a>) has not been set by the camera client.<wbr/></p></span> </li> <li> - <span class="entry_type_enum_name">FALSE (v3.2)</span> - <span class="entry_type_enum_notes"><p>Scaler crop regions (<a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a>) has not been set by the camera + <span class="entry_type_enum_name">TRUE (v3.2)</span> + <span class="entry_type_enum_notes"><p>Scaler crop regions (<a href="#controls_android.scaler.cropRegion">android.<wbr/>scaler.<wbr/>crop<wbr/>Region</a>) has been set by the camera client.<wbr/></p></span> </li> </ul> diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml index c23bd46..131cdd8 100644 --- a/camera/docs/metadata_definitions.xml +++ b/camera/docs/metadata_definitions.xml @@ -3406,13 +3406,13 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <entry name="afRegionsSet" type="byte" visibility="fwk_only" enum="true" typedef="boolean"> <enum> - <value>TRUE - <notes>AF regions (android.control.afRegions) have been set by the camera client. + <value>FALSE + <notes>AF regions (android.control.afRegions) have not been set by the camera client. </notes> </value> - <value>FALSE + <value>TRUE <notes> - AF regions (android.control.afRegions) have not been set by the camera client. + AF regions (android.control.afRegions) have been set by the camera client. </notes> </value> </enum> @@ -3429,13 +3429,13 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <entry name="aeRegionsSet" type="byte" visibility="fwk_only" enum="true" typedef="boolean"> <enum> - <value>TRUE - <notes> AE regions (android.control.aeRegions) have been set by the camera client. + <value>FALSE + <notes> AE regions (android.control.aeRegions) have not been set by the camera client. </notes> </value> - <value>FALSE + <value>TRUE <notes> - AE regions (android.control.aeRegions) have not been set by the camera client. + AE regions (android.control.aeRegions) have been set by the camera client. </notes> </value> </enum> @@ -3452,13 +3452,13 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <entry name="awbRegionsSet" type="byte" visibility="fwk_only" enum="true" typedef="boolean"> <enum> - <value>TRUE - <notes> AWB regions (android.control.awbRegions) have been set by the camera client. + <value>FALSE + <notes> AWB regions (android.control.awbRegions) have not been set by the camera client. </notes> </value> - <value>FALSE + <value>TRUE <notes> - AWB regions (android.control.awbRegions) have not been set by the camera client. + AWB regions (android.control.awbRegions) have been set by the camera client. </notes> </value> </enum> @@ -8164,14 +8164,14 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <entry name="cropRegionSet" type="byte" visibility="fwk_only" enum="true" typedef="boolean"> <enum> - <value>TRUE - <notes>Crop region (android.scaler.cropRegion) has been set by the + <value>FALSE + <notes>Crop region (android.scaler.cropRegion) has not been set by the camera client. </notes> </value> - <value>FALSE + <value>TRUE <notes> - Scaler crop regions (android.scaler.cropRegion) has not been set by the camera + Scaler crop regions (android.scaler.cropRegion) has been set by the camera client. </notes> </value> diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h index 2b3dfc2..68b4367 100644 --- a/camera/include/system/camera_metadata_tags.h +++ b/camera/include/system/camera_metadata_tags.h @@ -751,20 +751,20 @@ typedef enum camera_metadata_enum_android_control_extended_scene_mode { // ANDROID_CONTROL_AF_REGIONS_SET typedef enum camera_metadata_enum_android_control_af_regions_set { - ANDROID_CONTROL_AF_REGIONS_SET_TRUE , ANDROID_CONTROL_AF_REGIONS_SET_FALSE , + ANDROID_CONTROL_AF_REGIONS_SET_TRUE , } camera_metadata_enum_android_control_af_regions_set_t; // ANDROID_CONTROL_AE_REGIONS_SET typedef enum camera_metadata_enum_android_control_ae_regions_set { - ANDROID_CONTROL_AE_REGIONS_SET_TRUE , ANDROID_CONTROL_AE_REGIONS_SET_FALSE , + ANDROID_CONTROL_AE_REGIONS_SET_TRUE , } camera_metadata_enum_android_control_ae_regions_set_t; // ANDROID_CONTROL_AWB_REGIONS_SET typedef enum camera_metadata_enum_android_control_awb_regions_set { - ANDROID_CONTROL_AWB_REGIONS_SET_TRUE , ANDROID_CONTROL_AWB_REGIONS_SET_FALSE , + ANDROID_CONTROL_AWB_REGIONS_SET_TRUE , } camera_metadata_enum_android_control_awb_regions_set_t; @@ -985,8 +985,8 @@ typedef enum camera_metadata_enum_android_scaler_multi_resolution_stream_support // ANDROID_SCALER_CROP_REGION_SET typedef enum camera_metadata_enum_android_scaler_crop_region_set { - ANDROID_SCALER_CROP_REGION_SET_TRUE , ANDROID_SCALER_CROP_REGION_SET_FALSE , + ANDROID_SCALER_CROP_REGION_SET_TRUE , } camera_metadata_enum_android_scaler_crop_region_set_t; diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c index 94bead3..3ac8d9b 100644 --- a/camera/src/camera_metadata_tag_info.c +++ b/camera/src/camera_metadata_tag_info.c @@ -1655,14 +1655,14 @@ int camera_metadata_enum_snprint(uint32_t tag, } case ANDROID_CONTROL_AF_REGIONS_SET: { switch (value) { - case ANDROID_CONTROL_AF_REGIONS_SET_TRUE: - msg = "TRUE"; - ret = 0; - break; case ANDROID_CONTROL_AF_REGIONS_SET_FALSE: msg = "FALSE"; ret = 0; break; + case ANDROID_CONTROL_AF_REGIONS_SET_TRUE: + msg = "TRUE"; + ret = 0; + break; default: msg = "error: enum value out of range"; } @@ -1670,14 +1670,14 @@ int camera_metadata_enum_snprint(uint32_t tag, } case ANDROID_CONTROL_AE_REGIONS_SET: { switch (value) { - case ANDROID_CONTROL_AE_REGIONS_SET_TRUE: - msg = "TRUE"; - ret = 0; - break; case ANDROID_CONTROL_AE_REGIONS_SET_FALSE: msg = "FALSE"; ret = 0; break; + case ANDROID_CONTROL_AE_REGIONS_SET_TRUE: + msg = "TRUE"; + ret = 0; + break; default: msg = "error: enum value out of range"; } @@ -1685,14 +1685,14 @@ int camera_metadata_enum_snprint(uint32_t tag, } case ANDROID_CONTROL_AWB_REGIONS_SET: { switch (value) { - case ANDROID_CONTROL_AWB_REGIONS_SET_TRUE: - msg = "TRUE"; - ret = 0; - break; case ANDROID_CONTROL_AWB_REGIONS_SET_FALSE: msg = "FALSE"; ret = 0; break; + case ANDROID_CONTROL_AWB_REGIONS_SET_TRUE: + msg = "TRUE"; + ret = 0; + break; default: msg = "error: enum value out of range"; } @@ -2488,14 +2488,14 @@ int camera_metadata_enum_snprint(uint32_t tag, } case ANDROID_SCALER_CROP_REGION_SET: { switch (value) { - case ANDROID_SCALER_CROP_REGION_SET_TRUE: - msg = "TRUE"; - ret = 0; - break; case ANDROID_SCALER_CROP_REGION_SET_FALSE: msg = "FALSE"; ret = 0; break; + case ANDROID_SCALER_CROP_REGION_SET_TRUE: + msg = "TRUE"; + ret = 0; + break; default: msg = "error: enum value out of range"; } @@ -4330,45 +4330,45 @@ int camera_metadata_enum_value(uint32_t tag, break; } case ANDROID_CONTROL_AF_REGIONS_SET: { - enumName = "TRUE"; + enumName = "FALSE"; if (strncmp(name, enumName, size) == 0) { - *value = ANDROID_CONTROL_AF_REGIONS_SET_TRUE; + *value = ANDROID_CONTROL_AF_REGIONS_SET_FALSE; ret = 0; break; } - enumName = "FALSE"; + enumName = "TRUE"; if (strncmp(name, enumName, size) == 0) { - *value = ANDROID_CONTROL_AF_REGIONS_SET_FALSE; + *value = ANDROID_CONTROL_AF_REGIONS_SET_TRUE; ret = 0; break; } break; } case ANDROID_CONTROL_AE_REGIONS_SET: { - enumName = "TRUE"; + enumName = "FALSE"; if (strncmp(name, enumName, size) == 0) { - *value = ANDROID_CONTROL_AE_REGIONS_SET_TRUE; + *value = ANDROID_CONTROL_AE_REGIONS_SET_FALSE; ret = 0; break; } - enumName = "FALSE"; + enumName = "TRUE"; if (strncmp(name, enumName, size) == 0) { - *value = ANDROID_CONTROL_AE_REGIONS_SET_FALSE; + *value = ANDROID_CONTROL_AE_REGIONS_SET_TRUE; ret = 0; break; } break; } case ANDROID_CONTROL_AWB_REGIONS_SET: { - enumName = "TRUE"; + enumName = "FALSE"; if (strncmp(name, enumName, size) == 0) { - *value = ANDROID_CONTROL_AWB_REGIONS_SET_TRUE; + *value = ANDROID_CONTROL_AWB_REGIONS_SET_FALSE; ret = 0; break; } - enumName = "FALSE"; + enumName = "TRUE"; if (strncmp(name, enumName, size) == 0) { - *value = ANDROID_CONTROL_AWB_REGIONS_SET_FALSE; + *value = ANDROID_CONTROL_AWB_REGIONS_SET_TRUE; ret = 0; break; } @@ -5257,15 +5257,15 @@ int camera_metadata_enum_value(uint32_t tag, break; } case ANDROID_SCALER_CROP_REGION_SET: { - enumName = "TRUE"; + enumName = "FALSE"; if (strncmp(name, enumName, size) == 0) { - *value = ANDROID_SCALER_CROP_REGION_SET_TRUE; + *value = ANDROID_SCALER_CROP_REGION_SET_FALSE; ret = 0; break; } - enumName = "FALSE"; + enumName = "TRUE"; if (strncmp(name, enumName, size) == 0) { - *value = ANDROID_SCALER_CROP_REGION_SET_FALSE; + *value = ANDROID_SCALER_CROP_REGION_SET_TRUE; ret = 0; break; } |