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
1ac05402
Commit
1ac05402
authored
Jul 01, 2013
by
Dmitry Kovalev
Browse files
Removing vp9_mbpitch.c, moving vp9_setup_block_dptrs to vp9_block.h.
Change-Id: Ia547a5dd7650b771fd00edd673ab9f920270731c
parent
ba3b2604
Changes
6
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_blockd.h
View file @
1ac05402
...
...
@@ -509,8 +509,21 @@ static INLINE TX_TYPE get_tx_type_16x16(const MACROBLOCKD *xd) {
return
mode2txfm_map
[
xd
->
mode_info_context
->
mbmi
.
mode
];
}
void
vp9_setup_block_dptrs
(
MACROBLOCKD
*
xd
,
int
subsampling_x
,
int
subsampling_y
);
static
void
setup_block_dptrs
(
MACROBLOCKD
*
xd
,
int
ss_x
,
int
ss_y
)
{
int
i
;
for
(
i
=
0
;
i
<
MAX_MB_PLANE
;
i
++
)
{
xd
->
plane
[
i
].
plane_type
=
i
?
PLANE_TYPE_UV
:
PLANE_TYPE_Y_WITH_DC
;
xd
->
plane
[
i
].
subsampling_x
=
i
?
ss_x
:
0
;
xd
->
plane
[
i
].
subsampling_y
=
i
?
ss_y
:
0
;
}
#if CONFIG_ALPHA
// TODO(jkoleszar): Using the Y w/h for now
mb
->
plane
[
3
].
subsampling_x
=
0
;
mb
->
plane
[
3
].
subsampling_y
=
0
;
#endif
}
static
TX_SIZE
get_uv_tx_size
(
const
MB_MODE_INFO
*
mbmi
)
{
const
TX_SIZE
size
=
mbmi
->
txfm_size
;
...
...
vp9/common/vp9_mbpitch.c
deleted
100644 → 0
View file @
ba3b2604
/*
* Copyright (c) 2010 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.
*/
#include
"vp9/common/vp9_blockd.h"
void
vp9_setup_block_dptrs
(
MACROBLOCKD
*
mb
,
int
subsampling_x
,
int
subsampling_y
)
{
int
i
;
for
(
i
=
0
;
i
<
MAX_MB_PLANE
;
i
++
)
{
mb
->
plane
[
i
].
plane_type
=
i
?
PLANE_TYPE_UV
:
PLANE_TYPE_Y_WITH_DC
;
mb
->
plane
[
i
].
subsampling_x
=
i
?
subsampling_x
:
0
;
mb
->
plane
[
i
].
subsampling_y
=
i
?
subsampling_y
:
0
;
}
#if CONFIG_ALPHA
// TODO(jkoleszar): Using the Y w/h for now
mb
->
plane
[
3
].
subsampling_x
=
0
;
mb
->
plane
[
3
].
subsampling_y
=
0
;
#endif
}
vp9/decoder/vp9_decodframe.c
View file @
1ac05402
...
...
@@ -1009,7 +1009,7 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
CHECK_MEM_ERROR
(
pc
,
pc
->
last_frame_seg_map
,
vpx_calloc
((
pc
->
mi_rows
*
pc
->
mi_cols
),
1
));
vp9_
setup_block_dptrs
(
xd
,
pc
->
subsampling_x
,
pc
->
subsampling_y
);
setup_block_dptrs
(
xd
,
pc
->
subsampling_x
,
pc
->
subsampling_y
);
// clear out the coeff buffer
for
(
i
=
0
;
i
<
MAX_MB_PLANE
;
++
i
)
...
...
vp9/encoder/vp9_encodeframe.c
View file @
1ac05402
...
...
@@ -1528,7 +1528,7 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) {
0
,
0
,
NULL
,
NULL
);
setup_dst_planes
(
xd
,
&
cm
->
yv12_fb
[
cm
->
new_fb_idx
],
0
,
0
);
vp9_
setup_block_dptrs
(
&
x
->
e_mbd
,
cm
->
subsampling_x
,
cm
->
subsampling_y
);
setup_block_dptrs
(
&
x
->
e_mbd
,
cm
->
subsampling_x
,
cm
->
subsampling_y
);
xd
->
mode_info_context
->
mbmi
.
mode
=
DC_PRED
;
xd
->
mode_info_context
->
mbmi
.
uv_mode
=
DC_PRED
;
...
...
vp9/encoder/vp9_firstpass.c
View file @
1ac05402
...
...
@@ -521,7 +521,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
xd
->
mode_info_context
=
cm
->
mi
;
vp9_
setup_block_dptrs
(
&
x
->
e_mbd
,
cm
->
subsampling_x
,
cm
->
subsampling_y
);
setup_block_dptrs
(
&
x
->
e_mbd
,
cm
->
subsampling_x
,
cm
->
subsampling_y
);
vp9_frame_init_quantizer
(
cpi
);
...
...
vp9/vp9_common.mk
View file @
1ac05402
...
...
@@ -59,7 +59,6 @@ VP9_COMMON_SRCS-yes += common/vp9_tile_common.c
VP9_COMMON_SRCS-yes
+=
common/vp9_treecoder.h
VP9_COMMON_SRCS-yes
+=
common/vp9_loopfilter.c
VP9_COMMON_SRCS-yes
+=
common/vp9_loopfilter_filters.c
VP9_COMMON_SRCS-yes
+=
common/vp9_mbpitch.c
VP9_COMMON_SRCS-yes
+=
common/vp9_modecontext.c
VP9_COMMON_SRCS-yes
+=
common/vp9_mvref_common.c
VP9_COMMON_SRCS-yes
+=
common/vp9_mvref_common.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