From 3a3b0be09a11a9db7d2c1322cfbb8bd9b670a079 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Wed, 1 Jul 2015 14:58:13 -0700 Subject: [PATCH] Move multi-threading module functions into vpx_thread folder This commit moves the primitive multi-threading files from vp9 folder to vpx_thread, which will be accessible by all vpx codec. Change-Id: Ib51e66e9c69801c10631fab56d35a0c0aaed5883 --- libs.mk | 3 +++ test/vp9_thread_test.cc | 2 +- vp9/common/vp9_onyxc_int.h | 2 +- vp9/common/vp9_thread_common.h | 2 +- vp9/decoder/vp9_decodeframe.c | 2 +- vp9/decoder/vp9_decoder.c | 2 +- vp9/decoder/vp9_decoder.h | 3 ++- vp9/decoder/vp9_dthread.h | 2 +- vp9/encoder/vp9_encoder.h | 2 +- vp9/vp9_common.mk | 2 -- vp9/vp9_dx_iface.c | 2 +- vp9/common/vp9_thread.c => vpx_thread/vpx_thread.c | 2 +- vp9/common/vp9_thread.h => vpx_thread/vpx_thread.h | 0 vpx_thread/vpx_thread.mk | 13 +++++++++++++ 14 files changed, 27 insertions(+), 12 deletions(-) rename vp9/common/vp9_thread.c => vpx_thread/vpx_thread.c (99%) rename vp9/common/vp9_thread.h => vpx_thread/vpx_thread.h (100%) create mode 100644 vpx_thread/vpx_thread.mk diff --git a/libs.mk b/libs.mk index 6215990c9..165002895 100644 --- a/libs.mk +++ b/libs.mk @@ -50,6 +50,9 @@ CODEC_SRCS-yes += $(addprefix vpx_ports/,$(call enabled,PORTS_SRCS)) include $(SRC_PATH_BARE)/vpx_dsp/vpx_dsp.mk CODEC_SRCS-yes += $(addprefix vpx_dsp/,$(call enabled,DSP_SRCS)) +include $(SRC_PATH_BARE)/vpx_thread/vpx_thread.mk +CODEC_SRCS-yes += $(addprefix vpx_thread/,$(call enabled,THREAD_SRCS)) + ifneq ($(CONFIG_VP8_ENCODER)$(CONFIG_VP8_DECODER),) VP8_PREFIX=vp8/ include $(SRC_PATH_BARE)/$(VP8_PREFIX)vp8_common.mk diff --git a/test/vp9_thread_test.cc b/test/vp9_thread_test.cc index 902a6fc35..e08e44ec9 100644 --- a/test/vp9_thread_test.cc +++ b/test/vp9_thread_test.cc @@ -18,7 +18,7 @@ #if CONFIG_WEBM_IO #include "test/webm_video_source.h" #endif -#include "vp9/common/vp9_thread.h" +#include "vpx_thread/vpx_thread.h" namespace { diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 1811d76df..c5e2b3ab4 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -13,6 +13,7 @@ #include "./vpx_config.h" #include "vpx/internal/vpx_codec_internal.h" +#include "vpx_thread/vpx_thread.h" #include "./vp9_rtcd.h" #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_loopfilter.h" @@ -21,7 +22,6 @@ #include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_frame_buffers.h" #include "vp9/common/vp9_quant_common.h" -#include "vp9/common/vp9_thread.h" #include "vp9/common/vp9_tile_common.h" #if CONFIG_VP9_POSTPROC diff --git a/vp9/common/vp9_thread_common.h b/vp9/common/vp9_thread_common.h index 3b3a6996a..f8221a851 100644 --- a/vp9/common/vp9_thread_common.h +++ b/vp9/common/vp9_thread_common.h @@ -12,7 +12,7 @@ #define VP9_COMMON_VP9_LOOPFILTER_THREAD_H_ #include "./vpx_config.h" #include "vp9/common/vp9_loopfilter.h" -#include "vp9/common/vp9_thread.h" +#include "vpx_thread/vpx_thread.h" struct VP9Common; struct FRAME_COUNTS; diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 659b84848..4302d825f 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -18,6 +18,7 @@ #include "vpx_ports/mem.h" #include "vpx_ports/mem_ops.h" #include "vpx_scale/vpx_scale.h" +#include "vpx_thread/vpx_thread.h" #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_common.h" @@ -30,7 +31,6 @@ #include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_seg_common.h" -#include "vp9/common/vp9_thread.h" #include "vp9/common/vp9_tile_common.h" #include "vp9/decoder/vp9_decodeframe.h" diff --git a/vp9/decoder/vp9_decoder.c b/vp9/decoder/vp9_decoder.c index 7991a39e6..5f5e201d8 100644 --- a/vp9/decoder/vp9_decoder.c +++ b/vp9/decoder/vp9_decoder.c @@ -20,6 +20,7 @@ #include "vpx_ports/vpx_once.h" #include "vpx_ports/vpx_timer.h" #include "vpx_scale/vpx_scale.h" +#include "vpx_thread/vpx_thread.h" #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_loopfilter.h" @@ -30,7 +31,6 @@ #include "vp9/common/vp9_quant_common.h" #include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_systemdependent.h" -#include "vp9/common/vp9_thread.h" #include "vp9/decoder/vp9_decodeframe.h" #include "vp9/decoder/vp9_decoder.h" diff --git a/vp9/decoder/vp9_decoder.h b/vp9/decoder/vp9_decoder.h index c19f0ac3b..8a6590899 100644 --- a/vp9/decoder/vp9_decoder.h +++ b/vp9/decoder/vp9_decoder.h @@ -15,10 +15,11 @@ #include "vpx/vpx_codec.h" #include "vpx_scale/yv12config.h" +#include "vpx_thread/vpx_thread.h" + #include "vp9/common/vp9_thread_common.h" #include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_ppflags.h" -#include "vp9/common/vp9_thread.h" #include "vp9/decoder/vp9_dthread.h" #include "vp9/decoder/vp9_reader.h" diff --git a/vp9/decoder/vp9_dthread.h b/vp9/decoder/vp9_dthread.h index 979cb3d8b..80445816e 100644 --- a/vp9/decoder/vp9_dthread.h +++ b/vp9/decoder/vp9_dthread.h @@ -12,7 +12,7 @@ #define VP9_DECODER_VP9_DTHREAD_H_ #include "./vpx_config.h" -#include "vp9/common/vp9_thread.h" +#include "vpx_thread/vpx_thread.h" #include "vpx/internal/vpx_codec_internal.h" struct VP9Common; diff --git a/vp9/encoder/vp9_encoder.h b/vp9/encoder/vp9_encoder.h index 2b0da103f..34075bee7 100644 --- a/vp9/encoder/vp9_encoder.h +++ b/vp9/encoder/vp9_encoder.h @@ -16,13 +16,13 @@ #include "./vpx_config.h" #include "vpx/internal/vpx_codec_internal.h" #include "vpx/vp8cx.h" +#include "vpx_thread/vpx_thread.h" #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_ppflags.h" #include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_thread_common.h" #include "vp9/common/vp9_onyxc_int.h" -#include "vp9/common/vp9_thread.h" #include "vp9/encoder/vp9_aq_cyclicrefresh.h" #include "vp9/encoder/vp9_context_tree.h" diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index 6f091eefb..fd611bf9a 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -51,8 +51,6 @@ VP9_COMMON_SRCS-yes += common/vp9_seg_common.h VP9_COMMON_SRCS-yes += common/vp9_seg_common.c VP9_COMMON_SRCS-yes += common/vp9_systemdependent.h VP9_COMMON_SRCS-yes += common/vp9_textblit.h -VP9_COMMON_SRCS-yes += common/vp9_thread.h -VP9_COMMON_SRCS-yes += common/vp9_thread.c VP9_COMMON_SRCS-yes += common/vp9_tile_common.h VP9_COMMON_SRCS-yes += common/vp9_tile_common.c VP9_COMMON_SRCS-yes += common/vp9_loopfilter.c diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 4080d64c1..0af944312 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -17,10 +17,10 @@ #include "vpx/internal/vpx_codec_internal.h" #include "vpx/vp8dx.h" #include "vpx/vpx_decoder.h" +#include "vpx_thread/vpx_thread.h" #include "vp9/common/vp9_alloccommon.h" #include "vp9/common/vp9_frame_buffers.h" -#include "vp9/common/vp9_thread.h" #include "vp9/decoder/vp9_decoder.h" #include "vp9/decoder/vp9_decodeframe.h" diff --git a/vp9/common/vp9_thread.c b/vpx_thread/vpx_thread.c similarity index 99% rename from vp9/common/vp9_thread.c rename to vpx_thread/vpx_thread.c index 1c6aec032..c8b4f601b 100644 --- a/vp9/common/vp9_thread.c +++ b/vpx_thread/vpx_thread.c @@ -15,7 +15,7 @@ #include #include // for memset() -#include "./vp9_thread.h" +#include "./vpx_thread.h" #include "vpx_mem/vpx_mem.h" #if CONFIG_MULTITHREAD diff --git a/vp9/common/vp9_thread.h b/vpx_thread/vpx_thread.h similarity index 100% rename from vp9/common/vp9_thread.h rename to vpx_thread/vpx_thread.h diff --git a/vpx_thread/vpx_thread.mk b/vpx_thread/vpx_thread.mk new file mode 100644 index 000000000..0a4a3648a --- /dev/null +++ b/vpx_thread/vpx_thread.mk @@ -0,0 +1,13 @@ +## +## Copyright (c) 2015 The WebM project authors. All Rights Reserved. +## +## Use of this source code is governed by a BSD-style license +## that can be found in the LICENSE file in the root of the source +## tree. An additional intellectual property rights grant can be found +## in the file PATENTS. All contributing project authors may +## be found in the AUTHORS file in the root of the source tree. +## + +THREAD_SRCS-yes += vpx_thread.mk +THREAD_SRCS-yes += vpx_thread.c +THREAD_SRCS-yes += vpx_thread.h