Refactor: move svc example files to from vpx/ to examples/

svc_encodeframe.c and svc_context.h are only used by the example
encoder.

Change-Id: Idb41a5a9d6a229a0bc7d2bc8dbe6575a74efc54c

diff --git a/examples.mk b/examples.mk
index edd3b0affd7a0191faaafcab131e5bc514c5819d..1187f147ae5e07854076ca708cd6aa607939cfd7 100644 (file)
--- a/examples.mk
+++ b/examples.mk
@@ -118,6 +118,8 @@ vp9_spatial_svc_encoder.SRCS        += video_common.h
 vp9_spatial_svc_encoder.SRCS        += video_writer.h video_writer.c
 vp9_spatial_svc_encoder.SRCS        += vpx_ports/msvc.h
 vp9_spatial_svc_encoder.SRCS        += vpxstats.c vpxstats.h
+vp9_spatial_svc_encoder.SRCS        += examples/svc_encodeframe.c
+vp9_spatial_svc_encoder.SRCS        += examples/svc_context.h
 vp9_spatial_svc_encoder.GUID        = 4A38598D-627D-4505-9C7B-D4020C84100D
 vp9_spatial_svc_encoder.DESCRIPTION = VP9 Spatial SVC Encoder
 

diff --git a/vpx/svc_context.h b/examples/svc_context.h
similarity index 98%
rename from vpx/svc_context.h
rename to examples/svc_context.h
index 771db4f5fecfacef02cf013f4e0528048ff8d30e..74b4d5b50f81a54b15c2f315417746f488e44443 100644 (file)
--- a/vpx/svc_context.h
+++ b/examples/svc_context.h
@@ -16,8 +16,8 @@
 #ifndef VPX_SVC_CONTEXT_H_
 #define VPX_SVC_CONTEXT_H_
 
-#include "./vp8cx.h"
-#include "./vpx_encoder.h"
+#include "vpx/vp8cx.h"
+#include "vpx/vpx_encoder.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/vpx/src/svc_encodeframe.c b/examples/svc_encodeframe.c
similarity index 99%
rename from vpx/src/svc_encodeframe.c
rename to examples/svc_encodeframe.c
index 2bd8a0991669d00bdb26bf8e9019df5dccc6f664..0b3c90e22e0639e2423bdd59eccff8468d26db35 100644 (file)
--- a/vpx/src/svc_encodeframe.c
+++ b/examples/svc_encodeframe.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #define VPX_DISABLE_CTRL_TYPECHECKS 1
 #include "./vpx_config.h"
-#include "vpx/svc_context.h"
+#include "./svc_context.h"
 #include "vpx/vp8cx.h"
 #include "vpx/vpx_encoder.h"
 #include "vpx_mem/vpx_mem.h"

diff --git a/examples/vp9_spatial_svc_encoder.c b/examples/vp9_spatial_svc_encoder.c
index 266ba265630dd107a8d66d8bf792b231b2bd1a11..2ec1f870bb565f76b2d93dc6a794852891a31b53 100644 (file)
--- a/examples/vp9_spatial_svc_encoder.c
+++ b/examples/vp9_spatial_svc_encoder.c
@@ -25,7 +25,7 @@
 #include "../video_writer.h"
 
 #include "../vpx_ports/vpx_timer.h"
-#include "vpx/svc_context.h"
+#include "./svc_context.h"
 #include "vpx/vp8cx.h"
 #include "vpx/vpx_encoder.h"
 #include "../vpxstats.h"

diff --git a/libs.mk b/libs.mk
index 31eb98f1e556e724e9d46bab1aea9f1eb339349f..20aad0b4918a85b058c76eafd86644d7ab96fb23 100644 (file)
--- a/libs.mk
+++ b/libs.mk
@@ -88,7 +88,6 @@ ifeq ($(CONFIG_VP9_ENCODER),yes)
   CODEC_EXPORTS-yes += $(addprefix $(VP9_PREFIX),$(VP9_CX_EXPORTS))
   CODEC_SRCS-yes += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h
   INSTALL-LIBS-yes += include/vpx/vp8.h include/vpx/vp8cx.h
-  INSTALL-LIBS-yes += include/vpx/svc_context.h
   INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%
   CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h
   CODEC_DOC_SECTIONS += vp9 vp9_encoder

diff --git a/vpx/vpx_codec.mk b/vpx/vpx_codec.mk
index 7ddacd4e6ca4caabd9fa5c4f720587f002f18c5a..4ed77ad6d9dffcba0c5e5b3818d18f2dd1c19b9e 100644 (file)
--- a/vpx/vpx_codec.mk
+++ b/vpx/vpx_codec.mk
@@ -15,8 +15,6 @@ API_SRCS-$(CONFIG_VP8_ENCODER) += vp8.h
 API_SRCS-$(CONFIG_VP8_ENCODER) += vp8cx.h
 API_DOC_SRCS-$(CONFIG_VP8_ENCODER) += vp8.h
 API_DOC_SRCS-$(CONFIG_VP8_ENCODER) += vp8cx.h
-API_SRCS-$(CONFIG_VP9_ENCODER) += src/svc_encodeframe.c
-API_SRCS-$(CONFIG_VP9_ENCODER) += svc_context.h
 
 API_SRCS-$(CONFIG_VP8_DECODER) += vp8.h
 API_SRCS-$(CONFIG_VP8_DECODER) += vp8dx.h