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

Remove redudant encoder rate calls.

Browse Source 
Moves EncoderParameters update checks into GenericEncoder before calling
SetRates/SetChannelParameters as applicable.

Also removes CodecConfigParameters as a bonus.

BUG=
R=stefan@webrtc.org
TBR=mflodman@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#10452}
This commit is contained in:
Peter Boström
2015-10-29 16:30:23 +01:00
parent 4f4f756f6f
commit 69ccb33131
14 changed files with 92 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/video_coding/codecs/i420/include/i420.h
View File

@ -73,10 +73,6 @@ class I420Encoder : public VideoEncoder {
return WEBRTC_VIDEO_CODEC_OK;
}
int CodecConfigParameters(uint8_t* /*buffer*/, int /*size*/) override {
return WEBRTC_VIDEO_CODEC_OK;
}
void OnDroppedFrame() override {}
private:

4
webrtc/modules/video_coding/codecs/interface/mock/mock_video_codec_interface.h
View File

@ -43,8 +43,6 @@ class MockVideoEncoder : public VideoEncoder {
MOCK_METHOD2(SetChannelParameters, int32_t(uint32_t packetLoss, int64_t rtt));
MOCK_METHOD2(SetRates, int32_t(uint32_t newBitRate, uint32_t frameRate));
MOCK_METHOD1(SetPeriodicKeyFrames, int32_t(bool enable));
MOCK_METHOD2(CodecConfigParameters,
int32_t(uint8_t* /*buffer*/, int32_t));
};
class MockDecodedImageCallback : public DecodedImageCallback {
@ -69,8 +67,6 @@ class MockVideoDecoder : public VideoDecoder {
int32_t(DecodedImageCallback* callback));
MOCK_METHOD0(Release, int32_t());
MOCK_METHOD0(Reset, int32_t());
MOCK_METHOD2(SetCodecConfigParameters,
int32_t(const uint8_t* /*buffer*/, int32_t));
MOCK_METHOD0(Copy, VideoDecoder*());
};