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

Side by Side Diff: talk/app/webrtc/rtpreceiver.cc

Issue 1398823003: Remove MediaChannel::SetRemoteRenderer(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « talk/app/webrtc/mediastreamprovider.h ('k') | talk/app/webrtc/rtpsenderreceiver_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 // setting the volume to the source when the track is disabled. 63 // setting the volume to the source when the track is disabled.
64 if (provider_ && track_->enabled()) 64 if (provider_ && track_->enabled())
65 provider_->SetAudioPlayoutVolume(ssrc_, volume); 65 provider_->SetAudioPlayoutVolume(ssrc_, volume);
66 } 66 }
67 67
68 void AudioRtpReceiver::Stop() { 68 void AudioRtpReceiver::Stop() {
69 // TODO(deadbeef): Need to do more here to fully stop receiving packets. 69 // TODO(deadbeef): Need to do more here to fully stop receiving packets.
70 if (!provider_) { 70 if (!provider_) {
71 return; 71 return;
72 } 72 }
73 provider_->SetAudioPlayout(ssrc_, false, nullptr); 73 provider_->SetAudioPlayout(ssrc_, false);
74 provider_ = nullptr; 74 provider_ = nullptr;
75 } 75 }
76 76
77 void AudioRtpReceiver::Reconfigure() { 77 void AudioRtpReceiver::Reconfigure() {
78 if (!provider_) { 78 if (!provider_) {
79 return; 79 return;
80 } 80 }
81 provider_->SetAudioPlayout(ssrc_, track_->enabled(), track_->GetRenderer()); 81 provider_->SetAudioPlayout(ssrc_, track_->enabled());
82 } 82 }
83 83
84 VideoRtpReceiver::VideoRtpReceiver(VideoTrackInterface* track, 84 VideoRtpReceiver::VideoRtpReceiver(VideoTrackInterface* track,
85 uint32_t ssrc, 85 uint32_t ssrc,
86 VideoProviderInterface* provider) 86 VideoProviderInterface* provider)
87 : id_(track->id()), track_(track), ssrc_(ssrc), provider_(provider) { 87 : id_(track->id()), track_(track), ssrc_(ssrc), provider_(provider) {
88 provider_->SetVideoPlayout(ssrc_, true, track_->GetSource()->FrameInput()); 88 provider_->SetVideoPlayout(ssrc_, true, track_->GetSource()->FrameInput());
89 } 89 }
90 90
91 VideoRtpReceiver::~VideoRtpReceiver() { 91 VideoRtpReceiver::~VideoRtpReceiver() {
92 // Since cricket::VideoRenderer is not reference counted, 92 // Since cricket::VideoRenderer is not reference counted,
93 // we need to remove it from the provider before we are deleted. 93 // we need to remove it from the provider before we are deleted.
94 Stop(); 94 Stop();
95 } 95 }
96 96
97 void VideoRtpReceiver::Stop() { 97 void VideoRtpReceiver::Stop() {
98 // TODO(deadbeef): Need to do more here to fully stop receiving packets. 98 // TODO(deadbeef): Need to do more here to fully stop receiving packets.
99 if (!provider_) { 99 if (!provider_) {
100 return; 100 return;
101 } 101 }
102 provider_->SetVideoPlayout(ssrc_, false, nullptr); 102 provider_->SetVideoPlayout(ssrc_, false, nullptr);
103 provider_ = nullptr; 103 provider_ = nullptr;
104 } 104 }
105 105
106 } // namespace webrtc 106 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/mediastreamprovider.h ('k') | talk/app/webrtc/rtpsenderreceiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698