Consolidate duplicated frame / capability structures in video_capture_types.h

media/video/capture/fake_video_capture_device.cc

 // Copyright (c) 2012 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.
 
 #include "media/video/capture/fake_video_capture_device.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 60 matching lines @@
     EventHandler* observer) {
   capture_format_.frame_size_type = capture_format.frame_size_type;
   if (capture_format.frame_size_type == VariableResolutionVideoCaptureDevice)
     PopulateCapabilitiesRoster();
 
   if (state_ != kIdle) {
     return;  // Wrong state.
   }
 
   observer_ = observer;
-  capture_format_.color = VideoCaptureCapability::kI420;
+  capture_format_.color = kI420;
   capture_format_.expected_capture_delay = 0;
   capture_format_.interlaced = false;
   if (capture_format.width > 320) {  // VGA
     capture_format_.width = 640;
     capture_format_.height = 480;
     capture_format_.frame_rate = 30;
   } else {  // QVGA
     capture_format_.width = 320;
     capture_format_.height = 240;
     capture_format_.frame_rate = 30;
   }
 
   size_t fake_frame_size =
       capture_format_.width * capture_format_.height * 3 / 2;
   fake_frame_.reset(new uint8[fake_frame_size]);
 
   state_ = kAllocated;
   observer_->OnFrameInfo(capture_format_);
 }
 
 void FakeVideoCaptureDevice::Reallocate() {
   DCHECK_EQ(state_, kCapturing);
   capture_format_ = capabilities_roster_.at(++capabilities_roster_index_ %
                                             capabilities_roster_.size());
-  DCHECK_EQ(capture_format_.color, VideoCaptureCapability::kI420);
+  DCHECK_EQ(capture_format_.color, kI420);
   DVLOG(3) << "Reallocating FakeVideoCaptureDevice, new capture resolution ("
            << capture_format_.width << "x" << capture_format_.height << ")";
 
   size_t fake_frame_size =
       capture_format_.width * capture_format_.height * 3 / 2;
   fake_frame_.reset(new uint8[fake_frame_size]);
 
   observer_->OnFrameInfoChanged(capture_format_);
 }
 
@@ skipping 101 matching lines @@
       base::Bind(&FakeVideoCaptureDevice::OnCaptureTask,
                  base::Unretained(this)),
       base::TimeDelta::FromMilliseconds(kFakeCaptureTimeoutMs));
 }
 
 void FakeVideoCaptureDevice::PopulateCapabilitiesRoster() {
   capabilities_roster_.push_back(
       media::VideoCaptureCapability(320,
                                     240,
                                     30,
-                                    VideoCaptureCapability::kI420,
+                                    kI420,
                                     0,
                                     false,
                                     VariableResolutionVideoCaptureDevice));
   capabilities_roster_.push_back(
       media::VideoCaptureCapability(640,
                                     480,
                                     30,
-                                    VideoCaptureCapability::kI420,
+                                    kI420,
                                     0,
                                     false,
                                     VariableResolutionVideoCaptureDevice));
   capabilities_roster_.push_back(
       media::VideoCaptureCapability(800,
                                     600,
                                     30,
-                                    VideoCaptureCapability::kI420,
+                                    kI420,
                                     0,
                                     false,
                                     VariableResolutionVideoCaptureDevice));
 
   capabilities_roster_index_ = 0;
 }
 
 }  // namespace media