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

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

Issue 2039053002: Make VideoReceiveStream not inherit from I420FrameCallback. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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
« no previous file with comments | « no previous file | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 20 matching lines...) Expand all
31 class CallStats; 31 class CallStats;
32 class CongestionController; 32 class CongestionController;
33 class IvfFileWriter; 33 class IvfFileWriter;
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,
42 public rtc::VideoSinkInterface<VideoFrame>, 41 public rtc::VideoSinkInterface<VideoFrame>,
43 public EncodedImageCallback, 42 public EncodedImageCallback,
44 public NackSender, 43 public NackSender,
45 public KeyFrameRequestSender { 44 public KeyFrameRequestSender {
46 public: 45 public:
47 VideoReceiveStream(int num_cpu_cores, 46 VideoReceiveStream(int num_cpu_cores,
48 CongestionController* congestion_controller, 47 CongestionController* congestion_controller,
49 const VideoReceiveStream::Config& config, 48 const VideoReceiveStream::Config& config,
50 webrtc::VoiceEngine* voice_engine, 49 webrtc::VoiceEngine* voice_engine,
51 ProcessThread* process_thread, 50 ProcessThread* process_thread,
52 CallStats* call_stats, 51 CallStats* call_stats,
53 VieRemb* remb); 52 VieRemb* remb);
54 ~VideoReceiveStream() override; 53 ~VideoReceiveStream() override;
55 54
56 void SignalNetworkState(NetworkState state); 55 void SignalNetworkState(NetworkState state);
57 bool DeliverRtcp(const uint8_t* packet, size_t length); 56 bool DeliverRtcp(const uint8_t* packet, size_t length);
58 bool DeliverRtp(const uint8_t* packet, 57 bool DeliverRtp(const uint8_t* packet,
59 size_t length, 58 size_t length,
60 const PacketTime& packet_time); 59 const PacketTime& packet_time);
61 60
62 // webrtc::VideoReceiveStream implementation. 61 // webrtc::VideoReceiveStream implementation.
63 void Start() override; 62 void Start() override;
64 void Stop() override; 63 void Stop() override;
65 64
66 webrtc::VideoReceiveStream::Stats GetStats() const override; 65 webrtc::VideoReceiveStream::Stats GetStats() const override;
67 66
68 // Overrides I420FrameCallback.
69 void FrameCallback(VideoFrame* video_frame) override;
70
71 // Overrides rtc::VideoSinkInterface<VideoFrame>. 67 // Overrides rtc::VideoSinkInterface<VideoFrame>.
72 void OnFrame(const VideoFrame& video_frame) override; 68 void OnFrame(const VideoFrame& video_frame) override;
73 69
74 // Overrides EncodedImageCallback. 70 // Overrides EncodedImageCallback.
75 int32_t Encoded(const EncodedImage& encoded_image, 71 int32_t Encoded(const EncodedImage& encoded_image,
76 const CodecSpecificInfo* codec_specific_info, 72 const CodecSpecificInfo* codec_specific_info,
77 const RTPFragmentationHeader* fragmentation) override; 73 const RTPFragmentationHeader* fragmentation) override;
78 74
79 const Config& config() const { return config_; } 75 const Config& config() const { return config_; }
80 76
(...skipping 26 matching lines...) Expand all
107 RtpStreamReceiver rtp_stream_receiver_; 103 RtpStreamReceiver rtp_stream_receiver_;
108 VideoStreamDecoder video_stream_decoder_; 104 VideoStreamDecoder video_stream_decoder_;
109 ViESyncModule vie_sync_; 105 ViESyncModule vie_sync_;
110 106
111 std::unique_ptr<IvfFileWriter> ivf_writer_; 107 std::unique_ptr<IvfFileWriter> ivf_writer_;
112 }; 108 };
113 } // namespace internal 109 } // namespace internal
114 } // namespace webrtc 110 } // namespace webrtc
115 111
116 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 112 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698