Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame.

webrtc/api/mediastreaminterface.h

 /*
  *  Copyright 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.
  */
 
 // This file contains interfaces for MediaStream, MediaTrack and MediaSource.
 // These interfaces are used for implementing MediaStream and MediaTrack as
 // defined in http://dev.w3.org/2011/webrtc/editor/webrtc.html#stream-api. These
 // interfaces must be used only with PeerConnection. PeerConnectionManager
 // interface provides the factory methods to create MediaStream and MediaTracks.
 
 #ifndef WEBRTC_API_MEDIASTREAMINTERFACE_H_
 #define WEBRTC_API_MEDIASTREAMINTERFACE_H_
 
 #include <string>
 #include <vector>
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/videoframe.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/media/base/videosourceinterface.h"
-#include "webrtc/video_frame.h"
 
 namespace webrtc {
 
 // Generic observer interface.
 class ObserverInterface {
  public:
   virtual void OnChanged() = 0;
 
  protected:
   virtual ~ObserverInterface() {}
@@ skipping 50 matching lines @@
   virtual bool set_enabled(bool enable) = 0;
 
  protected:
   virtual ~MediaStreamTrackInterface() {}
 };
 
 // VideoTrackSourceInterface is a reference counted source used for VideoTracks.
 // The same source can be used in multiple VideoTracks.
 class VideoTrackSourceInterface
     : public MediaSourceInterface,
-      public rtc::VideoSourceInterface<VideoFrame> {
+      public rtc::VideoSourceInterface<cricket::VideoFrame> {
  public:
   struct Stats {
     // Original size of captured frame, before video adaptation.
     int input_width;
     int input_height;
   };
 
   // Indicates that parameters suitable for screencasts should be automatically
   // applied to RtpSenders.
   // TODO(perkj): Remove these once all known applications have moved to
@@ skipping 12 matching lines @@
   // source, or a source which has not seen its first frame yet.
   // Should avoid blocking.
   virtual bool GetStats(Stats* stats) = 0;
 
  protected:
   virtual ~VideoTrackSourceInterface() {}
 };
 
 class VideoTrackInterface
     : public MediaStreamTrackInterface,
-      public rtc::VideoSourceInterface<VideoFrame> {
+      public rtc::VideoSourceInterface<cricket::VideoFrame> {
  public:
   // Register a video sink for this track.
-  void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
+  void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
                        const rtc::VideoSinkWants& wants) override{};
-  void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override{};
+  void RemoveSink(
+      rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override{};
 
   virtual VideoTrackSourceInterface* GetSource() const = 0;
 
  protected:
   virtual ~VideoTrackInterface() {}
 };
 
 // Interface for receiving audio data from a AudioTrack.
 class AudioTrackSinkInterface {
  public:
@@ skipping 114 matching lines @@
   virtual bool RemoveTrack(AudioTrackInterface* track) = 0;
   virtual bool RemoveTrack(VideoTrackInterface* track) = 0;
 
  protected:
   virtual ~MediaStreamInterface() {}
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_MEDIASTREAMINTERFACE_H_