| Index: webrtc/video/vie_encoder.h
|
| diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
|
| index 27f2d11ca3194f93396c489298912eeb86085232..6f750be8888dab72efe1c5c9e5ceaac27550d6bd 100644
|
| --- a/webrtc/video/vie_encoder.h
|
| +++ b/webrtc/video/vie_encoder.h
|
| @@ -12,6 +12,7 @@
|
| #define WEBRTC_VIDEO_VIE_ENCODER_H_
|
|
|
| #include <memory>
|
| +#include <string>
|
| #include <vector>
|
|
|
| #include "webrtc/base/criticalsection.h"
|
| @@ -43,7 +44,6 @@ class VideoEncoder;
|
|
|
| class ViEEncoder : public VideoEncoderRateObserver,
|
| public EncodedImageCallback,
|
| - public VCMPacketizationCallback,
|
| public VCMSendStatisticsCallback {
|
| public:
|
| friend class ViEBitrateObserver;
|
| @@ -94,9 +94,6 @@ class ViEEncoder : public VideoEncoderRateObserver,
|
| // Implements VideoEncoderRateObserver.
|
| void OnSetRates(uint32_t bitrate_bps, int framerate) override;
|
|
|
| - // Implements VCMPacketizationCallback.
|
| - void OnEncoderImplementationName(const char* implementation_name) override;
|
| -
|
| // Implements EncodedImageCallback.
|
| int32_t Encoded(const EncodedImage& encoded_image,
|
| const CodecSpecificInfo* codec_specific_info,
|
| @@ -104,7 +101,8 @@ class ViEEncoder : public VideoEncoderRateObserver,
|
|
|
| // Implements VideoSendStatisticsCallback.
|
| int32_t SendStatistics(const uint32_t bit_rate,
|
| - const uint32_t frame_rate) override;
|
| + const uint32_t frame_rate,
|
| + std::string&& encoder_name) override;
|
|
|
| // virtual to test EncoderStateFeedback with mocks.
|
| virtual void OnReceivedIntraFrameRequest(uint32_t ssrc);
|
|
|