| Index: webrtc/modules/video_coding/generic_encoder.h
|
| diff --git a/webrtc/modules/video_coding/generic_encoder.h b/webrtc/modules/video_coding/generic_encoder.h
|
| index 89d07e2fb65290bd74893210803a7eae0cc5c2a8..3887d0f680c4b33e7ebd82b8c85b215ba2263254 100644
|
| --- a/webrtc/modules/video_coding/generic_encoder.h
|
| +++ b/webrtc/modules/video_coding/generic_encoder.h
|
| @@ -42,20 +42,16 @@ class VCMEncodedFrameCallback : public EncodedImageCallback {
|
| int32_t Encoded(const EncodedImage& encoded_image,
|
| const CodecSpecificInfo* codec_specific,
|
| const RTPFragmentationHeader* fragmentation_header) override;
|
| - int32_t SetTransportCallback(VCMPacketizationCallback* transport);
|
| void SetMediaOpt(media_optimization::MediaOptimization* media_opt);
|
| void SetInternalSource(bool internal_source) {
|
| internal_source_ = internal_source;
|
| }
|
| - void SignalLastEncoderImplementationUsed(
|
| - const char* encoder_implementation_name);
|
|
|
| private:
|
| - VCMPacketizationCallback* send_callback_;
|
| media_optimization::MediaOptimization* media_opt_;
|
| bool internal_source_;
|
|
|
| - EncodedImageCallback* post_encode_callback_;
|
| + EncodedImageCallback* const post_encode_callback_;
|
| };
|
|
|
| class VCMGenericEncoder {
|
| @@ -75,6 +71,8 @@ class VCMGenericEncoder {
|
| const CodecSpecificInfo* codec_specific,
|
| const std::vector<FrameType>& frame_types);
|
|
|
| + const char* ImplementationName() const;
|
| +
|
| void SetEncoderParameters(const EncoderParameters& params);
|
| EncoderParameters GetEncoderParameters() const;
|
|
|
|
|