| 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_ENGINE_VIE_ENCODER_H_ |   11 #ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ | 
|   12 #define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ |   12 #define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ | 
|   13  |   13  | 
|   14 #include <map> |   14 #include <map> | 
|   15 #include <vector> |   15 #include <vector> | 
|   16  |   16  | 
|   17 #include "webrtc/base/scoped_ptr.h" |   17 #include "webrtc/base/scoped_ptr.h" | 
|   18 #include "webrtc/base/scoped_ref_ptr.h" |   18 #include "webrtc/base/scoped_ref_ptr.h" | 
|   19 #include "webrtc/base/thread_annotations.h" |   19 #include "webrtc/base/thread_annotations.h" | 
 |   20 #include "webrtc/call/bitrate_allocator.h" | 
|   20 #include "webrtc/common_types.h" |   21 #include "webrtc/common_types.h" | 
|   21 #include "webrtc/frame_callback.h" |   22 #include "webrtc/frame_callback.h" | 
|   22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" |   23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" | 
|   23 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" |   24 #include "webrtc/modules/video_coding/include/video_coding_defines.h" | 
|   24 #include "webrtc/modules/video_processing/main/interface/video_processing.h" |   25 #include "webrtc/modules/video_processing/main/interface/video_processing.h" | 
|   25 #include "webrtc/typedefs.h" |   26 #include "webrtc/typedefs.h" | 
|   26 #include "webrtc/video/video_capture_input.h" |   27 #include "webrtc/video/video_capture_input.h" | 
|   27  |   28  | 
|   28 namespace webrtc { |   29 namespace webrtc { | 
|   29  |   30  | 
|   30 class BitrateAllocator; |   31 class BitrateAllocator; | 
|   31 class BitrateObserver; |   32 class BitrateObserver; | 
|   32 class Config; |   33 class Config; | 
|   33 class CriticalSectionWrapper; |   34 class CriticalSectionWrapper; | 
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  187   bool has_received_rpsi_ GUARDED_BY(data_cs_); |  188   bool has_received_rpsi_ GUARDED_BY(data_cs_); | 
|  188   uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); |  189   uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_); | 
|  189   std::map<uint32_t, int> ssrc_streams_ GUARDED_BY(data_cs_); |  190   std::map<uint32_t, int> ssrc_streams_ GUARDED_BY(data_cs_); | 
|  190  |  191  | 
|  191   bool video_suspended_ GUARDED_BY(data_cs_); |  192   bool video_suspended_ GUARDED_BY(data_cs_); | 
|  192 }; |  193 }; | 
|  193  |  194  | 
|  194 }  // namespace webrtc |  195 }  // namespace webrtc | 
|  195  |  196  | 
|  196 #endif  // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ |  197 #endif  // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ | 
| OLD | NEW |