From 80d3923a78e0fa85194b58d327d619e63919fbd8 Mon Sep 17 00:00:00 2001
From: John Koleszar <jkoleszar@google.com>
Date: Fri, 13 Aug 2010 14:50:51 -0400
Subject: [PATCH] move segmentation_common to encoder
vp8_update_gf_useage_maps() is only used by the encoder. This patch
fixes the ability to build in decode-only or encode-only
configurations.
Change-Id: I3a5211428e539886ba998e09e8abd747ac55c9aa
---
vp8/encoder/encodeframe.c | 2 +-
vp8/encoder/onyx_if.c | 2 +-
vp8/{common/segmentation_common.c => encoder/segmentation.c} | 2 +-
vp8/{common/segmentation_common.h => encoder/segmentation.h} | 0
vp8/vp8_common.mk | 2 --
vp8/vp8cx.mk | 2 ++
6 files changed, 5 insertions(+), 5 deletions(-)
rename vp8/{common/segmentation_common.c => encoder/segmentation.c} (98%)
rename vp8/{common/segmentation_common.h => encoder/segmentation.h} (100%)
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index bddb55b494..0f9bf4a1d8 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -17,7 +17,7 @@
#include "extend.h"
#include "entropymode.h"
#include "quant_common.h"
-#include "segmentation_common.h"
+#include "segmentation.h"
#include "setupintrarecon.h"
#include "encodeintra.h"
#include "reconinter.h"
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index f768e60c73..17b33d79aa 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -21,7 +21,7 @@
#include "extend.h"
#include "ratectrl.h"
#include "quant_common.h"
-#include "segmentation_common.h"
+#include "segmentation.h"
#include "g_common.h"
#include "vpx_scale/yv12extend.h"
#include "postproc.h"
diff --git a/vp8/common/segmentation_common.c b/vp8/encoder/segmentation.c
similarity index 98%
rename from vp8/common/segmentation_common.c
rename to vp8/encoder/segmentation.c
index 16b96e9db9..bb78614c6d 100644
--- a/vp8/common/segmentation_common.c
+++ b/vp8/encoder/segmentation.c
@@ -9,7 +9,7 @@
*/
-#include "segmentation_common.h"
+#include "segmentation.h"
#include "vpx_mem/vpx_mem.h"
void vp8_update_gf_useage_maps(VP8_COMP *cpi, VP8_COMMON *cm, MACROBLOCK *x)
diff --git a/vp8/common/segmentation_common.h b/vp8/encoder/segmentation.h
similarity index 100%
rename from vp8/common/segmentation_common.h
rename to vp8/encoder/segmentation.h
diff --git a/vp8/vp8_common.mk b/vp8/vp8_common.mk
index a8a252a179..dea237377f 100644
--- a/vp8/vp8_common.mk
+++ b/vp8/vp8_common.mk
@@ -27,7 +27,6 @@ VP8_COMMON_SRCS-yes += common/onyxd.h
CFLAGS+=-I$(SRC_PATH_BARE)/$(VP8_PREFIX)common
-VP8_COMMON_SRCS-yes += common/segmentation_common.c
VP8_COMMON_SRCS-yes += common/alloccommon.c
VP8_COMMON_SRCS-yes += common/blockd.c
VP8_COMMON_SRCS-yes += common/coefupdateprobs.h
@@ -64,7 +63,6 @@ VP8_COMMON_SRCS-yes += common/recon.h
VP8_COMMON_SRCS-yes += common/reconinter.h
VP8_COMMON_SRCS-yes += common/reconintra.h
VP8_COMMON_SRCS-yes += common/reconintra4x4.h
-VP8_COMMON_SRCS-yes += common/segmentation_common.h
VP8_COMMON_SRCS-yes += common/setupintrarecon.h
VP8_COMMON_SRCS-yes += common/subpixel.h
VP8_COMMON_SRCS-yes += common/swapyv12buffer.h
diff --git a/vp8/vp8cx.mk b/vp8/vp8cx.mk
index c0a58ae29f..50eb297314 100644
--- a/vp8/vp8cx.mk
+++ b/vp8/vp8cx.mk
@@ -74,6 +74,8 @@ VP8_CX_SRCS-yes += encoder/quantize.c
VP8_CX_SRCS-yes += encoder/ratectrl.c
VP8_CX_SRCS-yes += encoder/rdopt.c
VP8_CX_SRCS-yes += encoder/sad_c.c
+VP8_CX_SRCS-yes += encoder/segmentation.c
+VP8_CX_SRCS-yes += encoder/segmentation.h
VP8_CX_SRCS-$(CONFIG_PSNR) += encoder/ssim.c
VP8_CX_SRCS-yes += encoder/tokenize.c
VP8_CX_SRCS-yes += encoder/treewriter.c
--
GitLab