Cast: Added support for AES-CTR crypto.

media/cast/video_sender/video_sender.h

Index: media/cast/video_sender/video_sender.h
diff --git a/media/cast/video_sender/video_sender.h b/media/cast/video_sender/video_sender.h
index 7bd60293b099e40271afcfaa52eae48c1a6873bd..1c1a0fbf0431c2379e9110db3b7d1dc53bad6eb3 100644
--- a/media/cast/video_sender/video_sender.h
+++ b/media/cast/video_sender/video_sender.h
@@ -12,6 +12,7 @@
 #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"
@@ -56,7 +57,7 @@ class VideoSender : public base::NonThreadSafe,
   // 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);
 
@@ -90,7 +91,7 @@ class VideoSender : public base::NonThreadSafe,
   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);
@@ -101,6 +102,9 @@ class VideoSender : public base::NonThreadSafe,
       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_;
@@ -113,6 +117,8 @@ class VideoSender : public base::NonThreadSafe,
   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_;