Remove VCMPacketizationCallback

webrtc/modules/video_coding/include/video_coding_defines.h

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..3305678b4b7859acd924c8804c9baa32f6f7d6f9 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,

[pbos-webrtc, 2016/05/02 00:16:06]

remove consts for these please

[perkj_webrtc, 2016/05/02 12:02:12]

Done.

-                                 const uint32_t frameRate) = 0;
+                                 const uint32_t frameRate,
+                                 std::string&& encoder_name) = 0;

[pbos-webrtc, 2016/05/02 00:16:06]

I prefer taking the hit of const std::string& encoder_name here, since it's a
weird to move the string here. WDYT?

 
  protected:
   virtual ~VCMSendStatisticsCallback() {}