| 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 0309d8d7af8cfc1c7b29cf7ec1ebcdbe22c1e5ef..469f04ded40bdd47890d0b74816e344a038ec12a 100644
|
| --- a/webrtc/modules/video_coding/generic_encoder.h
|
| +++ b/webrtc/modules/video_coding/generic_encoder.h
|
| @@ -35,27 +35,22 @@ struct EncoderParameters {
|
|
|
| class VCMEncodedFrameCallback : public EncodedImageCallback {
|
| public:
|
| - explicit VCMEncodedFrameCallback(EncodedImageCallback* post_encode_callback);
|
| + VCMEncodedFrameCallback(EncodedImageCallback* post_encode_callback,
|
| + media_optimization::MediaOptimization* media_opt);
|
| virtual ~VCMEncodedFrameCallback();
|
|
|
| // Implements 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_;
|
| + media_optimization::MediaOptimization* const media_opt_;
|
| };
|
|
|
| class VCMGenericEncoder {
|
| @@ -75,6 +70,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;
|
|
|
|
|