| Index: webrtc/modules/video_coding/main/source/generic_encoder.h
|
| diff --git a/webrtc/modules/video_coding/main/source/generic_encoder.h b/webrtc/modules/video_coding/main/source/generic_encoder.h
|
| index 25235b6b4677ad2565a9d6583bc2cf565727cd40..8f3e845d585eefd79b99509451e3e80adc4f9a5d 100644
|
| --- a/webrtc/modules/video_coding/main/source/generic_encoder.h
|
| +++ b/webrtc/modules/video_coding/main/source/generic_encoder.h
|
| @@ -55,9 +55,11 @@ public:
|
| void SetInternalSource(bool internalSource) { _internalSource = internalSource; };
|
|
|
| void SetRotation(VideoRotation rotation) { _rotation = rotation; }
|
| + void SignalLastEncoderImplementationUsed(
|
| + const char* encoder_implementation_name);
|
|
|
| private:
|
| - VCMPacketizationCallback* _sendCallback;
|
| + VCMPacketizationCallback* send_callback_;
|
| media_optimization::MediaOptimization* _mediaOpt;
|
| uint8_t _payloadType;
|
| bool _internalSource;
|
| @@ -145,11 +147,11 @@ public:
|
| private:
|
| VideoEncoder* const encoder_;
|
| VideoEncoderRateObserver* const rate_observer_;
|
| - VCMEncodedFrameCallback* vcm_encoded_frame_callback_;
|
| - uint32_t bit_rate_;
|
| - uint32_t frame_rate_;
|
| - const bool internal_source_;
|
| + VCMEncodedFrameCallback* vcm_encoded_frame_callback_;
|
| mutable rtc::CriticalSection rates_lock_;
|
| + uint32_t bit_rate_ GUARDED_BY(rates_lock_);
|
| + uint32_t frame_rate_ GUARDED_BY(rates_lock_);
|
| + const bool internal_source_;
|
| VideoRotation rotation_;
|
| bool is_screenshare_;
|
| }; // end of VCMGenericEncoder class
|
|
|