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

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

Issue 1813173002: Deletes the class VideoRendererCallback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Break long lines. Add explicit keyword on IncomingVideoStream constructor. Created 4 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
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 21 matching lines...) Expand all
32 class CallStats; 32 class CallStats;
33 class CongestionController; 33 class CongestionController;
34 class ProcessThread; 34 class ProcessThread;
35 class VoiceEngine; 35 class VoiceEngine;
36 class VieRemb; 36 class VieRemb;
37 37
38 namespace internal { 38 namespace internal {
39 39
40 class VideoReceiveStream : public webrtc::VideoReceiveStream, 40 class VideoReceiveStream : public webrtc::VideoReceiveStream,
41 public I420FrameCallback, 41 public I420FrameCallback,
42 public VideoRenderCallback, 42 public rtc::VideoSinkInterface<VideoFrame>,
43 public EncodedImageCallback, 43 public EncodedImageCallback,
44 public NackSender, 44 public NackSender,
45 public KeyFrameRequestSender { 45 public KeyFrameRequestSender {
46 public: 46 public:
47 VideoReceiveStream(int num_cpu_cores, 47 VideoReceiveStream(int num_cpu_cores,
48 CongestionController* congestion_controller, 48 CongestionController* congestion_controller,
49 const VideoReceiveStream::Config& config, 49 const VideoReceiveStream::Config& config,
50 webrtc::VoiceEngine* voice_engine, 50 webrtc::VoiceEngine* voice_engine,
51 ProcessThread* process_thread, 51 ProcessThread* process_thread,
52 CallStats* call_stats, 52 CallStats* call_stats,
53 VieRemb* remb); 53 VieRemb* remb);
54 ~VideoReceiveStream() override; 54 ~VideoReceiveStream() override;
55 55
56 // webrtc::ReceiveStream implementation. 56 // webrtc::ReceiveStream implementation.
57 void Start() override; 57 void Start() override;
58 void Stop() override; 58 void Stop() override;
59 void SignalNetworkState(NetworkState state) override; 59 void SignalNetworkState(NetworkState state) override;
60 bool DeliverRtcp(const uint8_t* packet, size_t length) override; 60 bool DeliverRtcp(const uint8_t* packet, size_t length) override;
61 bool DeliverRtp(const uint8_t* packet, 61 bool DeliverRtp(const uint8_t* packet,
62 size_t length, 62 size_t length,
63 const PacketTime& packet_time) override; 63 const PacketTime& packet_time) override;
64 64
65 // webrtc::VideoReceiveStream implementation. 65 // webrtc::VideoReceiveStream implementation.
66 webrtc::VideoReceiveStream::Stats GetStats() const override; 66 webrtc::VideoReceiveStream::Stats GetStats() const override;
67 67
68 // Overrides I420FrameCallback. 68 // Overrides I420FrameCallback.
69 void FrameCallback(VideoFrame* video_frame) override; 69 void FrameCallback(VideoFrame* video_frame) override;
70 70
71 // Overrides VideoRenderCallback. 71 // Overrides rtc::VideoSinkInterface<VideoFrame>.
72 int RenderFrame(const uint32_t /*stream_id*/, 72 void OnFrame(const VideoFrame& video_frame) override;
73 const VideoFrame& video_frame) override;
74 73
75 // Overrides EncodedImageCallback. 74 // Overrides EncodedImageCallback.
76 int32_t Encoded(const EncodedImage& encoded_image, 75 int32_t Encoded(const EncodedImage& encoded_image,
77 const CodecSpecificInfo* codec_specific_info, 76 const CodecSpecificInfo* codec_specific_info,
78 const RTPFragmentationHeader* fragmentation) override; 77 const RTPFragmentationHeader* fragmentation) override;
79 78
80 const Config& config() const { return config_; } 79 const Config& config() const { return config_; }
81 80
82 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id); 81 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
83 82
(...skipping 24 matching lines...) Expand all
108 ReceiveStatisticsProxy stats_proxy_; 107 ReceiveStatisticsProxy stats_proxy_;
109 ViEChannel vie_channel_; 108 ViEChannel vie_channel_;
110 ViEReceiver* const vie_receiver_; 109 ViEReceiver* const vie_receiver_;
111 ViESyncModule vie_sync_; 110 ViESyncModule vie_sync_;
112 RtpRtcp* const rtp_rtcp_; 111 RtpRtcp* const rtp_rtcp_;
113 }; 112 };
114 } // namespace internal 113 } // namespace internal
115 } // namespace webrtc 114 } // namespace webrtc
116 115
117 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 116 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698