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

Side by Side Diff: webrtc/modules/video_coding/receiver.h

Issue 1778503002: Experiment for the nack module. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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 10 matching lines...) Expand all
21 #include "webrtc/modules/video_coding/include/video_coding.h" 21 #include "webrtc/modules/video_coding/include/video_coding.h"
22 #include "webrtc/modules/video_coding/include/video_coding_defines.h" 22 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
23 23
24 namespace webrtc { 24 namespace webrtc {
25 25
26 class Clock; 26 class Clock;
27 class VCMEncodedFrame; 27 class VCMEncodedFrame;
28 28
29 class VCMReceiver { 29 class VCMReceiver {
30 public: 30 public:
31 // Constructor for current interface, will be removed when the
32 // new jitter buffer is in place.
31 VCMReceiver(VCMTiming* timing, Clock* clock, EventFactory* event_factory); 33 VCMReceiver(VCMTiming* timing, Clock* clock, EventFactory* event_factory);
32 34
35 // Create method for the new jitter buffer.
36 VCMReceiver(VCMTiming* timing,
37 Clock* clock,
38 EventFactory* event_factory,
39 ProcessThread* module_process_thread,
40 NackSender* nack_sender,
41 KeyFrameRequestSender* keyframe_request_sender);
42
33 // Using this constructor, you can specify a different event factory for the 43 // Using this constructor, you can specify a different event factory for the
34 // jitter buffer. Useful for unit tests when you want to simulate incoming 44 // jitter buffer. Useful for unit tests when you want to simulate incoming
35 // packets, in which case the jitter buffer's wait event is different from 45 // packets, in which case the jitter buffer's wait event is different from
36 // that of VCMReceiver itself. 46 // that of VCMReceiver itself.
47 //
48 // Constructor for current interface, will be removed when the
49 // new jitter buffer is in place.
37 VCMReceiver(VCMTiming* timing, 50 VCMReceiver(VCMTiming* timing,
38 Clock* clock, 51 Clock* clock,
39 std::unique_ptr<EventWrapper> receiver_event, 52 std::unique_ptr<EventWrapper> receiver_event,
40 std::unique_ptr<EventWrapper> jitter_buffer_event); 53 std::unique_ptr<EventWrapper> jitter_buffer_event);
41 54
55 // Create method for the new jitter buffer.
56 VCMReceiver(VCMTiming* timing,
57 Clock* clock,
58 std::unique_ptr<EventWrapper> receiver_event,
59 std::unique_ptr<EventWrapper> jitter_buffer_event,
60 ProcessThread* module_process_thread,
61 NackSender* nack_sender,
62 KeyFrameRequestSender* keyframe_request_sender);
63
42 ~VCMReceiver(); 64 ~VCMReceiver();
43 65
44 void Reset(); 66 void Reset();
45 void UpdateRtt(int64_t rtt); 67 void UpdateRtt(int64_t rtt);
46 int32_t InsertPacket(const VCMPacket& packet, 68 int32_t InsertPacket(const VCMPacket& packet,
47 uint16_t frame_width, 69 uint16_t frame_width,
48 uint16_t frame_height); 70 uint16_t frame_height);
49 VCMEncodedFrame* FrameForDecoding(uint16_t max_wait_time_ms, 71 VCMEncodedFrame* FrameForDecoding(uint16_t max_wait_time_ms,
50 int64_t* next_render_time_ms, 72 int64_t* next_render_time_ms,
51 bool prefer_late_decoding); 73 bool prefer_late_decoding);
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 Clock* const clock_; 106 Clock* const clock_;
85 VCMJitterBuffer jitter_buffer_; 107 VCMJitterBuffer jitter_buffer_;
86 VCMTiming* timing_; 108 VCMTiming* timing_;
87 std::unique_ptr<EventWrapper> render_wait_event_; 109 std::unique_ptr<EventWrapper> render_wait_event_;
88 int max_video_delay_ms_; 110 int max_video_delay_ms_;
89 }; 111 };
90 112
91 } // namespace webrtc 113 } // namespace webrtc
92 114
93 #endif // WEBRTC_MODULES_VIDEO_CODING_RECEIVER_H_ 115 #endif // WEBRTC_MODULES_VIDEO_CODING_RECEIVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698