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

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

Issue 2452163004: Stop using VoEVideoSync in Call/VideoReceiveStream. (Closed)
Patch Set: Don't expose RtpRtcp module in Syncable Created 3 years, 11 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
(...skipping 16 matching lines...) Expand all
27 #include "webrtc/video/video_stream_decoder.h" 27 #include "webrtc/video/video_stream_decoder.h"
28 #include "webrtc/video_receive_stream.h" 28 #include "webrtc/video_receive_stream.h"
29 29
30 namespace webrtc { 30 namespace webrtc {
31 31
32 class CallStats; 32 class CallStats;
33 class CongestionController; 33 class CongestionController;
34 class IvfFileWriter; 34 class IvfFileWriter;
35 class ProcessThread; 35 class ProcessThread;
36 class RTPFragmentationHeader; 36 class RTPFragmentationHeader;
37 class VoiceEngine;
38 class VieRemb; 37 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: 49 public:
51 VideoReceiveStream(int num_cpu_cores, 50 VideoReceiveStream(int num_cpu_cores,
52 CongestionController* congestion_controller, 51 CongestionController* congestion_controller,
53 PacketRouter* packet_router, 52 PacketRouter* packet_router,
54 VideoReceiveStream::Config config, 53 VideoReceiveStream::Config config,
55 webrtc::VoiceEngine* voice_engine,
56 ProcessThread* process_thread, 54 ProcessThread* process_thread,
57 CallStats* call_stats, 55 CallStats* call_stats,
58 VieRemb* remb); 56 VieRemb* remb);
59 ~VideoReceiveStream() override; 57 ~VideoReceiveStream() override;
60 58
61 void SignalNetworkState(NetworkState state); 59 void SignalNetworkState(NetworkState state);
62 bool DeliverRtcp(const uint8_t* packet, size_t length); 60 bool DeliverRtcp(const uint8_t* packet, size_t length);
63 bool DeliverRtp(const uint8_t* packet, 61 bool DeliverRtp(const uint8_t* packet,
64 size_t length, 62 size_t length,
65 const PacketTime& packet_time); 63 const PacketTime& packet_time);
(...skipping 14 matching lines...) Expand all
80 std::unique_ptr<video_coding::FrameObject> frame) override; 78 std::unique_ptr<video_coding::FrameObject> frame) override;
81 79
82 // Overrides EncodedImageCallback. 80 // Overrides EncodedImageCallback.
83 EncodedImageCallback::Result OnEncodedImage( 81 EncodedImageCallback::Result OnEncodedImage(
84 const EncodedImage& encoded_image, 82 const EncodedImage& encoded_image,
85 const CodecSpecificInfo* codec_specific_info, 83 const CodecSpecificInfo* codec_specific_info,
86 const RTPFragmentationHeader* fragmentation) override; 84 const RTPFragmentationHeader* fragmentation) override;
87 85
88 const Config& config() const { return config_; } 86 const Config& config() const { return config_; }
89 87
90 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id); 88 void SetSync(Syncable* syncable);
91 89
92 // Implements NackSender. 90 // Implements NackSender.
93 void SendNack(const std::vector<uint16_t>& sequence_numbers) override; 91 void SendNack(const std::vector<uint16_t>& sequence_numbers) override;
94 92
95 // Implements KeyFrameRequestSender. 93 // Implements KeyFrameRequestSender.
96 void RequestKeyFrame() override; 94 void RequestKeyFrame() override;
97 95
98 // Takes ownership of the file, is responsible for closing it later. 96 // Takes ownership of the file, is responsible for closing it later.
99 // Calling this method will close and finalize any current log. 97 // Calling this method will close and finalize any current log.
100 // Giving rtc::kInvalidPlatformFileValue disables logging. 98 // Giving rtc::kInvalidPlatformFileValue disables logging.
(...skipping 29 matching lines...) Expand all
130 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 128 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
131 129
132 // Members for the new jitter buffer experiment. 130 // Members for the new jitter buffer experiment.
133 std::unique_ptr<VCMJitterEstimator> jitter_estimator_; 131 std::unique_ptr<VCMJitterEstimator> jitter_estimator_;
134 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; 132 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_;
135 }; 133 };
136 } // namespace internal 134 } // namespace internal
137 } // namespace webrtc 135 } // namespace webrtc
138 136
139 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 137 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698