Commit b7492341 authored by John Koleszar's avatar John Koleszar

install includes in DIST_DIR/include/vpx, move vpx_codec/ to vpx/

This renames the vpx_codec/ directory to vpx/, to allow applications
to more consistently reference these includes with the vpx/ prefix.
This allows the includes to be installed in /usr/local/include/vpx
rather than polluting the system includes directory with an
excessive number of includes.

Change-Id: I7b0652a20543d93f38f421c60b0bbccde4d61b4f
parent ee8bcb1a
......@@ -16,7 +16,7 @@
#if defined(_MSC_VER)
#include <io.h>
#include <share.h>
#include "vpx_ports/vpx_integer.h"
#include "vpx/vpx_integer.h"
#else
#include <stdint.h>
#include <unistd.h>
......
......@@ -158,8 +158,8 @@ if ! enabled alt_tree_layout; then
[ -d ${source_path}/vp8 ] && CODECS="${CODECS} vp8_encoder vp8_decoder"
else
# customer environment
[ -f ${source_path}/../include/vp8cx.h ] && CODECS="${CODECS} vp8_encoder"
[ -f ${source_path}/../include/vp8dx.h ] && CODECS="${CODECS} vp8_decoder"
[ -f ${source_path}/../include/vpx/vp8cx.h ] && CODECS="${CODECS} vp8_encoder"
[ -f ${source_path}/../include/vpx/vp8dx.h ] && CODECS="${CODECS} vp8_decoder"
[ -f ${source_path}/../lib/*/*mt.lib ] && soft_enable static_msvcrt
fi
......@@ -427,7 +427,7 @@ EOF
check_header pthread.h
check_header sys/mman.h
check_header vpx_ports/vpx_integer.h -I${source_path} && enable vpx_ports
check_header vpx/vpx_integer.h -I${source_path} && enable vpx_ports
}
process_toolchain() {
......
......@@ -15,10 +15,10 @@
#include <string.h>
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx_config.h"
#include "vpx_decoder.h"
#include "vpx_integer.h"
#include "vpx/vpx_decoder.h"
#include "vpx/vpx_integer.h"
#if CONFIG_VP8_DECODER
#include "vp8dx.h"
#include "vpx/vp8dx.h"
#endif
static char *exec_name;
......
......@@ -14,7 +14,7 @@
UTILS-$(CONFIG_DECODERS) += ivfdec.c
ivfdec.SRCS += md5_utils.c md5_utils.h
ivfdec.SRCS += vpx_ports/vpx_timer.h
ivfdec.SRCS += vpx_ports/vpx_integer.h
ivfdec.SRCS += vpx/vpx_integer.h
ivfdec.SRCS += args.c args.h vpx_ports/config.h
ivfdec.GUID = BA5FE66F-38DD-E034-F542-B1578C5FB950
ivfdec.DESCRIPTION = Full featured decoder
......@@ -86,8 +86,6 @@ ifeq ($(HAVE_ALT_TREE_LAYOUT),yes)
INC_PATH := $(SRC_PATH_BARE)/../include
else
LIB_PATH-yes += $(if $(BUILD_PFX),$(BUILD_PFX),.)
INC_PATH-yes += $(SRC_PATH_BARE)/vpx_codec
INC_PATH-yes += $(SRC_PATH_BARE)/vpx_ports
INC_PATH-$(CONFIG_VP8_DECODER) += $(SRC_PATH_BARE)/vp8
INC_PATH-$(CONFIG_VP8_ENCODER) += $(SRC_PATH_BARE)/vp8
LIB_PATH := $(call enabled,LIB_PATH)
......
......@@ -16,8 +16,8 @@
#include <stdarg.h>
#include <string.h>
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx_decoder.h"
#include "vp8dx.h"
#include "vpx/vpx_decoder.h"
#include "vpx/vp8dx.h"
#define interface (&vpx_codec_vp8_dx_algo)
@EXTRA_INCLUDES
......
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DEC_INCLUDES
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx_decoder.h"
#include "vp8dx.h"
#include "vpx/vpx_decoder.h"
#include "vpx/vp8dx.h"
#define interface (&vpx_codec_vp8_dx_algo)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DEC_INCLUDES
......
......@@ -16,8 +16,8 @@
#include <stdarg.h>
#include <string.h>
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx_encoder.h"
#include "vp8cx.h"
#include "vpx/vpx_encoder.h"
#include "vpx/vp8cx.h"
#define interface (&vpx_codec_vp8_cx_algo)
#define fourcc 0x30385056
@EXTRA_INCLUDES
......
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ENC_INCLUDES
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx_encoder.h"
#include "vp8cx.h"
#include "vpx/vpx_encoder.h"
#include "vpx/vp8cx.h"
#define interface (&vpx_codec_vp8_cx_algo)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ENC_INCLUDES
......
......@@ -17,10 +17,10 @@
#include <string.h>
#define VPX_CODEC_DISABLE_COMPAT 1
#include "vpx_config.h"
#include "vpx_decoder.h"
#include "vpx/vpx_decoder.h"
#include "vpx_ports/vpx_timer.h"
#if CONFIG_VP8_DECODER
#include "vp8dx.h"
#include "vpx/vp8dx.h"
#endif
#if CONFIG_MD5
#include "md5_utils.h"
......
......@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include "vpx_encoder.h"
#include "vpx/vpx_encoder.h"
#if USE_POSIX_MMAP
#include <sys/types.h>
#include <sys/stat.h>
......@@ -29,7 +29,7 @@
#include <fcntl.h>
#include <unistd.h>
#endif
#include "vp8cx.h"
#include "vpx/vp8cx.h"
#include "vpx_ports/mem_ops.h"
#include "vpx_ports/vpx_timer.h"
......
......@@ -10,8 +10,8 @@
ASM:=$(if $(filter yes,$(CONFIG_GCC)),.asm.s,.asm)
include $(SRC_PATH_BARE)/vpx_codec/vpx_codec.mk
CODEC_SRCS-yes += $(addprefix vpx_codec/,$(call enabled,API_SRCS))
include $(SRC_PATH_BARE)/vpx/vpx_codec.mk
CODEC_SRCS-yes += $(addprefix vpx/,$(call enabled,API_SRCS))
include $(SRC_PATH_BARE)/vpx_mem/vpx_mem.mk
CODEC_SRCS-yes += $(addprefix vpx_mem/,$(call enabled,MEM_SRCS))
......@@ -19,20 +19,16 @@ CODEC_SRCS-yes += $(addprefix vpx_mem/,$(call enabled,MEM_SRCS))
include $(SRC_PATH_BARE)/vpx_scale/vpx_scale.mk
CODEC_SRCS-yes += $(addprefix vpx_scale/,$(call enabled,SCALE_SRCS))
# Add vpx_codec/ to the include path to allow vp_n[cd]x.h to reference
# vpx_codec_impl_*.h without extra ifdeffery. vpx_ports to pick up
# vpx_integer.h
CFLAGS += -I$(SRC_PATH_BARE)/vpx_codec
CFLAGS += -I$(SRC_PATH_BARE)/vpx_ports
ifeq ($(CONFIG_VP8_ENCODER),yes)
VP8_PREFIX=vp8/
include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx.mk
CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_CX_SRCS))
CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_CX_EXPORTS))
CODEC_SRCS-yes += $(VP8_PREFIX)vp8cx.mk
INSTALL_MAPS += include/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/%
CODEC_DOC_SRCS += vp8/vp8.h vp8/vp8cx.h
CODEC_SRCS-yes += $(VP8_PREFIX)vp8cx.mk vpx/vp8.h vpx/vp8cx.h vpx/vp8e.h
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8e.h include/vpx/vp8cx.h
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/%
CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h
CODEC_DOC_SECTIONS += vp8 vp8_encoder
endif
......@@ -41,9 +37,10 @@ ifeq ($(CONFIG_VP8_DECODER),yes)
include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8dx.mk
CODEC_SRCS-yes += $(addprefix $(VP8_PREFIX),$(call enabled,VP8_DX_SRCS))
CODEC_EXPORTS-yes += $(addprefix $(VP8_PREFIX),$(VP8_DX_EXPORTS))
CODEC_SRCS-yes += $(VP8_PREFIX)vp8dx.mk
INSTALL_MAPS += include/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/%
CODEC_DOC_SRCS += vp8/vp8.h vp8/vp8dx.h
CODEC_SRCS-yes += $(VP8_PREFIX)vp8dx.mk vpx/vp8.h vpx/vp8dx.h
INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8dx.h
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP8_PREFIX)/%
CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8dx.h
CODEC_DOC_SECTIONS += vp8 vp8_decoder
endif
......@@ -66,8 +63,8 @@ endif
# The following pairs define a mapping of locations in the distribution
# tree to locations in the source/build trees.
INSTALL_MAPS += include/% $(SRC_PATH_BARE)/vpx_codec/%
INSTALL_MAPS += include/% $(SRC_PATH_BARE)/vpx_ports/%
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx/%
INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx_ports/%
INSTALL_MAPS += lib/% %
INSTALL_MAPS += src/% $(SRC_PATH_BARE)/%
ifeq ($(CONFIG_MSVS),yes)
......@@ -83,7 +80,7 @@ endif
$(eval $(if $(filter universal%,$(TOOLCHAIN)),LIPO_LIBVPX,BUILD_LIBVPX):=yes)
CODEC_SRCS-$(BUILD_LIBVPX) += build/make/version.sh
CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/vpx_integer.h
CODEC_SRCS-$(BUILD_LIBVPX) += vpx/vpx_integer.h
CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/vpx_timer.h
CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/mem.h
CODEC_SRCS-$(BUILD_LIBVPX) += $(BUILD_PFX)vpx_config.c
......@@ -94,16 +91,16 @@ CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/x86.h
CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/x86_abi_support.asm
endif
CODEC_SRCS-$(ARCH_ARM) += $(BUILD_PFX)vpx_config.asm
CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx_codec/exports
INSTALL-LIBS-yes += include/vpx_codec.h
INSTALL-LIBS-yes += include/vpx_image.h
INSTALL-LIBS-yes += include/vpx_integer.h
INSTALL-LIBS-yes += include/vpx_codec_impl_top.h
INSTALL-LIBS-yes += include/vpx_codec_impl_bottom.h
INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx_decoder.h
INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx_decoder_compat.h
INSTALL-LIBS-$(CONFIG_ENCODERS) += include/vpx_encoder.h
CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports
INSTALL-LIBS-yes += include/vpx/vpx_codec.h
INSTALL-LIBS-yes += include/vpx/vpx_image.h
INSTALL-LIBS-yes += include/vpx/vpx_integer.h
INSTALL-LIBS-yes += include/vpx/vpx_codec_impl_top.h
INSTALL-LIBS-yes += include/vpx/vpx_codec_impl_bottom.h
INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx/vpx_decoder.h
INSTALL-LIBS-$(CONFIG_DECODERS) += include/vpx/vpx_decoder_compat.h
INSTALL-LIBS-$(CONFIG_ENCODERS) += include/vpx/vpx_encoder.h
ifeq ($(CONFIG_EXTERNAL_BUILD),yes)
ifeq ($(CONFIG_MSVS),yes)
INSTALL-LIBS-yes += $(foreach p,$(VS_PLATFORMS),lib/$(p)/$(CODEC_LIB).lib)
......@@ -211,10 +208,10 @@ $(filter %.asm.o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm
$(shell $(SRC_PATH_BARE)/build/make/version.sh "$(SRC_PATH_BARE)" $(BUILD_PFX)vpx_version.h)
CLEAN-OBJS += $(BUILD_PFX)vpx_version.h
CODEC_DOC_SRCS += vpx_codec/vpx_codec.h \
vpx_codec/vpx_decoder.h \
vpx_codec/vpx_encoder.h \
vpx_codec/vpx_image.h
CODEC_DOC_SRCS += vpx/vpx_codec.h \
vpx/vpx_decoder.h \
vpx/vpx_encoder.h \
vpx/vpx_image.h
CLEAN-OBJS += libs.doxy
DOCS-yes += libs.doxy
......
......@@ -29,14 +29,7 @@ without express or implied warranty of any kind.
These notices must be retained in any copies of any part of this
documentation and/or software.
*/
#ifndef HAVE_VPX_PORTS
#define HAVE_VPX_PORTS 0
#endif
#if HAVE_VPX_PORTS
#include "vpx_ports/vpx_integer.h"
#else
#include "vpx_integer.h"
#endif
#include "vpx/vpx_integer.h"
/* MD5 context. */
typedef struct
......
......@@ -16,7 +16,7 @@ extern "C"
{
#endif
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "vpx_scale/yv12config.h"
#include "type_aliases.h"
#include "ppflags.h"
......
......@@ -11,8 +11,8 @@
#ifndef __INC_VP8C_INT_H
#define __INC_VP8C_INT_H
#include "vpx_ports/config.h"
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx_config.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "loopfilter.h"
#include "entropymv.h"
#include "entropy.h"
......
......@@ -12,7 +12,7 @@
#define DBOOLHUFF_H
#include "vpx_ports/config.h"
#include "vpx_ports/mem.h"
#include "vpx_ports/vpx_integer.h"
#include "vpx/vpx_integer.h"
/* Size of the bool decoder backing storage
*
......
......@@ -25,7 +25,7 @@
#include "entropy.h"
#include "threading.h"
#include "vpx_ports/mem.h"
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "mcomp.h"
#define INTRARDOPT
......
......@@ -8,11 +8,11 @@
*/
#include "vpx_codec/vpx_codec.h"
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx/vpx_codec.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "vpx_version.h"
#include "onyx_int.h"
#include "vp8e.h"
#include "vpx/vp8e.h"
#include "onyx.h"
#include <stdlib.h>
#include <string.h>
......
......@@ -10,9 +10,9 @@
#include <stdlib.h>
#include <string.h>
#include "vpx_codec/vpx_decoder.h"
#include "vp8dx.h"
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx/vpx_decoder.h"
#include "vpx/vp8dx.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "vpx_version.h"
#include "onyxd.h"
#include "onyxd_int.h"
......
......@@ -18,7 +18,7 @@ ifeq ($(ARCH_ARM),yes)
include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8cx_arm.mk
endif
VP8_CX_SRCS-yes += vp8cx.h vp8e.h vp8_cx_iface.c
VP8_CX_SRCS-yes += vp8_cx_iface.c
# encoder
#INCLUDES += algo/vpx_common/vpx_mem/include
......@@ -100,5 +100,3 @@ VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/quantize_mmx.asm
VP8_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/encodeopt.asm
VP8_CX_SRCS-yes := $(filter-out $(VP8_CX_SRCS_REMOVE-yes),$(VP8_CX_SRCS-yes))
INSTALL-LIBS-yes += include/vp8.h include/vp8e.h include/vp8cx.h
......@@ -18,7 +18,7 @@ ifeq ($(ARCH_ARM),yes)
include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8dx_arm.mk
endif
VP8_DX_SRCS-yes += vp8dx.h vp8_dx_iface.c
VP8_DX_SRCS-yes += vp8_dx_iface.c
CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)decoder
......@@ -69,8 +69,6 @@ VP8_DX_SRCS-yes += decoder/threading.c
VP8_DX_SRCS-yes := $(filter-out $(VP8_DX_SRCS_REMOVE-yes),$(VP8_DX_SRCS-yes))
INSTALL-LIBS-yes += include/vp8.h include/vp8dx.h
VP8_DX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += decoder/x86/dequantize_x86.h
VP8_DX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += decoder/x86/x86_dsystemdependent.c
VP8_DX_SRCS-$(HAVE_MMX) += decoder/x86/dequantize_mmx.asm
......@@ -14,8 +14,8 @@
*/
#include <stdlib.h>
#include <string.h>
#include "vpx_ports/vpx_integer.h"
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx/vpx_integer.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "vpx_version.h"
#define SAVE_STATUS(ctx,var) (ctx?(ctx->err = var):var)
......
......@@ -13,7 +13,7 @@
*
*/
#include <stdlib.h>
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx/internal/vpx_codec_internal.h"
#define SAVE_STATUS(ctx,var) (ctx?(ctx->err = var):var)
......
......@@ -14,8 +14,8 @@
*/
#include <stdlib.h>
#include <string.h>
#include "vpx_codec/vpx_decoder.h"
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx/vpx_decoder.h"
#include "vpx/internal/vpx_codec_internal.h"
#define SAVE_STATUS(ctx,var) (ctx?(ctx->err = var):var)
......
......@@ -14,7 +14,7 @@
*/
#include <limits.h>
#include <string.h>
#include "vpx_codec/internal/vpx_codec_internal.h"
#include "vpx/internal/vpx_codec_internal.h"
#define SAVE_STATUS(ctx,var) (ctx?(ctx->err = var):var)
......
......@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <string.h>
#include "vpx_codec/vpx_image.h"
#include "vpx/vpx_image.h"
static vpx_image_t *img_alloc_helper(vpx_image_t *img,
vpx_img_fmt_t fmt,
......
......@@ -29,7 +29,7 @@
*/
#ifndef VP8_H
#define VP8_H
#include "vpx_codec_impl_top.h"
#include "vpx/vpx_codec_impl_top.h"
/*!\brief Control functions
*
......@@ -112,5 +112,5 @@ VPX_CTRL_USE_TYPE(VP8_SET_POSTPROC, vp8_postproc_cfg_t *)
DECLSPEC_DEPRECATED extern vpx_codec_iface_t vpx_codec_vp8_algo DEPRECATED;
#endif
#include "vpx_codec_impl_bottom.h"
#include "vpx/vpx_codec_impl_bottom.h"
#endif
......@@ -21,7 +21,7 @@
*/
#ifndef VP8CX_H
#define VP8CX_H
#include "vpx_codec_impl_top.h"
#include "vpx/vpx_codec_impl_top.h"
/*!\brief Algorithm interface for VP8
*
......@@ -257,5 +257,5 @@ VPX_CTRL_USE_TYPE(VP8E_GET_LAST_QUANTIZER, int *)
VPX_CTRL_USE_TYPE(VP8E_GET_LAST_QUANTIZER_64, int *)
/*! @} - end defgroup vp8_encoder */
#include "vpx_codec_impl_bottom.h"
#include "vpx/vpx_codec_impl_bottom.h"
#endif
......@@ -21,7 +21,7 @@
*/
#ifndef VP8DX_H
#define VP8DX_H
#include "vpx_codec_impl_top.h"
#include "vpx/vpx_codec_impl_top.h"
/*!\brief Algorithm interface for VP8
*
......@@ -37,5 +37,5 @@ extern vpx_codec_iface_t vpx_codec_vp8_dx_algo;
/*! @} - end defgroup vp8_decoder */
#include "vpx_codec_impl_bottom.h"
#include "vpx/vpx_codec_impl_bottom.h"
#endif
......@@ -13,7 +13,7 @@
*/
#ifndef VP8E_H
#define VP8E_H
#include "vpx_codec_impl_top.h"
#include "vpx/vpx_codec_impl_top.h"
#if defined(VPX_CODEC_DISABLE_COMPAT) && VPX_CODEC_DISABLE_COMPAT
#error "Backwards compatibility disabled: don't include vp8e.h"
......@@ -58,5 +58,5 @@ VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_FRAMETYPE, int)
* #VPX_DL_BEST_QUALITY constants to that parameter instead.
*/
VPX_CTRL_USE_TYPE_DEPRECATED(VP8E_SET_ENCODING_MODE, vp8e_encoding_mode)
#include "vpx_codec_impl_bottom.h"
#include "vpx/vpx_codec_impl_bottom.h"
#endif
......@@ -11,7 +11,7 @@
#ifndef VPX_PORTS_MEM_H
#define VPX_PORTS_MEM_H
#include "vpx_config.h"
#include "vpx_integer.h"
#include "vpx/vpx_integer.h"
#if defined(__GNUC__) && __GNUC__
#define DECLARE_ALIGNED(n,typ,val) typ val __attribute__ ((aligned (n)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment