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

Side by Side Diff: webrtc/video/video_receive_stream.h

Issue 1373903003: Unify newapi::RtcpMode and RTCPMethod. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: ehm, compile the code 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 | « webrtc/video/end_to_end_tests.cc ('k') | webrtc/video/video_receive_stream.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 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 // Overrides VideoRenderCallback. 62 // Overrides VideoRenderCallback.
63 int RenderFrame(const uint32_t /*stream_id*/, 63 int RenderFrame(const uint32_t /*stream_id*/,
64 const VideoFrame& video_frame) override; 64 const VideoFrame& video_frame) override;
65 65
66 const Config& config() const { return config_; } 66 const Config& config() const { return config_; }
67 67
68 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id); 68 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
69 69
70 private: 70 private:
71 void SetRtcpMode(newapi::RtcpMode mode);
72
73 TransportAdapter transport_adapter_; 71 TransportAdapter transport_adapter_;
74 EncodedFrameCallbackAdapter encoded_frame_proxy_; 72 EncodedFrameCallbackAdapter encoded_frame_proxy_;
75 const VideoReceiveStream::Config config_; 73 const VideoReceiveStream::Config config_;
76 Clock* const clock_; 74 Clock* const clock_;
77 75
78 ChannelGroup* const channel_group_; 76 ChannelGroup* const channel_group_;
79 const int channel_id_; 77 const int channel_id_;
80 78
81 ViEChannel* vie_channel_; 79 ViEChannel* vie_channel_;
82 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_; 80 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;
83 81
84 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_; 82 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;
85 }; 83 };
86 } // namespace internal 84 } // namespace internal
87 } // namespace webrtc 85 } // namespace webrtc
88 86
89 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 87 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/end_to_end_tests.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698