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

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

Issue 2789843002: Delete VieRemb class, move functionality to PacketRouter. (Closed)
Patch Set: Delete obsolete suppression for PacketRouterTest.SendTransportFeedback. Created 3 years, 8 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/rtp_stream_receiver_unittest.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 17 matching lines...) Expand all
28 #include "webrtc/video/transport_adapter.h" 28 #include "webrtc/video/transport_adapter.h"
29 #include "webrtc/video/video_stream_decoder.h" 29 #include "webrtc/video/video_stream_decoder.h"
30 #include "webrtc/video_receive_stream.h" 30 #include "webrtc/video_receive_stream.h"
31 31
32 namespace webrtc { 32 namespace webrtc {
33 33
34 class CallStats; 34 class CallStats;
35 class IvfFileWriter; 35 class IvfFileWriter;
36 class ProcessThread; 36 class ProcessThread;
37 class RTPFragmentationHeader; 37 class RTPFragmentationHeader;
38 class VieRemb;
39 class VCMTiming; 38 class VCMTiming;
40 class VCMJitterEstimator; 39 class VCMJitterEstimator;
41 40
42 namespace internal { 41 namespace internal {
43 42
44 class VideoReceiveStream : public webrtc::VideoReceiveStream, 43 class VideoReceiveStream : public webrtc::VideoReceiveStream,
45 public rtc::VideoSinkInterface<VideoFrame>, 44 public rtc::VideoSinkInterface<VideoFrame>,
46 public EncodedImageCallback, 45 public EncodedImageCallback,
47 public NackSender, 46 public NackSender,
48 public KeyFrameRequestSender, 47 public KeyFrameRequestSender,
49 public video_coding::OnCompleteFrameCallback, 48 public video_coding::OnCompleteFrameCallback,
50 public Syncable { 49 public Syncable {
51 public: 50 public:
52 VideoReceiveStream(int num_cpu_cores, 51 VideoReceiveStream(int num_cpu_cores,
53 PacketRouter* packet_router, 52 PacketRouter* packet_router,
54 VideoReceiveStream::Config config, 53 VideoReceiveStream::Config config,
55 ProcessThread* process_thread, 54 ProcessThread* process_thread,
56 CallStats* call_stats, 55 CallStats* call_stats);
57 VieRemb* remb);
58 ~VideoReceiveStream() override; 56 ~VideoReceiveStream() override;
59 57
60 const Config& config() const { return config_; } 58 const Config& config() const { return config_; }
61 59
62 void SignalNetworkState(NetworkState state); 60 void SignalNetworkState(NetworkState state);
63 bool DeliverRtcp(const uint8_t* packet, size_t length); 61 bool DeliverRtcp(const uint8_t* packet, size_t length);
64 62
65 bool OnRecoveredPacket(const uint8_t* packet, size_t length); 63 bool OnRecoveredPacket(const uint8_t* packet, size_t length);
66 64
67 void SetSync(Syncable* audio_syncable); 65 void SetSync(Syncable* audio_syncable);
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 135 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
138 136
139 // Members for the new jitter buffer experiment. 137 // Members for the new jitter buffer experiment.
140 std::unique_ptr<VCMJitterEstimator> jitter_estimator_; 138 std::unique_ptr<VCMJitterEstimator> jitter_estimator_;
141 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; 139 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_;
142 }; 140 };
143 } // namespace internal 141 } // namespace internal
144 } // namespace webrtc 142 } // namespace webrtc
145 143
146 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 144 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/rtp_stream_receiver_unittest.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698