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

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

Issue 2427733002: Revert of Add path for recovered packets from internal::Call to RtpStreamReceiver. (Closed)
Patch Set: Created 4 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
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
11 #ifndef WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 11 #ifndef WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
12 #define WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 12 #define WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/call.h" 17 #include "webrtc/call.h"
18 #include "webrtc/call/transport_adapter.h" 18 #include "webrtc/call/transport_adapter.h"
19 #include "webrtc/common_video/include/incoming_video_stream.h" 19 #include "webrtc/common_video/include/incoming_video_stream.h"
20 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 20 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
21 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
22 #include "webrtc/modules/video_coding/video_coding_impl.h" 21 #include "webrtc/modules/video_coding/video_coding_impl.h"
23 #include "webrtc/system_wrappers/include/clock.h" 22 #include "webrtc/system_wrappers/include/clock.h"
24 #include "webrtc/video/receive_statistics_proxy.h" 23 #include "webrtc/video/receive_statistics_proxy.h"
25 #include "webrtc/video/rtp_stream_receiver.h" 24 #include "webrtc/video/rtp_stream_receiver.h"
26 #include "webrtc/video/rtp_streams_synchronizer.h" 25 #include "webrtc/video/rtp_streams_synchronizer.h"
27 #include "webrtc/video/video_stream_decoder.h" 26 #include "webrtc/video/video_stream_decoder.h"
28 #include "webrtc/video_receive_stream.h" 27 #include "webrtc/video_receive_stream.h"
29 28
30 namespace webrtc { 29 namespace webrtc {
31 30
(...skipping 21 matching lines...) Expand all
53 CallStats* call_stats, 52 CallStats* call_stats,
54 VieRemb* remb); 53 VieRemb* remb);
55 ~VideoReceiveStream() override; 54 ~VideoReceiveStream() override;
56 55
57 void SignalNetworkState(NetworkState state); 56 void SignalNetworkState(NetworkState state);
58 bool DeliverRtcp(const uint8_t* packet, size_t length); 57 bool DeliverRtcp(const uint8_t* packet, size_t length);
59 bool DeliverRtp(const uint8_t* packet, 58 bool DeliverRtp(const uint8_t* packet,
60 size_t length, 59 size_t length,
61 const PacketTime& packet_time); 60 const PacketTime& packet_time);
62 61
63 bool OnRecoveredPacket(const uint8_t* packet, size_t length);
64
65 // webrtc::VideoReceiveStream implementation. 62 // webrtc::VideoReceiveStream implementation.
66 void Start() override; 63 void Start() override;
67 void Stop() override; 64 void Stop() override;
68 65
69 webrtc::VideoReceiveStream::Stats GetStats() const override; 66 webrtc::VideoReceiveStream::Stats GetStats() const override;
70 67
71 // Overrides rtc::VideoSinkInterface<VideoFrame>. 68 // Overrides rtc::VideoSinkInterface<VideoFrame>.
72 void OnFrame(const VideoFrame& video_frame) override; 69 void OnFrame(const VideoFrame& video_frame) override;
73 70
74 // Overrides EncodedImageCallback. 71 // Overrides EncodedImageCallback.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_; 113 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_;
117 RtpStreamsSynchronizer rtp_stream_sync_; 114 RtpStreamsSynchronizer rtp_stream_sync_;
118 115
119 rtc::CriticalSection ivf_writer_lock_; 116 rtc::CriticalSection ivf_writer_lock_;
120 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 117 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
121 }; 118 };
122 } // namespace internal 119 } // namespace internal
123 } // namespace webrtc 120 } // namespace webrtc
124 121
125 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 122 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/include/flexfec_receiver.h ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698