1 files changed, 2 insertions, 21 deletions
diff --git a/chromium/third_party/webrtc/modules/video_coding/main/source/generic_encoder.h b/chromium/third_party/webrtc/modules/video_coding/main/source/generic_encoder.h
index c5cfeabc26f..9277260af34 100644
--- a/chromium/third_party/webrtc/modules/video_coding/main/source/generic_encoder.h
+++ b/chromium/third_party/webrtc/modules/video_coding/main/source/generic_encoder.h
@@ -17,9 +17,7 @@
 
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
-namespace webrtc
-{
-
+namespace webrtc {
 class CriticalSectionWrapper;
 
 namespace media_optimization {
@@ -32,7 +30,7 @@ class MediaOptimization;
 class VCMEncodedFrameCallback : public EncodedImageCallback
 {
 public:
-    VCMEncodedFrameCallback();
+    VCMEncodedFrameCallback(EncodedImageCallback* post_encode_callback);
     virtual ~VCMEncodedFrameCallback();
 
     /*
@@ -43,10 +41,6 @@ public:
         const CodecSpecificInfo* codecSpecificInfo = NULL,
         const RTPFragmentationHeader* fragmentationHeader = NULL);
     /*
-    * Get number of encoded bytes
-    */
-    uint32_t EncodedBytes();
-    /*
     * Callback implementation - generic encoder encode complete
     */
     int32_t SetTransportCallback(VCMPacketizationCallback* transport);
@@ -56,27 +50,14 @@ public:
     void SetMediaOpt (media_optimization::MediaOptimization* mediaOpt);
 
     void SetPayloadType(uint8_t payloadType) { _payloadType = payloadType; };
-    void SetCodecType(VideoCodecType codecType) {_codecType = codecType;};
     void SetInternalSource(bool internalSource) { _internalSource = internalSource; };
 
-    void RegisterPostEncodeImageCallback(EncodedImageCallback* callback);
-
 private:
-    /*
-     * Map information from info into rtp. If no relevant information is found
-     * in info, rtp is set to NULL.
-     */
-    static void CopyCodecSpecific(const CodecSpecificInfo& info,
-                                  RTPVideoHeader** rtp);
-
     VCMPacketizationCallback* _sendCallback;
     media_optimization::MediaOptimization* _mediaOpt;
-    uint32_t _encodedBytes;
     uint8_t _payloadType;
-    VideoCodecType _codecType;
     bool _internalSource;
 
-    scoped_ptr<CriticalSectionWrapper> post_encode_callback_lock_;
     EncodedImageCallback* post_encode_callback_;
 
 #ifdef DEBUG_ENCODER_BIT_STREAM