Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: media/video/capture/android/video_capture_device_android.cc

Issue 659493003: Final step of the java_cpp_template -> java_cpp_enum migration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: delete some more template files Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/video/capture/android/video_capture_device_android.h" 5 #include "media/video/capture/android/video_capture_device_android.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 } 172 }
173 173
174 env->ReleaseByteArrayElements(data, buffer, JNI_ABORT); 174 env->ReleaseByteArrayElements(data, buffer, JNI_ABORT);
175 } 175 }
176 176
177 VideoPixelFormat VideoCaptureDeviceAndroid::GetColorspace() { 177 VideoPixelFormat VideoCaptureDeviceAndroid::GetColorspace() {
178 JNIEnv* env = AttachCurrentThread(); 178 JNIEnv* env = AttachCurrentThread();
179 int current_capture_colorspace = 179 int current_capture_colorspace =
180 Java_VideoCapture_getColorspace(env, j_capture_.obj()); 180 Java_VideoCapture_getColorspace(env, j_capture_.obj());
181 switch (current_capture_colorspace) { 181 switch (current_capture_colorspace) {
182 case ANDROID_IMAGEFORMAT_YV12: 182 case ANDROID_IMAGE_FORMAT_YV12:
183 return media::PIXEL_FORMAT_YV12; 183 return media::PIXEL_FORMAT_YV12;
184 case ANDROID_IMAGEFORMAT_NV21: 184 case ANDROID_IMAGE_FORMAT_NV21:
185 return media::PIXEL_FORMAT_NV21; 185 return media::PIXEL_FORMAT_NV21;
186 case ANDROID_IMAGEFORMAT_UNKNOWN: 186 case ANDROID_IMAGE_FORMAT_UNKNOWN:
187 default: 187 default:
188 return media::PIXEL_FORMAT_UNKNOWN; 188 return media::PIXEL_FORMAT_UNKNOWN;
189 } 189 }
190 } 190 }
191 191
192 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) { 192 void VideoCaptureDeviceAndroid::SetErrorState(const std::string& reason) {
193 { 193 {
194 base::AutoLock lock(lock_); 194 base::AutoLock lock(lock_);
195 state_ = kError; 195 state_ = kError;
196 } 196 }
197 client_->OnError(reason); 197 client_->OnError(reason);
198 } 198 }
199 199
200 } // namespace media 200 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698