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
815734e5
Commit
815734e5
authored
Mar 21, 2013
by
Paul Wilkins
Browse files
Minor code clean up
Change-Id: Ifa864e0acb253b238b03cdeed0fe5d6ee30a45d8
parent
1c75e77b
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
815734e5
...
...
@@ -2090,9 +2090,11 @@ static void encode_macroblock(VP9_COMP *cpi, TOKENEXTRA **t,
else
cpi
->
zbin_mode_boost
=
LF_ZEROMV_ZBIN_BOOST
;
}
else
if
(
mbmi
->
mode
==
SPLITMV
)
cpi
->
zbin_mode_boost
=
0
;
cpi
->
zbin_mode_boost
=
SPLIT_MV_ZBIN_BOOST
;
else
cpi
->
zbin_mode_boost
=
MV_ZBIN_BOOST
;
}
else
{
cpi
->
zbin_mode_boost
=
INTRA_ZBIN_BOOST
;
}
}
...
...
@@ -2346,9 +2348,11 @@ static void encode_superblock32(VP9_COMP *cpi, TOKENEXTRA **t,
else
cpi
->
zbin_mode_boost
=
LF_ZEROMV_ZBIN_BOOST
;
}
else
if
(
xd
->
mode_info_context
->
mbmi
.
mode
==
SPLITMV
)
cpi
->
zbin_mode_boost
=
0
;
cpi
->
zbin_mode_boost
=
SPLIT_MV_ZBIN_BOOST
;
else
cpi
->
zbin_mode_boost
=
MV_ZBIN_BOOST
;
}
else
{
cpi
->
zbin_mode_boost
=
INTRA_ZBIN_BOOST
;
}
}
...
...
@@ -2565,10 +2569,12 @@ static void encode_superblock64(VP9_COMP *cpi, TOKENEXTRA **t,
else
cpi
->
zbin_mode_boost
=
LF_ZEROMV_ZBIN_BOOST
;
}
else
if
(
xd
->
mode_info_context
->
mbmi
.
mode
==
SPLITMV
)
{
cpi
->
zbin_mode_boost
=
0
;
cpi
->
zbin_mode_boost
=
SPLIT_MV_ZBIN_BOOST
;
}
else
{
cpi
->
zbin_mode_boost
=
MV_ZBIN_BOOST
;
}
}
else
{
cpi
->
zbin_mode_boost
=
INTRA_ZBIN_BOOST
;
}
}
...
...
vp9/encoder/vp9_onyx_if.c
View file @
815734e5
...
...
@@ -342,9 +342,7 @@ static void dealloc_compressor_data(VP9_COMP *cpi) {
vp8_yv12_de_alloc_frame_buffer
(
&
cpi
->
last_frame_uf
);
vp8_yv12_de_alloc_frame_buffer
(
&
cpi
->
scaled_source
);
#if VP9_TEMPORAL_ALT_REF
vp8_yv12_de_alloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
);
#endif
vp9_lookahead_destroy
(
cpi
->
lookahead
);
vpx_free
(
cpi
->
tok
);
...
...
@@ -879,15 +877,11 @@ static void alloc_raw_frame_buffers(VP9_COMP *cpi) {
vpx_internal_error
(
&
cpi
->
common
.
error
,
VPX_CODEC_MEM_ERROR
,
"Failed to allocate lag buffers"
);
#if VP9_TEMPORAL_ALT_REF
if
(
vp8_yv12_alloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
,
cpi
->
oxcf
.
Width
,
cpi
->
oxcf
.
Height
,
VP9BORDERINPIXELS
))
vpx_internal_error
(
&
cpi
->
common
.
error
,
VPX_CODEC_MEM_ERROR
,
"Failed to allocate altref buffer"
);
#endif
}
static
int
alloc_partition_data
(
VP9_COMP
*
cpi
)
{
...
...
@@ -1146,16 +1140,12 @@ static void init_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
set_tile_limits
(
cpi
);
#if VP9_TEMPORAL_ALT_REF
{
int
i
;
cpi
->
fixed_divide
[
0
]
=
0
;
for
(
i
=
1
;
i
<
512
;
i
++
)
cpi
->
fixed_divide
[
i
]
=
0x80000
/
i
;
}
#endif
}
...
...
vp9/encoder/vp9_onyx_int.h
View file @
815734e5
...
...
@@ -42,10 +42,6 @@
#define MAX_LAG_BUFFERS 25
#define AF_THRESH 25
#define AF_THRESH2 100
#define ARF_DECAY_THRESH 12
#if CONFIG_COMP_INTERINTRA_PRED
#define MAX_MODES 54
#else
...
...
@@ -58,8 +54,8 @@
#define GF_ZEROMV_ZBIN_BOOST 12
#define LF_ZEROMV_ZBIN_BOOST 6
#define MV_ZBIN_BOOST 4
#define
VP9_TEMPORAL_ALT_REF 1
#define SPLIT_MV_ZBIN_BOOST 0
#define
INTRA_ZBIN_BOOST 0
typedef
struct
{
nmv_context
nmvc
;
...
...
@@ -625,11 +621,9 @@ typedef struct VP9_COMP {
double
est_max_qcorrection_factor
;
}
twopass
;
#if VP9_TEMPORAL_ALT_REF
YV12_BUFFER_CONFIG
alt_ref_buffer
;
YV12_BUFFER_CONFIG
*
frames
[
MAX_LAG_BUFFERS
];
int
fixed_divide
[
512
];
#endif
#if CONFIG_INTERNAL_STATS
int
count
;
...
...
vp9/encoder/vp9_temporal_filter.c
View file @
815734e5
...
...
@@ -32,9 +32,6 @@
#define ALT_REF_MC_ENABLED 1 // dis/enable MC in AltRef filtering
#define ALT_REF_SUBPEL_ENABLED 1 // dis/enable subpel in MC AltRef filtering
#if VP9_TEMPORAL_ALT_REF
static
void
temporal_filter_predictors_mb_c
(
MACROBLOCKD
*
xd
,
uint8_t
*
y_mb_ptr
,
uint8_t
*
u_mb_ptr
,
...
...
@@ -476,4 +473,3 @@ void vp9_temporal_filter_prepare(VP9_COMP *cpi, int distance) {
frames_to_blur_backward
,
strength
);
}
#endif
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