Cast: Added support for AES-CTR crypto.

media/cast/video_sender/video_sender.h

 // Copyright 2013 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_VIDEO_SENDER_VIDEO_SENDER_H_
 #define MEDIA_CAST_VIDEO_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 "crypto/encryptor.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_environment.h"
 #include "media/cast/congestion_control/congestion_control.h"
 #include "media/cast/rtcp/rtcp.h"
 #include "media/cast/rtp_sender/rtp_sender.h"
 
 namespace media {
 namespace cast {
 
 class VideoEncoder;
@@ skipping 24 matching lines @@
   // has been sent out.
   void InsertRawVideoFrame(
       const I420VideoFrame* video_frame,
       const base::TimeTicks& capture_time,
       const base::Closure callback);
 
   // The video_frame must be valid until the closure callback is called.
   // The closure callback is called from the main thread as soon as
   // the cast sender is done with the frame; it does not mean that the encoded
   // frame has been sent out.
-  void InsertCodedVideoFrame(const EncodedVideoFrame* video_frame,
+  void InsertCodedVideoFrame(EncodedVideoFrame* video_frame,

[Alpha Left Google, 2013/11/07 01:10:11]

Why take away the const? The call goes to EncryptVideoFrame which already takes
const EncodedVideoFrame isn't it?

[pwestin, 2013/11/07 17:16:04]

Removed; changed due to padding, which we don't need any longer. 

                              const base::TimeTicks& capture_time,
                              const base::Closure callback);
 
   // Only called from the main cast thread.
   void IncomingRtcpPacket(const uint8* packet, size_t length,
                           const base::Closure callback);
 
  protected:
   // Protected for testability.
   void OnReceivedCastFeedback(const RtcpCastMessage& cast_feedback);
@@ skipping 13 matching lines @@
   // normal operation 3 full frames), hence this is the last resort to prevent
   // us getting stuck after a long outage.
   void ScheduleNextResendCheck();
   void ResendCheck();
 
   // Monitor how many frames that are silently dropped by the video sender
   // per time unit.
   void ScheduleNextSkippedFramesCheck();
   void SkippedFramesCheck();
 
-  void SendEncodedVideoFrame(const EncodedVideoFrame* video_frame,
+  void SendEncodedVideoFrame(EncodedVideoFrame* video_frame,
                              const base::TimeTicks& capture_time);
   void OnReceivedIntraFrameRequest();
   void ResendFrame(uint8 resend_frame_id);
   void ReceivedAck(uint8 acked_frame_id);
   void UpdateFramesInFlight();
 
   void SendEncodedVideoFrameMainThread(
       scoped_ptr<EncodedVideoFrame> video_frame,
       const base::TimeTicks& capture_time);
 
+  bool EncryptVideoFrame(const EncodedVideoFrame* encoded_frame,

[Alpha Left Google, 2013/11/07 01:10:11]

I'd return a scoped_ptr<EncodedVideoframe> instead.

[pwestin, 2013/11/07 17:16:04]

Same as above; I think this is cleaner since the ptr can be NULL

+                         EncodedVideoFrame* encrypted_video_frame);
+
   const uint32 incoming_feedback_ssrc_;
   const base::TimeDelta rtp_max_delay_;
   const int max_frame_rate_;
 
   scoped_refptr<CastEnvironment> cast_environment_;
   scoped_ptr<LocalRtcpVideoSenderFeedback> rtcp_feedback_;
   scoped_ptr<LocalRtpVideoSenderStatistics> rtp_video_sender_statistics_;
   scoped_refptr<VideoEncoder> video_encoder_;
   scoped_ptr<Rtcp> rtcp_;
   scoped_ptr<RtpSender> rtp_sender_;
   VideoEncoderController* video_encoder_controller_;
   uint8 max_unacked_frames_;
+  scoped_ptr<crypto::Encryptor> encryptor_;
+  std::string iv_mask_;
   int last_acked_frame_id_;
   int last_sent_frame_id_;
   int last_sent_key_frame_id_;
   int duplicate_ack_;
   base::TimeTicks last_send_time_;
   base::TimeTicks last_checked_skip_count_time_;
   int last_skip_count_;
   CongestionControl congestion_control_;
 
   base::WeakPtrFactory<VideoSender> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoSender);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_VIDEO_SENDER_VIDEO_SENDER_H_