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

Unified Diff: media/cast/sender/video_sender.cc

Issue 2775993002: Crash Fix (Cast Streaming): Render overlay on copy of source frame. (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « media/cast/sender/performance_metrics_overlay.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/sender/video_sender.cc
diff --git a/media/cast/sender/video_sender.cc b/media/cast/sender/video_sender.cc
index a0c15e02f54742a310ed4241031b4242fbb06751..8447223d1e93ee14aab7c426e3dbe1deec980787 100644
--- a/media/cast/sender/video_sender.cc
+++ b/media/cast/sender/video_sender.cc
@@ -250,20 +250,18 @@ void VideoSender::InsertRawVideoFrame(
TRACE_COUNTER_ID1("cast.stream", "Video Target Bitrate", this, bitrate);
- MaybeRenderPerformanceMetricsOverlay(
- GetTargetPlayoutDelay(), low_latency_mode_, bitrate,
- frames_in_encoder_ + 1, last_reported_encoder_utilization_,
- last_reported_lossy_utilization_, video_frame.get());
-
+ const scoped_refptr<VideoFrame> frame_to_encode =
+ MaybeRenderPerformanceMetricsOverlay(
+ GetTargetPlayoutDelay(), low_latency_mode_, bitrate,
+ frames_in_encoder_ + 1, last_reported_encoder_utilization_,
+ last_reported_lossy_utilization_, video_frame);
if (video_encoder_->EncodeVideoFrame(
- video_frame,
- reference_time,
+ frame_to_encode, reference_time,
base::Bind(&VideoSender::OnEncodedVideoFrame,
- weak_factory_.GetWeakPtr(),
- video_frame,
- bitrate))) {
- TRACE_EVENT_ASYNC_BEGIN1("cast.stream", "Video Encode", video_frame.get(),
- "rtp_timestamp", rtp_timestamp.lower_32_bits());
+ weak_factory_.GetWeakPtr(), frame_to_encode, bitrate))) {
+ TRACE_EVENT_ASYNC_BEGIN1("cast.stream", "Video Encode",
+ frame_to_encode.get(), "rtp_timestamp",
+ rtp_timestamp.lower_32_bits());
frames_in_encoder_++;
duration_in_encoder_ += duration_added_by_next_frame;
last_enqueued_frame_rtp_timestamp_ = rtp_timestamp;
« no previous file with comments | « media/cast/sender/performance_metrics_overlay.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698