| Index: media/cast/video_receiver/video_receiver.h
|
| diff --git a/media/cast/video_receiver/video_receiver.h b/media/cast/video_receiver/video_receiver.h
|
| index 8b14aae566a05d82a1cfc2e81ba79c00dcb1e544..69b6cc63733193e28e1adf8daf1927dd03577370 100644
|
| --- a/media/cast/video_receiver/video_receiver.h
|
| +++ b/media/cast/video_receiver/video_receiver.h
|
| @@ -13,6 +13,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/cast_receiver.h"
|
| @@ -74,6 +75,8 @@ class VideoReceiver : public base::NonThreadSafe,
|
| scoped_ptr<EncodedVideoFrame> encoded_frame,
|
| const base::TimeTicks& render_time);
|
|
|
| + bool DecryptVideoFrame(scoped_ptr<EncodedVideoFrame>* video_frame);
|
| +
|
| bool PullEncodedVideoFrame(uint32 rtp_timestamp,
|
| bool next_frame,
|
| scoped_ptr<EncodedVideoFrame>* encoded_frame,
|
| @@ -109,11 +112,10 @@ class VideoReceiver : public base::NonThreadSafe,
|
| scoped_ptr<Rtcp> rtcp_;
|
| scoped_ptr<RtpReceiverStatistics> rtp_video_receiver_statistics_;
|
| base::TimeTicks time_last_sent_cast_message_;
|
| - // Sender-receiver offset estimation.
|
| - base::TimeDelta time_offset_;
|
| -
|
| + base::TimeDelta time_offset_; // Sender-receiver offset estimation.
|
| + scoped_ptr<crypto::Encryptor> decryptor_;
|
| + std::string iv_mask_;
|
| std::list<VideoFrameEncodedCallback> queued_encoded_callbacks_;
|
| -
|
| base::WeakPtrFactory<VideoReceiver> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(VideoReceiver);
|
|
|