Revert of [Cast] Compute utilization metrics and add performance overlay.

media/cast/sender/video_sender.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_CAST_SENDER_VIDEO_SENDER_H_
 #define MEDIA_CAST_SENDER_VIDEO_SENDER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/sender/congestion_control.h"
 #include "media/cast/sender/frame_sender.h"
 
 namespace media {
 
 class VideoFrame;
 
 namespace cast {
 
 class CastTransportSender;
-struct SenderEncodedFrame;
 class VideoEncoder;
 class VideoFrameFactory;
 
 typedef base::Callback<void(base::TimeDelta)> PlayoutDelayChangeCB;
 
 // Not thread safe. Only called from the main cast thread.
 // This class owns all objects related to sending video, objects that create RTP
 // packets, congestion control, video encoder, parsing and sending of
 // RTCP packets.
 // Additionally it posts a bunch of delayed tasks to the main thread for various
@@ skipping 24 matching lines @@
   scoped_ptr<VideoFrameFactory> CreateVideoFrameFactory();
 
  protected:
   int GetNumberOfFramesInEncoder() const final;
   base::TimeDelta GetInFlightMediaDuration() const final;
   void OnAck(uint32 frame_id) final;
 
  private:
   // Called by the |video_encoder_| with the next EncodedFrame to send.
   void OnEncodedVideoFrame(int encoder_bitrate,
-                           scoped_ptr<SenderEncodedFrame> encoded_frame);
+                           scoped_ptr<EncodedFrame> encoded_frame);
 
   // Encodes media::VideoFrame images into EncodedFrames.  Per configuration,
   // this will point to either the internal software-based encoder or a proxy to
   // a hardware-based encoder.
   scoped_ptr<VideoEncoder> video_encoder_;
 
   // The number of frames queued for encoding, but not yet sent.
   int frames_in_encoder_;
 
   // The duration of video queued for encoding, but not yet sent.
   base::TimeDelta duration_in_encoder_;
 
   // The timestamp of the frame that was last enqueued in |video_encoder_|.
   RtpTimestamp last_enqueued_frame_rtp_timestamp_;
   base::TimeTicks last_enqueued_frame_reference_time_;
 
   // Remember what we set the bitrate to before, no need to set it again if
   // we get the same value.
   uint32 last_bitrate_;
 
   PlayoutDelayChangeCB playout_delay_change_cb_;
 
-  // The video encoder's performance metrics as of the last call to
-  // OnEncodedVideoFrame().  See header file comments for SenderEncodedFrame for
-  // an explanation of these values.
-  double last_reported_deadline_utilization_;
-  double last_reported_lossy_utilization_;
-
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoSender);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_SENDER_VIDEO_SENDER_H_