Reland of Make cricket::VideoFrame inherit webrtc::VideoFrame.

webrtc/media/base/videobroadcaster.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
 #include "webrtc/media/base/videobroadcaster.h"
 
 #include <limits>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 
 namespace rtc {
 
 VideoBroadcaster::VideoBroadcaster() {
   thread_checker_.DetachFromThread();
 }
 
 void VideoBroadcaster::AddOrUpdateSink(
     VideoSinkInterface<cricket::VideoFrame>* sink,
     const VideoSinkWants& wants) {
@@ skipping 31 matching lines @@
       // Calls to OnFrame are not synchronized with changes to the sink wants.
       // When rotation_applied is set to true, one or a few frames may get here
       // with rotation still pending. Protect sinks that don't expect any
       // pending rotation.
       LOG(LS_VERBOSE) << "Discarding frame with unexpected rotation.";
       continue;
     }
     if (sink_pair.wants.black_frames) {
       sink_pair.sink->OnFrame(cricket::WebRtcVideoFrame(
           GetBlackFrameBuffer(frame.width(), frame.height()), frame.rotation(),
-          frame.timestamp_us(), frame.transport_frame_id()));
+          frame.timestamp_us()));
     } else {
       sink_pair.sink->OnFrame(frame);
     }
   }
 }
 
 void VideoBroadcaster::UpdateWants() {
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
 
   VideoSinkWants wants;
@@ skipping 32 matching lines @@
     rtc::scoped_refptr<webrtc::I420Buffer> buffer =
         new RefCountedObject<webrtc::I420Buffer>(width, height);
     buffer->SetToBlack();
     black_frame_buffer_ = buffer;
   }
 
   return black_frame_buffer_;
 }
 
 }  // namespace rtc