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

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: Rebased. Created 4 years, 7 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 22 matching lines...) Expand all
33 class CongestionController; 33 class CongestionController;
34 class IvfFileWriter; 34 class IvfFileWriter;
35 class ProcessThread; 35 class ProcessThread;
36 class VoiceEngine; 36 class VoiceEngine;
37 class VieRemb; 37 class VieRemb;
38 38
39 namespace internal { 39 namespace internal {
40 40
41 class VideoReceiveStream : public webrtc::VideoReceiveStream, 41 class VideoReceiveStream : public webrtc::VideoReceiveStream,
42 public I420FrameCallback, 42 public I420FrameCallback,
43 public VideoRenderCallback, 43 public rtc::VideoSinkInterface<VideoFrame>,
44 public EncodedImageCallback, 44 public EncodedImageCallback,
45 public NackSender, 45 public NackSender,
46 public KeyFrameRequestSender { 46 public KeyFrameRequestSender {
47 public: 47 public:
48 VideoReceiveStream(int num_cpu_cores, 48 VideoReceiveStream(int num_cpu_cores,
49 CongestionController* congestion_controller, 49 CongestionController* congestion_controller,
50 const VideoReceiveStream::Config& config, 50 const VideoReceiveStream::Config& config,
51 webrtc::VoiceEngine* voice_engine, 51 webrtc::VoiceEngine* voice_engine,
52 ProcessThread* process_thread, 52 ProcessThread* process_thread,
53 CallStats* call_stats, 53 CallStats* call_stats,
54 VieRemb* remb); 54 VieRemb* remb);
55 ~VideoReceiveStream() override; 55 ~VideoReceiveStream() override;
56 56
57 void SignalNetworkState(NetworkState state); 57 void SignalNetworkState(NetworkState state);
58 bool DeliverRtcp(const uint8_t* packet, size_t length); 58 bool DeliverRtcp(const uint8_t* packet, size_t length);
59 bool DeliverRtp(const uint8_t* packet, 59 bool DeliverRtp(const uint8_t* packet,
60 size_t length, 60 size_t length,
61 const PacketTime& packet_time); 61 const PacketTime& packet_time);
62 62
63 // webrtc::VideoReceiveStream implementation. 63 // webrtc::VideoReceiveStream implementation.
64 void Start() override; 64 void Start() override;
65 void Stop() override; 65 void Stop() override;
66 66
67 webrtc::VideoReceiveStream::Stats GetStats() const override; 67 webrtc::VideoReceiveStream::Stats GetStats() const override;
68 68
69 // Overrides I420FrameCallback. 69 // Overrides I420FrameCallback.
70 void FrameCallback(VideoFrame* video_frame) override; 70 void FrameCallback(VideoFrame* video_frame) override;
71 71
72 // Overrides VideoRenderCallback. 72 // Overrides rtc::VideoSinkInterface<VideoFrame>.
73 int RenderFrame(const uint32_t /*stream_id*/, 73 void OnFrame(const VideoFrame& video_frame) override;
74 const VideoFrame& video_frame) override;
75 74
76 // Overrides EncodedImageCallback. 75 // Overrides EncodedImageCallback.
77 int32_t Encoded(const EncodedImage& encoded_image, 76 int32_t Encoded(const EncodedImage& encoded_image,
78 const CodecSpecificInfo* codec_specific_info, 77 const CodecSpecificInfo* codec_specific_info,
79 const RTPFragmentationHeader* fragmentation) override; 78 const RTPFragmentationHeader* fragmentation) override;
80 79
81 const Config& config() const { return config_; } 80 const Config& config() const { return config_; }
82 81
83 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id); 82 void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
84 83
(...skipping 26 matching lines...) Expand all
111 ViEChannel vie_channel_; 110 ViEChannel vie_channel_;
112 ViESyncModule vie_sync_; 111 ViESyncModule vie_sync_;
113 RtpRtcp* const rtp_rtcp_; 112 RtpRtcp* const rtp_rtcp_;
114 113
115 std::unique_ptr<IvfFileWriter> ivf_writer_; 114 std::unique_ptr<IvfFileWriter> ivf_writer_;
116 }; 115 };
117 } // namespace internal 116 } // namespace internal
118 } // namespace webrtc 117 } // namespace webrtc
119 118
120 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 119 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698