From 8fbdcfd73f22a76747cc33aa12c46b8240948258 Mon Sep 17 00:00:00 2001
From: "perkj@webrtc.org" <perkj@webrtc.org>
Date: Wed, 18 Feb 2015 15:19:39 +0000
Subject: [PATCH] Revert "Switch default color format to YV12."

This reverts commit 1c3e728aa9b886fd3ee008a5aed956759bc3f82d.

Reason: Fails test running on Nexus 9 bots - org.webrtc.VideoCapturerAndroidTest#testStartStopWithDifferentResolutions.
Note that all other tests pass so it seems like there is resolution supported by the device that can't use YV12.

TBR=glaznev@webrtc.org
BUG=4011

Review URL: https://webrtc-codereview.appspot.com/42389004

Cr-Commit-Position: refs/heads/master@{#8414}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8414 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/app/webrtc/androidvideocapturer.cc                     | 6 +++---
 .../webrtc/java/src/org/webrtc/VideoCapturerAndroid.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/talk/app/webrtc/androidvideocapturer.cc b/talk/app/webrtc/androidvideocapturer.cc
index 05fa9b98b9..3264421db7 100644
--- a/talk/app/webrtc/androidvideocapturer.cc
+++ b/talk/app/webrtc/androidvideocapturer.cc
@@ -63,7 +63,7 @@ class AndroidVideoCapturer::FrameFactory : public cricket::VideoFrameFactory {
                            int length,
                            int rotation,
                            int64 time_stamp_in_ms) {
-    captured_frame_.fourcc = static_cast<uint32>(cricket::FOURCC_YV12);
+    captured_frame_.fourcc = static_cast<uint32>(cricket::FOURCC_NV21);
     captured_frame_.data = frame_data;
     captured_frame_.elapsed_time = rtc::TimeNanos() - start_time_;
     captured_frame_.time_stamp =
@@ -120,7 +120,7 @@ AndroidVideoCapturer::AndroidVideoCapturer(
           json_value["width"].asInt(),
           json_value["height"].asInt(),
           cricket::VideoFormat::FpsToInterval(json_value["framerate"].asInt()),
-          cricket::FOURCC_YV12);
+          cricket::FOURCC_NV21);
       formats.push_back(format);
   }
   SetSupportedFormats(formats);
@@ -169,7 +169,7 @@ bool AndroidVideoCapturer::IsRunning() {
 }
 
 bool AndroidVideoCapturer::GetPreferredFourccs(std::vector<uint32>* fourccs) {
-  fourccs->push_back(cricket::FOURCC_YV12);
+  fourccs->push_back(cricket::FOURCC_NV21);
   return true;
 }
 
diff --git a/talk/app/webrtc/java/src/org/webrtc/VideoCapturerAndroid.java b/talk/app/webrtc/java/src/org/webrtc/VideoCapturerAndroid.java
index e40b7029d9..2650e7137c 100644
--- a/talk/app/webrtc/java/src/org/webrtc/VideoCapturerAndroid.java
+++ b/talk/app/webrtc/java/src/org/webrtc/VideoCapturerAndroid.java
@@ -386,7 +386,7 @@ public class VideoCapturerAndroid extends VideoCapturer implements PreviewCallba
       }
       parameters.setPictureSize(width, height);
       parameters.setPreviewSize(width, height);
-      int format = ImageFormat.YV12;
+      int format = ImageFormat.NV21;
       parameters.setPreviewFormat(format);
       camera.setParameters(parameters);
       // Note: setRecordingHint(true) actually decrease frame rate on N5.