| Index: chrome/renderer/media/cast_rtp_stream.cc
|
| diff --git a/chrome/renderer/media/cast_rtp_stream.cc b/chrome/renderer/media/cast_rtp_stream.cc
|
| index 56b0e2d519e129c83acd3fada19d35435a9b1e7d..5fbe0e8ace540d20dde641e35e2a7596cce5b618 100644
|
| --- a/chrome/renderer/media/cast_rtp_stream.cc
|
| +++ b/chrome/renderer/media/cast_rtp_stream.cc
|
| @@ -345,6 +345,7 @@ class CastVideoSink : public base::SupportsWeakPtr<CastVideoSink>,
|
| // Attach this sink to a video track represented by |track_|.
|
| // Data received from the track will be submitted to |frame_input|.
|
| void AddToTrack(
|
| + bool is_sink_secure,
|
| const scoped_refptr<media::cast::VideoFrameInput>& frame_input) {
|
| DCHECK(deliverer_);
|
| deliverer_->WillConnectToTrack(AsWeakPtr(), frame_input);
|
| @@ -353,9 +354,9 @@ class CastVideoSink : public base::SupportsWeakPtr<CastVideoSink>,
|
| base::TimeDelta::FromMilliseconds(kRefreshIntervalMilliseconds),
|
| base::Bind(&CastVideoSink::OnRefreshTimerFired,
|
| base::Unretained(this)));
|
| - MediaStreamVideoSink::ConnectToTrack(track_,
|
| - base::Bind(&Deliverer::OnVideoFrame,
|
| - deliverer_));
|
| + MediaStreamVideoSink::ConnectToTrack(
|
| + track_, base::Bind(&Deliverer::OnVideoFrame, deliverer_),
|
| + is_sink_secure);
|
| }
|
|
|
| private:
|
| @@ -685,8 +686,8 @@ void CastRtpStream::Start(const CastRtpParams& params,
|
| media::BindToCurrentLoop(base::Bind(&CastRtpStream::DidEncounterError,
|
| weak_factory_.GetWeakPtr()))));
|
| cast_session_->StartVideo(
|
| - config,
|
| - base::Bind(&CastVideoSink::AddToTrack, video_sink_->AsWeakPtr()),
|
| + config, base::Bind(&CastVideoSink::AddToTrack, video_sink_->AsWeakPtr(),
|
| + !params.payload.aes_key.empty()),
|
| base::Bind(&CastRtpStream::DidEncounterError,
|
| weak_factory_.GetWeakPtr()));
|
| start_callback.Run();
|
|
|