Merge webrtc/video_engine/ into webrtc/video/

talk/media/base/videocommon.cc

 /*
  * libjingle
  * Copyright 2010 Google Inc.
  *
  * 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,
@@ skipping 89 matching lines @@
   }
   return kScaleFactors[best_index];
 }
 
 // Computes a scale less to fit in max_pixels while maintaining aspect ratio.
 void ComputeScaleMaxPixels(int frame_width, int frame_height, int max_pixels,
     int* scaled_width, int* scaled_height) {
   ASSERT(scaled_width != NULL);
   ASSERT(scaled_height != NULL);
   ASSERT(max_pixels > 0);
-  // For VP8 the values for max width and height can be found here
-  // webrtc/src/video_engine/vie_defines.h (kViEMaxCodecWidth and
-  // kViEMaxCodecHeight)
   const int kMaxWidth = 4096;
   const int kMaxHeight = 3072;
   int new_frame_width = frame_width;
   int new_frame_height = frame_height;
 
   // Limit width.
   if (new_frame_width > kMaxWidth) {
     new_frame_height = new_frame_height * kMaxWidth / new_frame_width;
     new_frame_width = kMaxWidth;
   }
@@ skipping 115 matching lines @@
     }
   }
 
   std::ostringstream ss;
   ss << fourcc_name << width << "x" << height << "x"
      << IntervalToFpsFloat(interval);
   return ss.str();
 }
 
 }  // namespace cricket