Move talk/media to webrtc/media

webrtc/media/base/videoadapter.cc

Index: webrtc/media/base/videoadapter.cc
diff --git a/talk/media/base/videoadapter.cc b/webrtc/media/base/videoadapter.cc
similarity index 93%
rename from talk/media/base/videoadapter.cc
rename to webrtc/media/base/videoadapter.cc
index edeed637221b04ebd6cf6fc74a36b9338c4c7235..05565c737c11356902e8f18a7b568bed1d09b8ad 100644
--- a/talk/media/base/videoadapter.cc
+++ b/webrtc/media/base/videoadapter.cc
@@ -1,40 +1,23 @@
 /*
- * libjingle
- * Copyright 2010 Google Inc.
+ *  Copyright 2010 The WebRTC Project Authors. All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  1. Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *  2. Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *  3. The name of the author may not be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "talk/media/base/videoadapter.h"
+#include "webrtc/media/base/videoadapter.h"
 
 #include <limits.h>  // For INT_MAX
 #include <algorithm>
 
-#include "talk/media/base/constants.h"
-#include "talk/media/base/videocommon.h"
-#include "talk/media/base/videoframe.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/timeutils.h"
+#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/videocommon.h"
+#include "webrtc/media/base/videoframe.h"
 
 namespace cricket {
 
@@ -303,8 +286,8 @@ VideoFormat VideoAdapter::AdaptFrameResolution(int in_width, int in_height) {
 
   const float scale = VideoAdapter::FindClosestViewScale(
       in_width, in_height, output_num_pixels_);
-  const int output_width = static_cast<int>(in_width * scale + .5f);
-  const int output_height = static_cast<int>(in_height * scale + .5f);
+  const size_t output_width = static_cast<size_t>(in_width * scale + .5f);
+  const size_t output_height = static_cast<size_t>(in_height * scale + .5f);
 
   ++frames_out_;
   if (scale != 1)