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

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

Issue 1351803002: Exposing RtpSenders and RtpReceivers from PeerConnection. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Replacing "DetachFromProvider" with "Stop" and some TODOs. Created 5 years, 3 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/rtpreceiver.h ('k') | talk/app/webrtc/rtpreceiverinterface.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 /*
2 * libjingle
3 * Copyright 2015 Google Inc.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 *
8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28 #include "talk/app/webrtc/rtpreceiver.h"
29
30 #include "talk/app/webrtc/videosourceinterface.h"
31
32 namespace webrtc {
33
34 AudioRtpReceiver::AudioRtpReceiver(AudioTrackInterface* track,
35 uint32 ssrc,
36 AudioProviderInterface* provider)
37 : id_(track->id()),
38 track_(track),
39 ssrc_(ssrc),
40 provider_(provider),
41 cached_track_enabled_(track->enabled()) {
42 track_->RegisterObserver(this);
43 track_->GetSource()->RegisterAudioObserver(this);
44 Reconfigure();
45 }
46
47 AudioRtpReceiver::~AudioRtpReceiver() {
48 track_->GetSource()->UnregisterAudioObserver(this);
49 track_->UnregisterObserver(this);
50 if (provider_) {
51 Stop();
52 }
53 }
54
55 void AudioRtpReceiver::OnChanged() {
56 if (cached_track_enabled_ != track_->enabled()) {
57 cached_track_enabled_ = track_->enabled();
58 Reconfigure();
59 }
60 }
61
62 void AudioRtpReceiver::OnSetVolume(double volume) {
63 // When the track is disabled, the volume of the source, which is the
64 // corresponding WebRtc Voice Engine channel will be 0. So we do not allow
65 // setting the volume to the source when the track is disabled.
66 if (provider_ && track_->enabled())
67 provider_->SetAudioPlayoutVolume(ssrc_, volume);
68 }
69
70 void AudioRtpReceiver::Stop() {
71 // TODO(deadbeef): Need to do more here to fully stop receiving packets.
72 provider_->SetAudioPlayout(ssrc_, false, nullptr);
73 provider_ = nullptr;
74 }
75
76 void AudioRtpReceiver::Reconfigure() {
77 if (!provider_) {
78 return;
79 }
80 provider_->SetAudioPlayout(ssrc_, track_->enabled(), track_->GetRenderer());
81 }
82
83 VideoRtpReceiver::VideoRtpReceiver(VideoTrackInterface* track,
84 uint32 ssrc,
85 VideoProviderInterface* provider)
86 : id_(track->id()), track_(track), ssrc_(ssrc), provider_(provider) {
87 provider_->SetVideoPlayout(ssrc_, true, track_->GetSource()->FrameInput());
88 }
89
90 VideoRtpReceiver::~VideoRtpReceiver() {
91 if (provider_) {
92 // Since cricket::VideoRenderer is not reference counted,
93 // we need to remove it from the provider before we are deleted.
94 Stop();
95 }
96 }
97
98 void VideoRtpReceiver::Stop() {
pthatcher1 2015/09/24 21:35:22 We should probably put if (provider_) { } In th
Taylor Brandstetter 2015/09/24 22:00:53 Done.
99 // TODO(deadbeef): Need to do more here to fully stop receiving packets.
100 provider_->SetVideoPlayout(ssrc_, false, nullptr);
101 provider_ = nullptr;
102 }
103
104 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/app/webrtc/rtpreceiver.h ('k') | talk/app/webrtc/rtpreceiverinterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698