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

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

Issue 1181653002: Base A/V synchronization on sync_labels. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 5 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/call_perf_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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 void Stop() override; 50 void Stop() override;
51 Stats GetStats() const override; 51 Stats GetStats() const override;
52 52
53 // Overrides I420FrameCallback. 53 // Overrides I420FrameCallback.
54 void FrameCallback(VideoFrame* video_frame) override; 54 void FrameCallback(VideoFrame* video_frame) override;
55 55
56 // Overrides VideoRenderCallback. 56 // Overrides VideoRenderCallback.
57 int RenderFrame(const uint32_t /*stream_id*/, 57 int RenderFrame(const uint32_t /*stream_id*/,
58 const VideoFrame& video_frame) override; 58 const VideoFrame& video_frame) override;
59 59
60 const Config& config() const { return config_; }
61
60 void SignalNetworkState(Call::NetworkState state); 62 void SignalNetworkState(Call::NetworkState state);
61 63
62 bool DeliverRtcp(const uint8_t* packet, size_t length); 64 bool DeliverRtcp(const uint8_t* packet, size_t length);
63 bool DeliverRtp(const uint8_t* packet, size_t length); 65 bool DeliverRtp(const uint8_t* packet, size_t length);
64 66
67 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
68
65 private: 69 private:
66 void SetRtcpMode(newapi::RtcpMode mode); 70 void SetRtcpMode(newapi::RtcpMode mode);
67 71
68 TransportAdapter transport_adapter_; 72 TransportAdapter transport_adapter_;
69 EncodedFrameCallbackAdapter encoded_frame_proxy_; 73 EncodedFrameCallbackAdapter encoded_frame_proxy_;
70 const VideoReceiveStream::Config config_; 74 const VideoReceiveStream::Config config_;
71 Clock* const clock_; 75 Clock* const clock_;
72 76
73 ChannelGroup* const channel_group_; 77 ChannelGroup* const channel_group_;
74 const int channel_id_; 78 const int channel_id_;
75 79
76 ViEChannel* vie_channel_; 80 ViEChannel* vie_channel_;
77 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_; 81 rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;
78 82
79 VoEVideoSync* voe_sync_interface_;
80
81 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_; 83 rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;
82 }; 84 };
83 } // namespace internal 85 } // namespace internal
84 } // namespace webrtc 86 } // namespace webrtc
85 87
86 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 88 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/call_perf_tests.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698