Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: webrtc/video/vie_encoder.h

Issue 1900193004: Remove VCMPacketizationCallback (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased and fixed SendStatisics const uint. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/vie_encoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video/vie_encoder.h
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
index 3d05a157e7e039de0f7535a01e34cea69e871d2b..9369f9faa36d9781ff3df28ae4b116a017d7c12a 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"
@@ -52,7 +53,6 @@ class VideoEncoder;
// 6. For each available raw video frame call EncodeVideoFrame.
class ViEEncoder : public VideoEncoderRateObserver,
public EncodedImageCallback,
- public VCMPacketizationCallback,
public VCMSendStatisticsCallback {
public:
friend class ViEBitrateObserver;
@@ -67,8 +67,6 @@ class ViEEncoder : public VideoEncoderRateObserver,
PacedSender* pacer);
~ViEEncoder();
- bool Init();
-
vcm::VideoSender* video_sender();
void SetNetworkTransmissionState(bool is_transmitting);
@@ -102,17 +100,15 @@ 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,
const RTPFragmentationHeader* fragmentation) override;
// Implements VideoSendStatisticsCallback.
- int32_t SendStatistics(const uint32_t bit_rate,
- const uint32_t frame_rate) override;
+ void SendStatistics(uint32_t bit_rate,
+ uint32_t frame_rate,
+ const std::string& encoder_name) override;
// virtual to test EncoderStateFeedback with mocks.
virtual void OnReceivedIntraFrameRequest(uint32_t ssrc);
« no previous file with comments | « webrtc/video/video_send_stream.cc ('k') | webrtc/video/vie_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698