Chromium Code Reviews| Index: webrtc/modules/video_coding/include/video_coding_defines.h |
| diff --git a/webrtc/modules/video_coding/include/video_coding_defines.h b/webrtc/modules/video_coding/include/video_coding_defines.h |
| index 231e24fef9108fcbd7a58373628401fc033e363a..43987bfea20bfb2e5c698e196649cdebe661249a 100644 |
| --- a/webrtc/modules/video_coding/include/video_coding_defines.h |
| +++ b/webrtc/modules/video_coding/include/video_coding_defines.h |
| @@ -11,6 +11,7 @@ |
| #ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ |
| #define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ |
| +#include <string> |
| #include <vector> |
| #include "webrtc/modules/include/module_common_types.h" |
| @@ -56,18 +57,6 @@ struct VCMFrameCount { |
| uint32_t numDeltaFrames; |
| }; |
| -// Callback class used for sending data ready to be packetized |
| -// Deprecated. |
| -// TODO(perkj): Remove once OnEncoderImplementationName is not used. |
| -class VCMPacketizationCallback { |
| - public: |
| - // TODO(perkj): Refactor this. It does not belong in VCMPacketizationCallback. |
| - virtual void OnEncoderImplementationName(const char* implementation_name) {} |
| - |
| - protected: |
| - virtual ~VCMPacketizationCallback() {} |
| -}; |
| - |
| // Callback class used for passing decoded frames which are ready to be |
| // rendered. |
| class VCMReceiveCallback { |
| @@ -84,13 +73,13 @@ class VCMReceiveCallback { |
| virtual ~VCMReceiveCallback() {} |
| }; |
| -// Callback class used for informing the user of the bit rate and frame rate |
| -// produced by the |
| -// encoder. |
| +// Callback class used for informing the user of the bit rate and frame rate, |
| +// and the name of the encoder. |
| class VCMSendStatisticsCallback { |
| public: |
| virtual int32_t SendStatistics(const uint32_t bitRate, |
| - const uint32_t frameRate) = 0; |
| + const uint32_t frameRate, |
| + std::string && encoder_name) = 0; |
|
stefan-webrtc
2016/04/26 08:51:58
Not sure about the formatting for this. Have you r
perkj_webrtc
2016/04/27 09:01:24
Well- lint does not recognize std::string&& encode
perkj_webrtc
2016/04/27 09:02:51
This comment is wrong.
git cl lint does not like
|
| protected: |
| virtual ~VCMSendStatisticsCallback() {} |