zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move sent key frame stats to send_statistics_proxy class.

Browse Source 
BUG=

Review URL: https://codereview.webrtc.org/1374673003

Cr-Commit-Position: refs/heads/master@{#10166}
This commit is contained in:
asapersson
2015-10-05 02:36:17 -07:00
committed by Commit bot
parent 42b6c634f0
commit dec5ebf106
10 changed files with 45 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/video_coding/main/source/media_optimization.cc
View File

@ -351,14 +351,6 @@ uint32_t MediaOptimization::SentBitRate() {
return avg_sent_bit_rate_bps_;
}
VCMFrameCount MediaOptimization::SentFrameCount() {
CriticalSectionScoped lock(crit_sect_.get());
VCMFrameCount count;
count.numDeltaFrames = delta_frame_cnt_;
count.numKeyFrames = key_frame_cnt_;
return count;
}
int32_t MediaOptimization::UpdateWithEncodedData(
const EncodedImage& encoded_image) {
size_t encoded_length = encoded_image._length;

1
webrtc/modules/video_coding/main/source/media_optimization.h
View File

@ -83,7 +83,6 @@ class MediaOptimization {
uint32_t InputFrameRate();
uint32_t SentFrameRate();
uint32_t SentBitRate();
VCMFrameCount SentFrameCount();
private:
enum {

4
webrtc/modules/video_coding/main/source/video_coding_impl.cc
View File

@ -189,10 +189,6 @@ class VideoCodingModuleImpl : public VideoCodingModule {
return sender_->EnableFrameDropper(enable);
}
int32_t SentFrameCount(VCMFrameCount& frameCount) const override {
return sender_->SentFrameCount(&frameCount);
}
void SuspendBelowMinBitrate() override {
return sender_->SuspendBelowMinBitrate();
}

1
webrtc/modules/video_coding/main/source/video_coding_impl.h
View File

@ -86,7 +86,6 @@ class VideoSender {
bool internalSource);
int32_t CodecConfigParameters(uint8_t* buffer, int32_t size) const;
int32_t SentFrameCount(VCMFrameCount* frameCount);
int Bitrate(unsigned int* bitrate) const;
int FrameRate(unsigned int* framerate) const;

7
webrtc/modules/video_coding/main/source/video_sender.cc
View File

@ -184,13 +184,6 @@ int32_t VideoSender::CodecConfigParameters(uint8_t* buffer,
return VCM_UNINITIALIZED;
}
// TODO(andresp): Make const once media_opt is thread-safe and this has a
// pointer to it.
int32_t VideoSender::SentFrameCount(VCMFrameCount* frameCount) {
*frameCount = _mediaOpt.SentFrameCount();
return VCM_OK;
}
// Get encode bitrate
int VideoSender::Bitrate(unsigned int* bitrate) const {
RTC_DCHECK(main_thread_.CalledOnValidThread());