| OLD | NEW |
| 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/api/call/transport.h" | 19 #include "webrtc/api/call/transport.h" |
| 20 #include "webrtc/base/platform_file.h" | 20 #include "webrtc/base/platform_file.h" |
| 21 // TODO(eladalon): !!! Good? Bad? Do we want to have these functions explicitly |
| 22 // part of the interface, without inheriting them, perhaps? |
| 23 #include "webrtc/call/secondary_rtp_sinks_container.h" |
| 21 #include "webrtc/common_types.h" | 24 #include "webrtc/common_types.h" |
| 22 #include "webrtc/common_video/include/frame_callback.h" | 25 #include "webrtc/common_video/include/frame_callback.h" |
| 23 #include "webrtc/config.h" | 26 #include "webrtc/config.h" |
| 24 #include "webrtc/media/base/videosinkinterface.h" | 27 #include "webrtc/media/base/videosinkinterface.h" |
| 25 | 28 |
| 26 namespace webrtc { | 29 namespace webrtc { |
| 27 | 30 |
| 28 class VideoDecoder; | 31 class VideoDecoder; |
| 29 | 32 |
| 30 class VideoReceiveStream { | 33 class VideoReceiveStream : public SecondaryRtpSinksContainer { |
| 31 public: | 34 public: |
| 32 // TODO(mflodman) Move all these settings to VideoDecoder and move the | 35 // TODO(mflodman) Move all these settings to VideoDecoder and move the |
| 33 // declaration to common_types.h. | 36 // declaration to common_types.h. |
| 34 struct Decoder { | 37 struct Decoder { |
| 35 std::string ToString() const; | 38 std::string ToString() const; |
| 36 | 39 |
| 37 // The actual decoder instance. | 40 // The actual decoder instance. |
| 38 VideoDecoder* decoder = nullptr; | 41 VideoDecoder* decoder = nullptr; |
| 39 | 42 |
| 40 // Received RTP packets with this payload type will be sent to this decoder | 43 // Received RTP packets with this payload type will be sent to this decoder |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 EnableEncodedFrameRecording(rtc::kInvalidPlatformFileValue, 0); | 221 EnableEncodedFrameRecording(rtc::kInvalidPlatformFileValue, 0); |
| 219 } | 222 } |
| 220 | 223 |
| 221 protected: | 224 protected: |
| 222 virtual ~VideoReceiveStream() {} | 225 virtual ~VideoReceiveStream() {} |
| 223 }; | 226 }; |
| 224 | 227 |
| 225 } // namespace webrtc | 228 } // namespace webrtc |
| 226 | 229 |
| 227 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_ | 230 #endif // WEBRTC_VIDEO_RECEIVE_STREAM_H_ |
| OLD | NEW |