summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2020-10-15 15:24:36 -0700
committerJames Zern <jzern@google.com>2020-10-15 17:11:53 -0700
commit122a74eda7011f3f6b95b075054a25d171abaca5 (patch)
treea0acc899f688a2dca65628b998c41553ab36c647
parent9857515cd6deae3e981792c74613e0dac624db56 (diff)
downloadlibvpx-122a74eda7011f3f6b95b075054a25d171abaca5.tar.gz
install vpx_ext_ratectrl.h
fixes encoder detection / compile with installed headers after: 6dba0d0a0 Add callback functions for external_rate_control Bug: webm:1707 Change-Id: I370d8c94d6f1b8201002a722077ecf6b3d8cede5
-rw-r--r--libs.mk6
-rw-r--r--vpx/vpx_codec.mk1
-rw-r--r--vpx/vpx_ext_ratectrl.h8
3 files changed, 14 insertions, 1 deletions
diff --git a/libs.mk b/libs.mk
index 78f2c9278..d14439a3d 100644
--- a/libs.mk
+++ b/libs.mk
@@ -63,6 +63,7 @@ ifeq ($(CONFIG_VP8_ENCODER),yes)
CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS))
CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS))
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h
+ INSTALL-LIBS-yes += include/vpx/vpx_ext_ratectrl.h
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/%
CODEC_DOC_SECTIONS += vp8 vp8_encoder
endif
@@ -87,13 +88,16 @@ ifeq ($(CONFIG_VP9_ENCODER),yes)
CODEC_SRCS-yes += $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS))
CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS))
CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h
+ CODEC_SRCS-yes += vpx/vpx_ext_ratectrl.h
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h
+ INSTALL-LIBS-yes += include/vpx/vpx_ext_ratectrl.h
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%
- CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h
+ CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h vpx/vpx_ext_ratectrl.h
CODEC_DOC_SECTIONS += vp9 vp9_encoder
RC_RTC_SRCS := $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS))
RC_RTC_SRCS += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h
+ RC_RTC_SRCS += vpx/vpx_ext_ratectrl.h
RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.cc
RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.h
INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(VP9_PREFIX)ratectrl_rtc.cc
diff --git a/vpx/vpx_codec.mk b/vpx/vpx_codec.mk
index 67812f21b..350dc247b 100644
--- a/vpx/vpx_codec.mk
+++ b/vpx/vpx_codec.mk
@@ -24,6 +24,7 @@ API_DOC_SRCS-$(CONFIG_VP8_DECODER) += vp8dx.h
API_DOC_SRCS-yes += vpx_codec.h
API_DOC_SRCS-yes += vpx_decoder.h
API_DOC_SRCS-yes += vpx_encoder.h
+API_DOC_SRCS-yes += vpx_ext_ratectrl.h
API_DOC_SRCS-yes += vpx_frame_buffer.h
API_DOC_SRCS-yes += vpx_image.h
diff --git a/vpx/vpx_ext_ratectrl.h b/vpx/vpx_ext_ratectrl.h
index c464de884..940227ac2 100644
--- a/vpx/vpx_ext_ratectrl.h
+++ b/vpx/vpx_ext_ratectrl.h
@@ -17,6 +17,10 @@ extern "C" {
#include "./vpx_integer.h"
+/*!\cond
+ TODO(angiebird): document these structures and fields to clear doxygen
+ warnings.*/
+
typedef void *vpx_rc_model_t;
typedef struct vpx_rc_encodeframe_decision {
@@ -149,6 +153,10 @@ typedef struct vpx_rc_funcs {
void *priv;
} vpx_rc_funcs_t;
+/*!\endcond
+ TODO(angiebird): document these structures and fields to clear doxygen
+ warnings.*/
+
#ifdef __cplusplus
} // extern "C"
#endif