Unified · Split
| @@ -91,6 +91,13 @@ ifeq ($(CONFIG_VP9_ENCODER),yes) · 90 unmodified lines | ||
| 91 | 91 | INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/% |
| 92 | 92 | CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h |
| 93 | 93 | CODEC_DOC_SECTIONS += vp9 vp9_encoder |
| 94 | + | |
| 95 | + RC_RTC_SRCS := $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS)) | |
| 96 | + RC_RTC_SRCS += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h | |
| 97 | + RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.cc | |
| 98 | + RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.h | |
| 99 | + INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(VP9_PREFIX)ratectrl_rtc.cc | |
| 100 | + INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(VP9_PREFIX)ratectrl_rtc.h | |
| 94 | 101 | endif |
| 95 | 102 | |
| 96 | 103 | ifeq ($(CONFIG_VP9_DECODER),yes) |
| @@ -115,6 +122,7 @@ endif · 18 unmodified lines | ||
| 115 | 122 | ifeq ($(CONFIG_MSVS),yes) |
| 116 | 123 | CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd) |
| 117 | 124 | GTEST_LIB=$(if $(CONFIG_STATIC_MSVCRT),gtestmt,gtestmd) |
| 125 | +RC_RTC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vp9rcmt,vp9rcmd) | |
| 118 | 126 | # This variable uses deferred expansion intentionally, since the results of |
| 119 | 127 | # $(wildcard) may change during the course of the Make. |
| 120 | 128 | VS_PLATFORMS = $(foreach d,$(wildcard */Release/$(CODEC_LIB).lib),$(word 1,$(subst /, ,$(d)))) |
| @@ -225,6 +233,36 @@ PROJECTS-yes += vpx.$(VCPROJ_SFX) · 104 unmodified lines | ||
| 225 | 233 | vpx.$(VCPROJ_SFX): vpx_config.asm |
| 226 | 234 | vpx.$(VCPROJ_SFX): $(RTCD) |
| 227 | 235 | |
| 236 | +vp9rc.$(VCPROJ_SFX): \ | |
| 237 | + VCPROJ_SRCS=$(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) | |
| 238 | + | |
| 239 | +vp9rc.$(VCPROJ_SFX): $(RC_RTC_SRCS) | |
| 240 | + @echo " [CREATE] $@" | |
| 241 | + $(qexec)$(GEN_VCPROJ) \ | |
| 242 | + $(if $(CONFIG_SHARED),--dll,--lib) \ | |
| 243 | + --target=$(TOOLCHAIN) \ | |
| 244 | + $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ | |
| 245 | + --name=vp9rc \ | |
| 246 | + --proj-guid=C26FF952-9494-4838-9A3F-7F3D4F613385 \ | |
| 247 | + --ver=$(CONFIG_VS_VERSION) \ | |
| 248 | + --src-path-bare="$(SRC_PATH_BARE)" \ | |
| 249 | + --out=$@ $(CFLAGS) \ | |
| 250 | + $(filter $(SRC_PATH_BARE)/vp9/%.c, $(VCPROJ_SRCS)) \ | |
| 251 | + $(filter $(SRC_PATH_BARE)/vp9/%.cc, $(VCPROJ_SRCS)) \ | |
| 252 | + $(filter $(SRC_PATH_BARE)/vp9/%.h, $(VCPROJ_SRCS)) \ | |
| 253 | + $(filter $(SRC_PATH_BARE)/vpx/%, $(VCPROJ_SRCS)) \ | |
| 254 | + $(filter $(SRC_PATH_BARE)/vpx_dsp/%, $(VCPROJ_SRCS)) \ | |
| 255 | + $(filter-out $(addprefix $(SRC_PATH_BARE)/, \ | |
| 256 | + vp8/%.c vp8/%.h vp9/%.c vp9/%.cc vp9/%.h vpx/% \ | |
| 257 | + vpx_dsp/%), \ | |
| 258 | + $(VCPROJ_SRCS)) \ | |
| 259 | + --src-path-bare="$(SRC_PATH_BARE)" \ | |
| 260 | + | |
| 261 | +PROJECTS-yes += vp9rc.$(VCPROJ_SFX) | |
| 262 | + | |
| 263 | +vp9rc.$(VCPROJ_SFX): vpx_config.asm | |
| 264 | +vp9rc.$(VCPROJ_SFX): $(RTCD) | |
| 265 | + | |
| 228 | 266 | endif |
| 229 | 267 | else |
| 230 | 268 | LIBVPX_OBJS=$(call objs, $(filter-out $(ASM_INCLUDES), $(CODEC_SRCS))) |
| @@ -330,6 +368,15 @@ endif · 99 unmodified lines | ||
| 330 | 368 | INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc |
| 331 | 369 | INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc |
| 332 | 370 | CLEAN-OBJS += vpx.pc |
| 371 | + | |
| 372 | +ifeq ($(CONFIG_VP9_ENCODER),yes) | |
| 373 | + RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS)) | |
| 374 | + RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS)) | |
| 375 | + OBJS-yes += $(RC_RTC_OBJS) | |
| 376 | + LIBS-yes += $(BUILD_PFX)libvp9rc.a $(BUILD_PFX)libvp9rc_g.a | |
| 377 | + $(BUILD_PFX)libvp9rc_g.a: $(RC_RTC_OBJS) | |
| 378 | +endif | |
| 379 | + | |
| 333 | 380 | endif |
| 334 | 381 | |
| 335 | 382 | libvpx.ver: $(call enabled,CODEC_EXPORTS) |
| @@ -493,21 +540,21 @@ endif # TEST_INTRA_PRED_SPEED · 157 unmodified lines | ||
| 493 | 540 | |
| 494 | 541 | ifneq ($(strip $(RC_INTERFACE_TEST_OBJS)),) |
| 495 | 542 | PROJECTS-$(CONFIG_MSVS) += test_rc_interface.$(VCPROJ_SFX) |
| 496 | −test_rc_interface.$(VCPROJ_SFX): \ | |
| 497 | − $(RC_INTERFACE_TEST_SRCS) vpx.$(VCPROJ_SFX) gtest.$(VCPROJ_SFX) | |
| 543 | +test_rc_interface.$(VCPROJ_SFX): $(RC_INTERFACE_TEST_SRCS) vpx.$(VCPROJ_SFX) \ | |
| 544 | + vp9rc.$(VCPROJ_SFX) gtest.$(VCPROJ_SFX) | |
| 498 | 545 | @echo " [CREATE] $@" |
| 499 | 546 | $(qexec)$(GEN_VCPROJ) \ |
| 500 | 547 | --exe \ |
| 501 | 548 | --target=$(TOOLCHAIN) \ |
| 502 | 549 | --name=test_rc_interface \ |
| 503 | 550 | -D_VARIADIC_MAX=10 \ |
| 504 | − --proj-guid=CD837F5F-52D8-4314-A370-895D614166A7 \ | |
| 551 | + --proj-guid=30458F88-1BC6-4689-B41C-50F3737AAB27 \ | |
| 505 | 552 | --ver=$(CONFIG_VS_VERSION) \ |
| 506 | 553 | --src-path-bare="$(SRC_PATH_BARE)" \ |
| 507 | 554 | $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ |
| 508 | 555 | --out=$@ $(INTERNAL_CFLAGS) $(CFLAGS) \ |
| 509 | − -I.-I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \ | |
| 510 | − -L. -l$(CODEC_LIB) -l$(GTEST_LIB) -lvp9rc$^ | |
| 556 | + -I. -I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \ | |
| 557 | + -L. -l$(CODEC_LIB) -l$(RC_RTC_LIB) -l$(GTEST_LIB) $^ | |
| 511 | 558 | endif # RC_INTERFACE_TEST |
| 512 | 559 | endif |
| 513 | 560 | else |
| @@ -526,21 +573,6 @@ OBJS-yes += $(GTEST_OBJS) · 12 unmodified lines | ||
| 526 | 573 | LIBS-yes += $(BUILD_PFX)libgtest.a $(BUILD_PFX)libgtest_g.a |
| 527 | 574 | $(BUILD_PFX)libgtest_g.a: $(GTEST_OBJS) |
| 528 | 575 | |
| 529 | −ifeq ($(CONFIG_VP9_ENCODER),yes) | |
| 530 | − VP9_PREFIX=vp9/ | |
| 531 | − include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk | |
| 532 | − RC_RTC_SRCS := $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS)) | |
| 533 | − RC_RTC_SRCS += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h | |
| 534 | − RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.cc | |
| 535 | − RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.h | |
| 536 | − VP9_CX_SRCS-$(CONFIG_VP9_ENCODER) += ratectrl_rtc.cc | |
| 537 | − VP9_CX_SRCS-$(CONFIG_VP9_ENCODER) += ratectrl_rtc.h | |
| 538 | − RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS)) | |
| 539 | − OBJS-yes += $(RC_RTC_OBJS) | |
| 540 | − LIBS-yes += $(BUILD_PFX)libvp9rc.a $(BUILD_PFX)libvp9rc_g.a | |
| 541 | − $(BUILD_PFX)libvp9rc_g.a: $(RC_RTC_OBJS) | |
| 542 | −endif | |
| 543 | − | |
| 544 | 576 | LIBVPX_TEST_OBJS=$(sort $(call objs,$(LIBVPX_TEST_SRCS))) |
| 545 | 577 | $(LIBVPX_TEST_OBJS) $(LIBVPX_TEST_OBJS:.o=.d): CXXFLAGS += $(GTEST_INCLUDES) |
| 546 | 578 | OBJS-yes += $(LIBVPX_TEST_OBJS) |