Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6633)

Unified Diff: chrome/renderer/media/cast_rtp_stream.cc

Issue 1873293002: Report if video capturing meets output protection requirement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments. Rebased. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b9671a1b71e0ae465e58e43dc19562bf01e5384e..de90f599b211ba5be30d5a936832560fb15d3f3c 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();

Powered by Google App Engine
This is Rietveld 408576698