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

Side by Side Diff: media/cast/video_sender/video_sender.cc

Issue 74133002: Cast: Removed unnecessary ref counters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed nits Created 7 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/video_sender/video_sender.h" 5 #include "media/cast/video_sender/video_sender.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 VLOG(1) << "max_unacked_frames " << static_cast<int>(max_unacked_frames_); 77 VLOG(1) << "max_unacked_frames " << static_cast<int>(max_unacked_frames_);
78 DCHECK_GT(max_unacked_frames_, 0) << "Invalid argument"; 78 DCHECK_GT(max_unacked_frames_, 0) << "Invalid argument";
79 79
80 rtp_video_sender_statistics_.reset( 80 rtp_video_sender_statistics_.reset(
81 new LocalRtpVideoSenderStatistics(rtp_sender_.get())); 81 new LocalRtpVideoSenderStatistics(rtp_sender_.get()));
82 82
83 if (video_config.use_external_encoder) { 83 if (video_config.use_external_encoder) {
84 DCHECK(video_encoder_controller) << "Invalid argument"; 84 DCHECK(video_encoder_controller) << "Invalid argument";
85 video_encoder_controller_ = video_encoder_controller; 85 video_encoder_controller_ = video_encoder_controller;
86 } else { 86 } else {
87 video_encoder_ = new VideoEncoder(cast_environment, video_config, 87 video_encoder_.reset(new VideoEncoder(cast_environment, video_config,
88 max_unacked_frames_); 88 max_unacked_frames_));
89 video_encoder_controller_ = video_encoder_.get(); 89 video_encoder_controller_ = video_encoder_.get();
90 } 90 }
91 rtcp_.reset(new Rtcp( 91 rtcp_.reset(new Rtcp(
92 cast_environment_->Clock(), 92 cast_environment_->Clock(),
93 rtcp_feedback_.get(), 93 rtcp_feedback_.get(),
94 paced_packet_sender, 94 paced_packet_sender,
95 rtp_video_sender_statistics_.get(), 95 rtp_video_sender_statistics_.get(),
96 NULL, 96 NULL,
97 video_config.rtcp_mode, 97 video_config.rtcp_mode,
98 base::TimeDelta::FromMilliseconds(video_config.rtcp_interval), 98 base::TimeDelta::FromMilliseconds(video_config.rtcp_interval),
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 void VideoSender::ResendFrame(uint8 resend_frame_id) { 332 void VideoSender::ResendFrame(uint8 resend_frame_id) {
333 MissingFramesAndPacketsMap missing_frames_and_packets; 333 MissingFramesAndPacketsMap missing_frames_and_packets;
334 PacketIdSet missing; 334 PacketIdSet missing;
335 missing_frames_and_packets.insert(std::make_pair(resend_frame_id, missing)); 335 missing_frames_and_packets.insert(std::make_pair(resend_frame_id, missing));
336 rtp_sender_->ResendPackets(missing_frames_and_packets); 336 rtp_sender_->ResendPackets(missing_frames_and_packets);
337 last_send_time_ = cast_environment_->Clock()->NowTicks(); 337 last_send_time_ = cast_environment_->Clock()->NowTicks();
338 } 338 }
339 339
340 } // namespace cast 340 } // namespace cast
341 } // namespace media 341 } // namespace media
OLDNEW
« media/cast/audio_receiver/audio_decoder.cc ('K') | « media/cast/video_sender/video_sender.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698