Extend LibvpxInterface with VP9 support and use it from LibvpxVp9Encoder

Bug: webrtc:12274
Change-Id: I7a66a91f6a21ba482347af3c8af53544f9eb2269
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/196900
Commit-Queue: Erik Språng <sprang@webrtc.org>
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32822}
This commit is contained in:
Erik Språng
2020-12-13 14:50:59 +01:00
committed by Commit Bot
parent 9325d343e5
commit cc02721090
4 changed files with 287 additions and 56 deletions

View File

@ -86,6 +86,38 @@ class MockLibvpxInterface : public LibvpxInterface {
codec_control,
(vpx_codec_ctx_t*, vp8e_enc_control_id, vpx_scaling_mode*),
(const, override));
MOCK_METHOD(vpx_codec_err_t,
codec_control,
(vpx_codec_ctx_t*, vp8e_enc_control_id, vpx_svc_extra_cfg_t*),
(const, override));
MOCK_METHOD(vpx_codec_err_t,
codec_control,
(vpx_codec_ctx_t*, vp8e_enc_control_id, vpx_svc_frame_drop_t*),
(const, override));
MOCK_METHOD(vpx_codec_err_t,
codec_control,
(vpx_codec_ctx_t*, vp8e_enc_control_id, void*),
(const, override));
MOCK_METHOD(vpx_codec_err_t,
codec_control,
(vpx_codec_ctx_t*, vp8e_enc_control_id, vpx_svc_layer_id_t*),
(const, override));
MOCK_METHOD(vpx_codec_err_t,
codec_control,
(vpx_codec_ctx_t*,
vp8e_enc_control_id,
vpx_svc_ref_frame_config_t*),
(const, override));
MOCK_METHOD(vpx_codec_err_t,
codec_control,
(vpx_codec_ctx_t*,
vp8e_enc_control_id,
vpx_svc_spatial_layer_sync_t*),
(const, override));
MOCK_METHOD(vpx_codec_err_t,
codec_control,
(vpx_codec_ctx_t*, vp8e_enc_control_id, vpx_rc_funcs_t*),
(const, override));
MOCK_METHOD(vpx_codec_err_t,
codec_encode,
(vpx_codec_ctx_t*,
@ -103,6 +135,11 @@ class MockLibvpxInterface : public LibvpxInterface {
codec_error_detail,
(vpx_codec_ctx_t*),
(const, override));
MOCK_METHOD(const char*, codec_error, (vpx_codec_ctx_t*), (const, override));
MOCK_METHOD(const char*,
codec_err_to_string,
(vpx_codec_err_t),
(const, override));
};
} // namespace webrtc