diff options
| author | vikasmarwaha@webrtc.org <vikasmarwaha@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-10-24 22:35:52 +0000 |
|---|---|---|
| committer | vikasmarwaha@webrtc.org <vikasmarwaha@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2012-10-24 22:35:52 +0000 |
| commit | 9f269d2d33e102713402c4c6aa84ac65a590f719 (patch) | |
| tree | 74c84f363a6ca4f7081596222b708966a4c90f29 /video_engine/vie_encoder.h | |
| parent | f30eb66fc70eb8ecf68599fffc8be3baf63d3489 (diff) | |
| download | webrtc-9f269d2d33e102713402c4c6aa84ac65a590f719.tar.gz | |
Reverse Merged r2884 & r2888 from trunk.
Review URL: https://webrtc-codereview.appspot.com/929005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@2988 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_encoder.h')
| -rw-r--r-- | video_engine/vie_encoder.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/video_engine/vie_encoder.h b/video_engine/vie_encoder.h index 339390f2..a8dfabac 100644 --- a/video_engine/vie_encoder.h +++ b/video_engine/vie_encoder.h @@ -11,9 +11,6 @@ #ifndef WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ #define WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ -#include <list> -#include <map> - #include "common_types.h" // NOLINT #include "typedefs.h" //NOLINT #include "modules/bitrate_controller/include/bitrate_controller.h" @@ -137,9 +134,6 @@ class ViEEncoder virtual void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id); virtual void OnLocalSsrcChanged(uint32_t old_ssrc, uint32_t new_ssrc); - // Sets SSRCs for all streams. - bool SetSsrcs(const std::list<unsigned int>& ssrcs); - // Effect filter. WebRtc_Word32 RegisterEffectFilter(ViEEffectFilter* effect_filter); @@ -173,7 +167,7 @@ class ViEEncoder BitrateController* bitrate_controller_; bool paused_; - std::map<unsigned int, int64_t> time_last_intra_request_ms_; + WebRtc_Word64 time_last_intra_request_ms_; WebRtc_Word32 channels_dropping_delta_frames_; bool drop_next_frame_; @@ -188,7 +182,6 @@ class ViEEncoder WebRtc_UWord8 picture_id_sli_; bool has_received_rpsi_; WebRtc_UWord64 picture_id_rpsi_; - std::map<unsigned int, int> ssrc_streams_; ViEFileRecorder file_recorder_; |