Merge branch 'eomine-fix_rec_video_orientation_hint'

pull/1/head
Dylan McIntyre 8 years ago
commit b99cc8f746
  1. 15
      README.md
  2. 2
      camerakit/src/main/res/values/attrs.xml

@ -174,7 +174,7 @@ cameraView.setFacing(CameraKit.Constants.FACING_FRONT);
- - -
### `ckFlash`
[`off`](#off) [`on`](#on) [`auto`](#auto)
[`off`](#off) [`on`](#on) [`auto`](#auto) [`torch`](#torch)
#### `off`
@ -194,6 +194,11 @@ cameraView.setFlash(CameraKit.Constants.FLASH_ON);
cameraView.setFlash(CameraKit.Constants.FLASH_AUTO);
```
#### `torch`
```java
cameraView.setFlash(CameraKit.Constants.FLASH_TORCH);
```
- - -
### `ckFocus`
@ -316,7 +321,7 @@ cameraView.setJpegQuality(100);
- - -
### `ckVideoQuality`
[`max480p`](#max480p) [`max720p`](#max720p) [`max1080p`](#max1080p) [`max2160p`](#max2160p) [`highest`](#highest) [`lowest`](#lowest)
[`max480p`](#max480p) [`max720p`](#max720p) [`max1080p`](#max1080p) [`max2160p`](#max2160p) [`lowest`](#lowest) [`highest`](#highest) [`qvga`](#qvga)
#### `max480p`
@ -354,6 +359,12 @@ cameraView.setVideoQuality(CameraKit.Constants.VIDEO_QUALITY_LOWEST);
cameraView.setVideoQuality(CameraKit.Constants.VIDEO_QUALITY_HIGHEST);
```
#### `qvga`
```java
cameraView.setVideoQuality(CameraKit.Constants.VIDEO_QUALITY_QVGA);
```
- - -
## Automatic Permissions Behavior

@ -47,13 +47,13 @@
<attr name="ckJpegQuality" format="integer" />
<attr name="ckVideoQuality" format="enum">
<enum name="maxQVGA" value="6" />
<enum name="max480p" value="0" />
<enum name="max720p" value="1" />
<enum name="max1080p" value="2" />
<enum name="max2160p" value="3" />
<enum name="highest" value="4" />
<enum name="lowest" value="5" />
<enum name="qvga" value="6" />
</attr>
<attr name="ckCropOutput" format="boolean" />

Loading…
Cancel
Save