Index: webrtc/video/vie_encoder.h |
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h |
index 02fec6292a3c483b665160812d2b1ae77da63cf8..c7f27af583ce7482cbe659e4bd6c9e980a7dbed9 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" |
@@ -44,7 +45,6 @@ class VideoEncoder; |
class ViEEncoder : public VideoEncoderRateObserver, |
public EncodedImageCallback, |
- public VCMPacketizationCallback, |
public VCMSendStatisticsCallback { |
public: |
friend class ViEBitrateObserver; |
@@ -61,8 +61,6 @@ class ViEEncoder : public VideoEncoderRateObserver, |
EncodedImageCallback* post_encode_callback); |
~ViEEncoder(); |
- bool Init(); |
- |
vcm::VideoSender* video_sender(); |
void SetNetworkTransmissionState(bool is_transmitting); |
@@ -93,9 +91,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, |
@@ -103,7 +98,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); |