Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
66cf8098
Commit
66cf8098
authored
Jul 02, 2015
by
Jingning Han
Committed by
Gerrit Code Review
Jul 02, 2015
Browse files
Merge "Move multi-threading module functions into vpx_thread folder"
parents
e7578084
3a3b0be0
Changes
14
Hide whitespace changes
Inline
Side-by-side
libs.mk
View file @
66cf8098
...
...
@@ -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
...
...
test/vp9_thread_test.cc
View file @
66cf8098
...
...
@@ -18,7 +18,7 @@
#if CONFIG_WEBM_IO
#include
"test/webm_video_source.h"
#endif
#include
"vp
9/common
/vp
9
_thread.h"
#include
"vp
x_thread
/vp
x
_thread.h"
namespace
{
...
...
vp9/common/vp9_onyxc_int.h
View file @
66cf8098
...
...
@@ -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
...
...
vp9/common/vp9_thread_common.h
View file @
66cf8098
...
...
@@ -12,7 +12,7 @@
#define VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
#include
"./vpx_config.h"
#include
"vp9/common/vp9_loopfilter.h"
#include
"vp
9/common
/vp
9
_thread.h"
#include
"vp
x_thread
/vp
x
_thread.h"
struct
VP9Common
;
struct
FRAME_COUNTS
;
...
...
vp9/decoder/vp9_decodeframe.c
View file @
66cf8098
...
...
@@ -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"
...
...
vp9/decoder/vp9_decoder.c
View file @
66cf8098
...
...
@@ -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"
...
...
vp9/decoder/vp9_decoder.h
View file @
66cf8098
...
...
@@ -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"
...
...
vp9/decoder/vp9_dthread.h
View file @
66cf8098
...
...
@@ -12,7 +12,7 @@
#define VP9_DECODER_VP9_DTHREAD_H_
#include
"./vpx_config.h"
#include
"vp
9/common
/vp
9
_thread.h"
#include
"vp
x_thread
/vp
x
_thread.h"
#include
"vpx/internal/vpx_codec_internal.h"
struct
VP9Common
;
...
...
vp9/encoder/vp9_encoder.h
View file @
66cf8098
...
...
@@ -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"
...
...
vp9/vp9_common.mk
View file @
66cf8098
...
...
@@ -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
...
...
vp9/vp9_dx_iface.c
View file @
66cf8098
...
...
@@ -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"
...
...
vp
9/common
/vp
9
_thread.c
→
vp
x_thread
/vp
x
_thread.c
View file @
66cf8098
...
...
@@ -15,7 +15,7 @@
#include
<assert.h>
#include
<string.h>
// for memset()
#include
"./vp
9
_thread.h"
#include
"./vp
x
_thread.h"
#include
"vpx_mem/vpx_mem.h"
#if CONFIG_MULTITHREAD
...
...
vp
9/common
/vp
9
_thread.h
→
vp
x_thread
/vp
x
_thread.h
View file @
66cf8098
File moved
vpx_thread/vpx_thread.mk
0 → 100644
View file @
66cf8098
##
## 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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment