Remove redundant I420-to-YV12 conversion in MediaStreamVideoTrack.

ppapi/tests/test_media_stream_video_track.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Tests PPB_MediaStreamVideoTrack interface.
 
 #include "ppapi/tests/test_media_stream_video_track.h"
 
 #include "ppapi/c/private/ppb_testing_private.h"
 #include "ppapi/cpp/completion_callback.h"
@@ skipping 80 matching lines @@
   PP_TimeDelta timestamp = 0.0;
 
   // Get |kTimes| frames.
   for (int i = 0; i < kTimes; ++i) {
     TestCompletionCallbackWithOutput<pp::VideoFrame> cc(
         instance_->pp_instance(), false);
     cc.WaitForResult(video_track_.GetFrame(cc.GetCallback()));
     ASSERT_EQ(PP_OK, cc.result());
     pp::VideoFrame frame = cc.output();
     ASSERT_FALSE(frame.is_null());
-    ASSERT_EQ(frame.GetFormat(), PP_VIDEOFRAME_FORMAT_YV12);
+    ASSERT_TRUE(frame.GetFormat() == PP_VIDEOFRAME_FORMAT_YV12 ||
+                frame.GetFormat() == PP_VIDEOFRAME_FORMAT_I420);
 
     pp::Size size;
     ASSERT_TRUE(frame.GetSize(&size));
     ASSERT_EQ(size.width(), kDefaultWidth);
     ASSERT_EQ(size.height(), kDefaultHeight);
 
     ASSERT_GE(frame.GetTimestamp(), timestamp);
     timestamp = frame.GetTimestamp();
 
     ASSERT_GT(frame.GetDataBufferSize(), 0U);
@@ skipping 45 matching lines @@
     cc1.WaitForResult(video_track_.Configure(attrib_list, cc1.GetCallback()));
     ASSERT_EQ(PP_OK, cc1.result());
 
     for (int j = 0; j < kTimes; ++j) {
       TestCompletionCallbackWithOutput<pp::VideoFrame> cc2(
           instance_->pp_instance(), false);
       cc2.WaitForResult(video_track_.GetFrame(cc2.GetCallback()));
       ASSERT_EQ(PP_OK, cc2.result());
       pp::VideoFrame frame = cc2.output();
       ASSERT_FALSE(frame.is_null());
-      ASSERT_EQ(frame.GetFormat(), formats[i].expected_format);
+      if (formats[i].format != PP_VIDEOFRAME_FORMAT_UNKNOWN) {
+        ASSERT_EQ(frame.GetFormat(), formats[i].expected_format);
+      } else {
+        // Both YV12 and I420 are acceptable as default YUV formats.
+        ASSERT_TRUE(frame.GetFormat() == PP_VIDEOFRAME_FORMAT_YV12 ||
+                    frame.GetFormat() == PP_VIDEOFRAME_FORMAT_I420);
+      }
 
       pp::Size size;
       ASSERT_TRUE(frame.GetSize(&size));
       ASSERT_EQ(size.width(), kDefaultWidth);
       ASSERT_EQ(size.height(), kDefaultHeight);
 
       ASSERT_GT(frame.GetDataBufferSize(), 0U);
       ASSERT_TRUE(frame.GetDataBuffer() != NULL);
 
       video_track_.RecycleFrame(frame);
@@ skipping 21 matching lines @@
     cc1.WaitForResult(video_track_.Configure(attrib_list, cc1.GetCallback()));
     ASSERT_EQ(PP_OK, cc1.result());
 
     for (int j = 0; j < kTimes; ++j) {
       TestCompletionCallbackWithOutput<pp::VideoFrame> cc2(
           instance_->pp_instance(), false);
       cc2.WaitForResult(video_track_.GetFrame(cc2.GetCallback()));
       ASSERT_EQ(PP_OK, cc2.result());
       pp::VideoFrame frame = cc2.output();
       ASSERT_FALSE(frame.is_null());
-      ASSERT_EQ(frame.GetFormat(), PP_VIDEOFRAME_FORMAT_YV12);
+      ASSERT_TRUE(frame.GetFormat() == PP_VIDEOFRAME_FORMAT_YV12 ||
+                  frame.GetFormat() == PP_VIDEOFRAME_FORMAT_I420);
 
       pp::Size size;
       ASSERT_TRUE(frame.GetSize(&size));
       ASSERT_EQ(size.width(), sizes[i].expect_width);
       ASSERT_EQ(size.height(), sizes[i].expect_height);
 
       ASSERT_GT(frame.GetDataBufferSize(), 0U);
       ASSERT_TRUE(frame.GetDataBuffer() != NULL);
 
       video_track_.RecycleFrame(frame);
     }
   }
 
   // Close the track.
   video_track_.Close();
   ASSERT_TRUE(video_track_.HasEnded());
   video_track_ = pp::MediaStreamVideoTrack();
   PASS();
 }