| Index: webrtc/video/vie_encoder.cc
|
| diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
|
| index 0c781b866348615cab185c8ecc3876ba23f3a157..8218e5746c6a58126b1ac9dbd3cc89ae45c43206 100644
|
| --- a/webrtc/video/vie_encoder.cc
|
| +++ b/webrtc/video/vie_encoder.cc
|
| @@ -125,11 +125,6 @@ bool ViEEncoder::Init() {
|
|
|
| vcm_->RegisterPostEncodeImageCallback(this);
|
|
|
| - // TODO(perkj): Remove |RegisterTransportCallback| as soon as we don't use
|
| - // VCMPacketizationCallback::OnEncoderImplementationName.
|
| - if (vcm_->RegisterTransportCallback(this) != 0) {
|
| - return false;
|
| - }
|
| if (vcm_->RegisterSendStatisticsCallback(this) != 0) {
|
| return false;
|
| }
|
| @@ -409,11 +404,6 @@ void ViEEncoder::OnSetRates(uint32_t bitrate_bps, int framerate) {
|
| stats_proxy_->OnSetRates(bitrate_bps, framerate);
|
| }
|
|
|
| -void ViEEncoder::OnEncoderImplementationName(const char* implementation_name) {
|
| - if (stats_proxy_)
|
| - stats_proxy_->OnEncoderImplementationName(implementation_name);
|
| -}
|
| -
|
| int32_t ViEEncoder::Encoded(const EncodedImage& encoded_image,
|
| const CodecSpecificInfo* codec_specific_info,
|
| const RTPFragmentationHeader* fragmentation) {
|
| @@ -464,9 +454,10 @@ int32_t ViEEncoder::Encoded(const EncodedImage& encoded_image,
|
| }
|
|
|
| int32_t ViEEncoder::SendStatistics(const uint32_t bit_rate,
|
| - const uint32_t frame_rate) {
|
| + const uint32_t frame_rate,
|
| + std::string&& encoder_name) {
|
| if (stats_proxy_)
|
| - stats_proxy_->OnOutgoingRate(frame_rate, bit_rate);
|
| + stats_proxy_->OnOutgoingRate(frame_rate, bit_rate, std::move(encoder_name));
|
| return 0;
|
| }
|
|
|
|
|