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

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

Issue 3002033002: Revert of Fix the video buffer size should take rtt into consideration (Closed)
Patch Set: Rebase Created 3 years, 4 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/modules/video_coding/frame_buffer2.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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 class VCMJitterEstimator; 42 class VCMJitterEstimator;
43 43
44 namespace internal { 44 namespace internal {
45 45
46 class VideoReceiveStream : public webrtc::VideoReceiveStream, 46 class VideoReceiveStream : public webrtc::VideoReceiveStream,
47 public rtc::VideoSinkInterface<VideoFrame>, 47 public rtc::VideoSinkInterface<VideoFrame>,
48 public EncodedImageCallback, 48 public EncodedImageCallback,
49 public NackSender, 49 public NackSender,
50 public KeyFrameRequestSender, 50 public KeyFrameRequestSender,
51 public video_coding::OnCompleteFrameCallback, 51 public video_coding::OnCompleteFrameCallback,
52 public Syncable, 52 public Syncable {
53 public CallStatsObserver {
54 public: 53 public:
55 VideoReceiveStream(RtpStreamReceiverControllerInterface* receiver_controller, 54 VideoReceiveStream(RtpStreamReceiverControllerInterface* receiver_controller,
56 int num_cpu_cores, 55 int num_cpu_cores,
57 PacketRouter* packet_router, 56 PacketRouter* packet_router,
58 VideoReceiveStream::Config config, 57 VideoReceiveStream::Config config,
59 ProcessThread* process_thread, 58 ProcessThread* process_thread,
60 CallStats* call_stats); 59 CallStats* call_stats);
61 ~VideoReceiveStream() override; 60 ~VideoReceiveStream() override;
62 61
63 const Config& config() const { return config_; } 62 const Config& config() const { return config_; }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 // Implements NackSender. 97 // Implements NackSender.
99 void SendNack(const std::vector<uint16_t>& sequence_numbers) override; 98 void SendNack(const std::vector<uint16_t>& sequence_numbers) override;
100 99
101 // Implements KeyFrameRequestSender. 100 // Implements KeyFrameRequestSender.
102 void RequestKeyFrame() override; 101 void RequestKeyFrame() override;
103 102
104 // Implements video_coding::OnCompleteFrameCallback. 103 // Implements video_coding::OnCompleteFrameCallback.
105 void OnCompleteFrame( 104 void OnCompleteFrame(
106 std::unique_ptr<video_coding::FrameObject> frame) override; 105 std::unique_ptr<video_coding::FrameObject> frame) override;
107 106
108 // Implements CallStatsObserver::OnRttUpdate
109 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
110
111 // Implements Syncable. 107 // Implements Syncable.
112 int id() const override; 108 int id() const override;
113 rtc::Optional<Syncable::Info> GetInfo() const override; 109 rtc::Optional<Syncable::Info> GetInfo() const override;
114 uint32_t GetPlayoutTimestamp() const override; 110 uint32_t GetPlayoutTimestamp() const override;
115 void SetMinimumPlayoutDelay(int delay_ms) override; 111 void SetMinimumPlayoutDelay(int delay_ms) override;
116 112
117 private: 113 private:
118 static void DecodeThreadFunction(void* ptr); 114 static void DecodeThreadFunction(void* ptr);
119 bool Decode(); 115 bool Decode();
120 116
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 // a decoding error) we require a keyframe to restart the stream. 149 // a decoding error) we require a keyframe to restart the stream.
154 bool keyframe_required_ = true; 150 bool keyframe_required_ = true;
155 151
156 // If we have successfully decoded any frame. 152 // If we have successfully decoded any frame.
157 bool frame_decoded_ = false; 153 bool frame_decoded_ = false;
158 }; 154 };
159 } // namespace internal 155 } // namespace internal
160 } // namespace webrtc 156 } // namespace webrtc
161 157
162 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 158 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/frame_buffer2.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698