Cleaned up deprecated elapsed_time methods and changed rotation to be webrtc::VideoRotation

talk/media/base/videocapturer.h

 /*
  * 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 60 matching lines @@
   static const uint32_t kFrameHeaderSize = 40;  // Size from width to data_size.
   static const uint32_t kUnknownDataSize = 0xFFFFFFFF;
 
   CapturedFrame();
 
   // Get the number of bytes of the frame data. If data_size is known, return
   // it directly. Otherwise, calculate the size based on width, height, and
   // fourcc. Return true if succeeded.
   bool GetDataSize(uint32_t* size) const;
 
-  // TODO(guoweis): Change the type of |rotation| from int to
-  // webrtc::VideoRotation once chromium gets the code.
-  webrtc::VideoRotation GetRotation() const;
-
   // The width and height of the captured frame could be different from those
   // of VideoFormat. Once the first frame is captured, the width, height,
   // fourcc, pixel_width, and pixel_height should keep the same over frames.
   int width;              // in number of pixels
   int height;             // in number of pixels
   uint32_t fourcc;        // compression
   uint32_t pixel_width;   // width of a pixel, default is 1
   uint32_t pixel_height;  // height of a pixel, default is 1
-  // TODO(magjed): |elapsed_time| is deprecated - remove once not used anymore.
-  int64_t elapsed_time;
   int64_t time_stamp;  // timestamp of when the frame was captured, in unix
                        // time with nanosecond units.
   uint32_t data_size;  // number of bytes of the frame data
 
-  // TODO(guoweis): This can't be converted to VideoRotation yet as it's
-  // used by chrome now.
-  int    rotation;      // rotation in degrees of the frame (0, 90, 180, 270)
+  webrtc::VideoRotation rotation; // rotation in degrees of the frame.
 
   void*  data;          // pointer to the frame data. This object allocates the
                         // memory or points to an existing memory.
 
  private:
   RTC_DISALLOW_COPY_AND_ASSIGN(CapturedFrame);
 };
 
 // VideoCapturer is an abstract class that defines the interfaces for video
 // capturing. The subclasses implement the video capturer for various types of
@@ skipping 284 matching lines @@
 
   // Whether capturer should apply rotation to the frame before signaling it.
   bool apply_rotation_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(VideoCapturer);
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_VIDEOCAPTURER_H_