Delete RawVideoType enum, use the VideoType enum instead.

webrtc/modules/video_coding/codecs/i420/i420.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  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.
  */
 
@@ skipping 39 matching lines @@
   if (codecSettings->width < 1 || codecSettings->height < 1) {
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
 
   // Allocating encoded memory.
   if (_encodedImage._buffer != NULL) {
     delete[] _encodedImage._buffer;
     _encodedImage._buffer = NULL;
     _encodedImage._size = 0;
   }
-  const size_t newSize =
-      CalcBufferSize(kI420, codecSettings->width, codecSettings->height) +
-      kI420HeaderSize;
+  const size_t newSize = CalcBufferSize(VideoType::kI420, codecSettings->width,
+                                        codecSettings->height) +
+                         kI420HeaderSize;
   uint8_t* newBuffer = new uint8_t[newSize];
   if (newBuffer == NULL) {
     return WEBRTC_VIDEO_CODEC_MEMORY;
   }
   _encodedImage._size = newSize;
   _encodedImage._buffer = newBuffer;
 
   // If no memory allocation, no point to init.
   _inited = true;
   return WEBRTC_VIDEO_CODEC_OK;
@@ skipping 16 matching lines @@
 
   int width = inputImage.width();
   if (width > std::numeric_limits<uint16_t>::max()) {
     return WEBRTC_VIDEO_CODEC_ERR_SIZE;
   }
   int height = inputImage.height();
   if (height > std::numeric_limits<uint16_t>::max()) {
     return WEBRTC_VIDEO_CODEC_ERR_SIZE;
   }
 
-  size_t req_length =
-      CalcBufferSize(kI420, inputImage.width(), inputImage.height()) +
-      kI420HeaderSize;
+  size_t req_length = CalcBufferSize(VideoType::kI420, inputImage.width(),
+                                     inputImage.height()) +
+                      kI420HeaderSize;
   if (_encodedImage._size > req_length) {
     // Reallocate buffer.
     delete[] _encodedImage._buffer;
 
     _encodedImage._buffer = new uint8_t[req_length];
     _encodedImage._size = req_length;
   }
 
   uint8_t* buffer = _encodedImage._buffer;
 
@@ skipping 74 matching lines @@
   }
 
   const uint8_t* buffer = inputImage._buffer;
   uint16_t width, height;
 
   buffer = ExtractHeader(buffer, &width, &height);
   _width = width;
   _height = height;
 
   // Verify that the available length is sufficient:
-  size_t req_length = CalcBufferSize(kI420, _width, _height) + kI420HeaderSize;
+  size_t req_length =
+      CalcBufferSize(VideoType::kI420, _width, _height) + kI420HeaderSize;
 
   if (req_length > inputImage._length) {
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
   // Set decoded image parameters.
   int half_width = (_width + 1) / 2;
   rtc::scoped_refptr<webrtc::I420Buffer> frame_buffer =
       I420Buffer::Create(_width, _height, _width, half_width, half_width);
 
   // Converting from raw buffer I420Buffer.
-  int ret = ConvertToI420(kI420, buffer, 0, 0, _width, _height, 0,
+  int ret = ConvertToI420(VideoType::kI420, buffer, 0, 0, _width, _height, 0,
                           kVideoRotation_0, frame_buffer.get());
   if (ret < 0) {
     return WEBRTC_VIDEO_CODEC_MEMORY;
   }
 
   VideoFrame decoded_image(frame_buffer, inputImage._timeStamp, 0,
                            webrtc::kVideoRotation_0);
   _decodeCompleteCallback->Decoded(decoded_image);
   return WEBRTC_VIDEO_CODEC_OK;
 }
@@ skipping 13 matching lines @@
     DecodedImageCallback* callback) {
   _decodeCompleteCallback = callback;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 int I420Decoder::Release() {
   _inited = false;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 }  // namespace webrtc