diff options
| -rw-r--r-- | camera/docs/README.md | 2 | ||||
| -rw-r--r-- | camera/docs/docs.html | 9 | ||||
| -rwxr-xr-x | camera/docs/metadata-generate | 4 | ||||
| -rwxr-xr-x | camera/docs/metadata-parser-validity-check (renamed from camera/docs/metadata-parser-sanity-check) | 0 | ||||
| -rw-r--r-- | camera/docs/metadata_definitions.xml | 9 | ||||
| -rw-r--r-- | camera/include/system/camera_metadata.h | 2 |
6 files changed, 14 insertions, 12 deletions
diff --git a/camera/docs/README.md b/camera/docs/README.md index 6f3cbd7..0bc27a3 100644 --- a/camera/docs/README.md +++ b/camera/docs/README.md @@ -4,7 +4,7 @@ This is a set of scripts to manipulate the camera metadata in an XML form. ## Generated Files Many files can be generated from XML, such as the documentation (html/pdf), -C code, Java code, and even XML itself (as a sanity check). +C code, Java code, and even XML itself (as a round-trip validity check). ## Dependencies * Python 2.7.x+ diff --git a/camera/docs/docs.html b/camera/docs/docs.html index d898729..bda9616 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -32898,10 +32898,11 @@ start-of-exposure time.<wbr/></p></span> <tr class="entry_cont"> <td class="entry_details" colspan="6"> <p>The accuracy of the frame timestamp synchronization determines the physical cameras' -ability to start exposure at the same time.<wbr/> If the sensorSyncType is CALIBRATED,<wbr/> -the physical camera sensors usually run in master-slave mode so that their shutter -time is synchronized.<wbr/> For APPROXIMATE sensorSyncType,<wbr/> the camera sensors usually run in -master-master mode,<wbr/> and there could be offset between their start of exposure.<wbr/></p> +ability to start exposure at the same time.<wbr/> If the sensorSyncType is CALIBRATED,<wbr/> the +physical camera sensors usually run in leader/<wbr/>follower mode where one sensor generates a +timing signal for the other,<wbr/> so that their shutter time is synchronized.<wbr/> For APPROXIMATE +sensorSyncType,<wbr/> the camera sensors usually run in leader/<wbr/>leader mode,<wbr/> where both sensors +use their own timing generator,<wbr/> and there could be offset between their start of exposure.<wbr/></p> <p>In both cases,<wbr/> all images generated for a particular capture request still carry the same timestamps,<wbr/> so that they can be used to look up the matching frame number and onCaptureStarted callback.<wbr/></p> diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate index b8c6bbf..72e54e0 100755 --- a/camera/docs/metadata-generate +++ b/camera/docs/metadata-generate @@ -128,7 +128,7 @@ function insert_file() { (( start_line-- )) (( end_line++ )) - # Do some basic sanity checks + # Do some basic validity checks if [[ -z "$start_line" ]]; then echo "No starting delimiter found in ${dst_file}" >& 2 @@ -192,7 +192,7 @@ function copy_directory() { $thisdir/metadata-check-dependencies || exit 1 $thisdir/metadata-validate $thisdir/metadata_definitions.xml || exit 1 -$thisdir/metadata-parser-sanity-check || exit 1 +$thisdir/metadata-parser-validity-check || exit 1 # Generate HTML properties documentation gen_file html.mako docs.html || exit 1 diff --git a/camera/docs/metadata-parser-sanity-check b/camera/docs/metadata-parser-validity-check index fc97b7c..fc97b7c 100755 --- a/camera/docs/metadata-parser-sanity-check +++ b/camera/docs/metadata-parser-validity-check diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml index 28b7afe..ca35e8d 100644 --- a/camera/docs/metadata_definitions.xml +++ b/camera/docs/metadata_definitions.xml @@ -11280,10 +11280,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <description>The accuracy of frame timestamp synchronization between physical cameras</description> <details> The accuracy of the frame timestamp synchronization determines the physical cameras' - ability to start exposure at the same time. If the sensorSyncType is CALIBRATED, - the physical camera sensors usually run in master-slave mode so that their shutter - time is synchronized. For APPROXIMATE sensorSyncType, the camera sensors usually run in - master-master mode, and there could be offset between their start of exposure. + ability to start exposure at the same time. If the sensorSyncType is CALIBRATED, the + physical camera sensors usually run in leader/follower mode where one sensor generates a + timing signal for the other, so that their shutter time is synchronized. For APPROXIMATE + sensorSyncType, the camera sensors usually run in leader/leader mode, where both sensors + use their own timing generator, and there could be offset between their start of exposure. In both cases, all images generated for a particular capture request still carry the same timestamps, so that they can be used to look up the matching frame number and diff --git a/camera/include/system/camera_metadata.h b/camera/include/system/camera_metadata.h index 30ce9f3..d99340e 100644 --- a/camera/include/system/camera_metadata.h +++ b/camera/include/system/camera_metadata.h @@ -286,7 +286,7 @@ enum { }; /** - * Validate that a metadata is structurally sane. That is, its internal + * Validate that a metadata is structurally correct. That is, its internal * state is such that we won't get buffer overflows or run into other * 'impossible' issues when calling the other API functions. * |