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

Unified Diff: webrtc/video/vie_encoder.h

Issue 1713683003: Simplify SSRC usage inside ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/video/vie_encoder.h
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
index 22457ef4292a287c52fc9c47597c698c5bb8240a..2924ffd68628e06a971d1f4461a650cabb2dde11 100644
--- a/webrtc/video/vie_encoder.h
+++ b/webrtc/video/vie_encoder.h
@@ -11,7 +11,6 @@
#ifndef WEBRTC_VIDEO_VIE_ENCODER_H_
#define WEBRTC_VIDEO_VIE_ENCODER_H_
-#include <map>
#include <vector>
#include "webrtc/base/criticalsection.h"
@@ -52,6 +51,7 @@ class ViEEncoder : public RtcpIntraFrameObserver,
friend class ViEBitrateObserver;
ViEEncoder(uint32_t number_of_cores,
+ const std::vector<uint32_t>& ssrcs,
ProcessThread* module_process_thread,
SendStatisticsProxy* stats_proxy,
I420FrameCallback* pre_encode_callback,
@@ -117,9 +117,6 @@ class ViEEncoder : public RtcpIntraFrameObserver,
void OnReceivedRPSI(uint32_t ssrc, uint64_t picture_id) override;
void OnLocalSsrcChanged(uint32_t old_ssrc, uint32_t new_ssrc) override;
- // Sets SSRCs for all streams.
- void SetSsrcs(const std::vector<uint32_t>& ssrcs);
-
void SetMinTransmitBitrate(int min_transmit_bitrate_kbps);
// Lets the sender suspend video when the rate drops below
@@ -145,6 +142,7 @@ class ViEEncoder : public RtcpIntraFrameObserver,
void TraceFrameDropEnd() EXCLUSIVE_LOCKS_REQUIRED(data_cs_);
const uint32_t number_of_cores_;
+ const std::vector<uint32_t> ssrcs_;
const rtc::scoped_ptr<VideoProcessing> vp_;
const rtc::scoped_ptr<QMVideoSettingsCallback> qm_callback_;
@@ -171,8 +169,7 @@ class ViEEncoder : public RtcpIntraFrameObserver,
bool network_is_transmitting_ GUARDED_BY(data_cs_);
bool encoder_paused_ GUARDED_BY(data_cs_);
bool encoder_paused_and_dropped_frame_ GUARDED_BY(data_cs_);
- std::map<unsigned int, int64_t> time_last_intra_request_ms_
- GUARDED_BY(data_cs_);
+ std::vector<int64_t> time_last_intra_request_ms_ GUARDED_BY(data_cs_);
ProcessThread* module_process_thread_;
@@ -180,7 +177,6 @@ class ViEEncoder : public RtcpIntraFrameObserver,
uint8_t picture_id_sli_ GUARDED_BY(data_cs_);
bool has_received_rpsi_ GUARDED_BY(data_cs_);
uint64_t picture_id_rpsi_ GUARDED_BY(data_cs_);
- std::map<uint32_t, int> ssrc_streams_ GUARDED_BY(data_cs_);
bool video_suspended_ GUARDED_BY(data_cs_);
};

Powered by Google App Engine
This is Rietveld 408576698