| Index: media/capture/video/android/photo_capabilities.cc
|
| diff --git a/media/capture/video/android/photo_capabilities.cc b/media/capture/video/android/photo_capabilities.cc
|
| index 59f798f33df877526646c4ff2aa883cf1a08b009..3871477fa4b7827d898a591e903157eb8bb7c11a 100644
|
| --- a/media/capture/video/android/photo_capabilities.cc
|
| +++ b/media/capture/video/android/photo_capabilities.cc
|
| @@ -21,78 +21,69 @@ PhotoCapabilities::~PhotoCapabilities() {}
|
|
|
| int PhotoCapabilities::getMinIso() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getMinIso(AttachCurrentThread(), object_.obj());
|
| + return Java_PhotoCapabilities_getMinIso(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getMaxIso() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getMaxIso(AttachCurrentThread(), object_.obj());
|
| + return Java_PhotoCapabilities_getMaxIso(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getCurrentIso() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getCurrentIso(AttachCurrentThread(),
|
| - object_.obj());
|
| + return Java_PhotoCapabilities_getCurrentIso(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getMinHeight() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getMinHeight(AttachCurrentThread(),
|
| - object_.obj());
|
| + return Java_PhotoCapabilities_getMinHeight(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getMaxHeight() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getMaxHeight(AttachCurrentThread(),
|
| - object_.obj());
|
| + return Java_PhotoCapabilities_getMaxHeight(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getCurrentHeight() const {
|
| DCHECK(!object_.is_null());
|
| return Java_PhotoCapabilities_getCurrentHeight(AttachCurrentThread(),
|
| - object_.obj());
|
| + object_);
|
| }
|
|
|
| int PhotoCapabilities::getMinWidth() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getMinWidth(AttachCurrentThread(),
|
| - object_.obj());
|
| + return Java_PhotoCapabilities_getMinWidth(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getMaxWidth() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getMaxWidth(AttachCurrentThread(),
|
| - object_.obj());
|
| + return Java_PhotoCapabilities_getMaxWidth(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getCurrentWidth() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getCurrentWidth(AttachCurrentThread(),
|
| - object_.obj());
|
| + return Java_PhotoCapabilities_getCurrentWidth(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getMinZoom() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getMinZoom(AttachCurrentThread(),
|
| - object_.obj());
|
| + return Java_PhotoCapabilities_getMinZoom(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getMaxZoom() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getMaxZoom(AttachCurrentThread(),
|
| - object_.obj());
|
| + return Java_PhotoCapabilities_getMaxZoom(AttachCurrentThread(), object_);
|
| }
|
|
|
| int PhotoCapabilities::getCurrentZoom() const {
|
| DCHECK(!object_.is_null());
|
| - return Java_PhotoCapabilities_getCurrentZoom(AttachCurrentThread(),
|
| - object_.obj());
|
| + return Java_PhotoCapabilities_getCurrentZoom(AttachCurrentThread(), object_);
|
| }
|
|
|
| PhotoCapabilities::AndroidFocusMode PhotoCapabilities::getFocusMode() const {
|
| DCHECK(!object_.is_null());
|
| - return static_cast<AndroidFocusMode>(Java_PhotoCapabilities_getFocusMode(
|
| - AttachCurrentThread(), object_.obj()));
|
| + return static_cast<AndroidFocusMode>(
|
| + Java_PhotoCapabilities_getFocusMode(AttachCurrentThread(), object_));
|
| }
|
|
|
| } // namespace media
|
|
|