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

Side by Side Diff: webrtc/video_receive_stream.h

Issue 1924793002: Remove webrtc/stream.h and unutilized inheritance. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: re-rebase 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
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video_send_stream.h » ('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
11 #ifndef WEBRTC_VIDEO_RECEIVE_STREAM_H_ 11 #ifndef WEBRTC_VIDEO_RECEIVE_STREAM_H_
12 #define WEBRTC_VIDEO_RECEIVE_STREAM_H_ 12 #define WEBRTC_VIDEO_RECEIVE_STREAM_H_
13 13
14 #include <limits> 14 #include <limits>
15 #include <map> 15 #include <map>
16 #include <string> 16 #include <string>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/common_types.h" 19 #include "webrtc/common_types.h"
20 #include "webrtc/common_video/include/frame_callback.h" 20 #include "webrtc/common_video/include/frame_callback.h"
21 #include "webrtc/config.h" 21 #include "webrtc/config.h"
22 #include "webrtc/media/base/videosinkinterface.h" 22 #include "webrtc/media/base/videosinkinterface.h"
23 #include "webrtc/stream.h"
24 #include "webrtc/transport.h" 23 #include "webrtc/transport.h"
25 24
26 namespace webrtc { 25 namespace webrtc {
27 26
28 class VideoDecoder; 27 class VideoDecoder;
29 28
30 class VideoReceiveStream : public ReceiveStream { 29 class VideoReceiveStream {
31 public: 30 public:
32 // TODO(mflodman) Move all these settings to VideoDecoder and move the 31 // TODO(mflodman) Move all these settings to VideoDecoder and move the
33 // declaration to common_types.h. 32 // declaration to common_types.h.
34 struct Decoder { 33 struct Decoder {
35 std::string ToString() const; 34 std::string ToString() const;
36 35
37 // The actual decoder instance. 36 // The actual decoder instance.
38 VideoDecoder* decoder = nullptr; 37 VideoDecoder* decoder = nullptr;
39 38
40 // Received RTP packets with this payload type will be sent to this decoder 39 // Received RTP packets with this payload type will be sent to this decoder
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 // Called for each decoded frame. E.g. used when adding effects to the 168 // Called for each decoded frame. E.g. used when adding effects to the
170 // decoded 169 // decoded
171 // stream. 'nullptr' disables the callback. 170 // stream. 'nullptr' disables the callback.
172 I420FrameCallback* pre_render_callback = nullptr; 171 I420FrameCallback* pre_render_callback = nullptr;
173 172
174 // Target delay in milliseconds. A positive value indicates this stream is 173 // Target delay in milliseconds. A positive value indicates this stream is
175 // used for streaming instead of a real-time call. 174 // used for streaming instead of a real-time call.
176 int target_delay_ms = 0; 175 int target_delay_ms = 0;
177 }; 176 };
178 177
178 // Starts stream activity.
179 // When a stream is active, it can receive, process and deliver packets.
180 virtual void Start() = 0;
181 // Stops stream activity.
182 // When a stream is stopped, it can't receive, process or deliver packets.
183 virtual void Stop() = 0;
184
179 // TODO(pbos): Add info on currently-received codec to Stats. 185 // TODO(pbos): Add info on currently-received codec to Stats.
180 virtual Stats GetStats() const = 0; 186 virtual Stats GetStats() const = 0;
187
188 protected:
189 virtual ~VideoReceiveStream() {}
181 }; 190 };
182 191
183 } // namespace webrtc 192 } // namespace webrtc
184 193
185 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_ 194 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698