VideoCapturerAndroid, handle cvo correctly

talk/app/webrtc/java/jni/androidvideocapturer_jni.cc

Index: talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
diff --git a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
index 054719a11d6bd0e572ffa688e944d2c15930c014..339a99dd89160806b775a36ce8c9828b147e9167 100644
--- a/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
+++ b/talk/app/webrtc/java/jni/androidvideocapturer_jni.cc
@@ -182,6 +182,7 @@ void AndroidVideoCapturerJni::OnMemoryBufferFrame(void* video_frame,
 
 void AndroidVideoCapturerJni::OnTextureFrame(int width,
                                              int height,
+                                             int rotation,
                                              int64_t timestamp_ns,
                                              const NativeHandleImpl& handle) {
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
@@ -191,7 +192,7 @@ void AndroidVideoCapturerJni::OnTextureFrame(int width,
                     timestamp_ns)));
   AsyncCapturerInvoke("OnIncomingFrame",
                       &webrtc::AndroidVideoCapturer::OnIncomingFrame,
-                      buffer, 0, timestamp_ns);
+                      buffer, rotation, timestamp_ns);
 }
 
 void AndroidVideoCapturerJni::OnOutputFormatRequest(int width,
@@ -225,9 +226,9 @@ JOW(void,
 JOW(void, VideoCapturerAndroid_00024NativeObserver_nativeOnTextureFrameCaptured)
     (JNIEnv* jni, jclass, jlong j_capturer, jint j_width, jint j_height,
         jint j_oes_texture_id, jfloatArray j_transform_matrix,
-        jlong j_timestamp) {
+        jint j_rotation, jlong j_timestamp) {
    reinterpret_cast<AndroidVideoCapturerJni*>(j_capturer)
-         ->OnTextureFrame(j_width, j_height, j_timestamp,
+         ->OnTextureFrame(j_width, j_height, j_rotation, j_timestamp,
                           NativeHandleImpl(jni, j_oes_texture_id,
                                            j_transform_matrix));
 }