| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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_VIDEO_STREAM_DECODER_H_ | 11 #ifndef WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ |
| 12 #define WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ | 12 #define WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ |
| 13 | 13 |
| 14 #include <list> | 14 #include <list> |
| 15 #include <map> | 15 #include <map> |
| 16 #include <memory> | 16 #include <memory> |
| 17 #include <vector> | 17 #include <vector> |
| 18 | 18 |
| 19 #include "webrtc/base/criticalsection.h" | 19 #include "webrtc/base/criticalsection.h" |
| 20 #include "webrtc/base/platform_thread.h" | 20 #include "webrtc/base/platform_thread.h" |
| 21 #include "webrtc/base/scoped_ref_ptr.h" | 21 #include "webrtc/base/scoped_ref_ptr.h" |
| 22 #include "webrtc/media/base/videosinkinterface.h" | 22 #include "webrtc/media/base/videosinkinterface.h" |
| 23 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat
or.h" | 23 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimat
or.h" |
| 24 #include "webrtc/modules/video_coding/include/video_coding_defines.h" | 24 #include "webrtc/modules/video_coding/include/video_coding_defines.h" |
| 25 #include "webrtc/typedefs.h" | 25 #include "webrtc/typedefs.h" |
| 26 #include "webrtc/video/vie_sync_module.h" | |
| 27 | 26 |
| 28 namespace webrtc { | 27 namespace webrtc { |
| 29 | 28 |
| 30 class CallStatsObserver; | 29 class CallStatsObserver; |
| 31 class ChannelStatsObserver; | 30 class ChannelStatsObserver; |
| 32 class Config; | 31 class Config; |
| 33 class EncodedImageCallback; | 32 class EncodedImageCallback; |
| 34 class I420FrameCallback; | 33 class I420FrameCallback; |
| 35 class ReceiveStatisticsProxy; | 34 class ReceiveStatisticsProxy; |
| 36 class VideoRenderCallback; | 35 class VideoRenderCallback; |
| 37 class VoEVideoSync; | |
| 38 | 36 |
| 39 namespace vcm { | 37 namespace vcm { |
| 40 class VideoReceiver; | 38 class VideoReceiver; |
| 41 } // namespace vcm | 39 } // namespace vcm |
| 42 | 40 |
| 43 enum StreamType { | 41 enum StreamType { |
| 44 kViEStreamTypeNormal = 0, // Normal media stream | 42 kViEStreamTypeNormal = 0, // Normal media stream |
| 45 kViEStreamTypeRtx = 1 // Retransmission media stream | 43 kViEStreamTypeRtx = 1 // Retransmission media stream |
| 46 }; | 44 }; |
| 47 | 45 |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 // TODO(tommi): This callback is basically the same thing as the one above. | 98 // TODO(tommi): This callback is basically the same thing as the one above. |
| 101 // We shouldn't need to support both. | 99 // We shouldn't need to support both. |
| 102 I420FrameCallback* const pre_render_callback_; | 100 I420FrameCallback* const pre_render_callback_; |
| 103 | 101 |
| 104 int64_t last_rtt_ms_ GUARDED_BY(crit_); | 102 int64_t last_rtt_ms_ GUARDED_BY(crit_); |
| 105 }; | 103 }; |
| 106 | 104 |
| 107 } // namespace webrtc | 105 } // namespace webrtc |
| 108 | 106 |
| 109 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ | 107 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ |
| OLD | NEW |