Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
89af744b
Commit
89af744b
authored
Aug 14, 2015
by
Jingning Han
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change vp9_ prefix function names in vpx_scale to vpx_
Change-Id: Iac85902cbbb3e752801dc85de9a3c778e47304aa
parent
d04a0d77
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
100 additions
and
100 deletions
+100
-100
vp10/common/alloccommon.c
vp10/common/alloccommon.c
+3
-3
vp10/common/postproc.c
vp10/common/postproc.c
+2
-2
vp10/decoder/decodeframe.c
vp10/decoder/decodeframe.c
+2
-2
vp10/encoder/denoiser.c
vp10/encoder/denoiser.c
+4
-4
vp10/encoder/encoder.c
vp10/encoder/encoder.c
+21
-21
vp10/encoder/firstpass.c
vp10/encoder/firstpass.c
+1
-1
vp10/encoder/lookahead.c
vp10/encoder/lookahead.c
+4
-4
vp10/encoder/skin_detection.c
vp10/encoder/skin_detection.c
+3
-3
vp10/encoder/svc_layercontext.c
vp10/encoder/svc_layercontext.c
+1
-1
vp10/encoder/temporal_filter.c
vp10/encoder/temporal_filter.c
+1
-1
vp9/common/vp9_alloccommon.c
vp9/common/vp9_alloccommon.c
+3
-3
vp9/common/vp9_postproc.c
vp9/common/vp9_postproc.c
+2
-2
vp9/decoder/vp9_decodeframe.c
vp9/decoder/vp9_decodeframe.c
+2
-2
vp9/encoder/vp9_denoiser.c
vp9/encoder/vp9_denoiser.c
+4
-4
vp9/encoder/vp9_encoder.c
vp9/encoder/vp9_encoder.c
+21
-21
vp9/encoder/vp9_firstpass.c
vp9/encoder/vp9_firstpass.c
+1
-1
vp9/encoder/vp9_lookahead.c
vp9/encoder/vp9_lookahead.c
+4
-4
vp9/encoder/vp9_skin_detection.c
vp9/encoder/vp9_skin_detection.c
+3
-3
vp9/encoder/vp9_svc_layercontext.c
vp9/encoder/vp9_svc_layercontext.c
+1
-1
vp9/encoder/vp9_temporal_filter.c
vp9/encoder/vp9_temporal_filter.c
+1
-1
vpx_scale/generic/yv12config.c
vpx_scale/generic/yv12config.c
+5
-5
vpx_scale/generic/yv12extend.c
vpx_scale/generic/yv12extend.c
+2
-2
vpx_scale/mips/dspr2/yv12extend_dspr2.c
vpx_scale/mips/dspr2/yv12extend_dspr2.c
+2
-2
vpx_scale/vpx_scale_rtcd.pl
vpx_scale/vpx_scale_rtcd.pl
+4
-4
vpx_scale/yv12config.h
vpx_scale/yv12config.h
+3
-3
No files found.
vp10/common/alloccommon.c
View file @
89af744b
...
...
@@ -77,14 +77,14 @@ void vp10_free_ref_frame_buffers(BufferPool *pool) {
}
vpx_free
(
pool
->
frame_bufs
[
i
].
mvs
);
pool
->
frame_bufs
[
i
].
mvs
=
NULL
;
vp
9
_free_frame_buffer
(
&
pool
->
frame_bufs
[
i
].
buf
);
vp
x
_free_frame_buffer
(
&
pool
->
frame_bufs
[
i
].
buf
);
}
}
void
vp10_free_postproc_buffers
(
VP10_COMMON
*
cm
)
{
#if CONFIG_VP9_POSTPROC
vp
9
_free_frame_buffer
(
&
cm
->
post_proc_buffer
);
vp
9
_free_frame_buffer
(
&
cm
->
post_proc_buffer_int
);
vp
x
_free_frame_buffer
(
&
cm
->
post_proc_buffer
);
vp
x
_free_frame_buffer
(
&
cm
->
post_proc_buffer_int
);
#else
(
void
)
cm
;
#endif
...
...
vp10/common/postproc.c
View file @
89af744b
...
...
@@ -659,7 +659,7 @@ int vp10_post_proc_frame(struct VP10Common *cm,
const
int
width
=
ALIGN_POWER_OF_TWO
(
cm
->
width
,
4
);
const
int
height
=
ALIGN_POWER_OF_TWO
(
cm
->
height
,
4
);
if
(
vp
9
_alloc_frame_buffer
(
&
cm
->
post_proc_buffer_int
,
width
,
height
,
if
(
vp
x
_alloc_frame_buffer
(
&
cm
->
post_proc_buffer_int
,
width
,
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
cm
->
use_highbitdepth
,
...
...
@@ -677,7 +677,7 @@ int vp10_post_proc_frame(struct VP10Common *cm,
}
}
if
(
vp
9
_realloc_frame_buffer
(
&
cm
->
post_proc_buffer
,
cm
->
width
,
cm
->
height
,
if
(
vp
x
_realloc_frame_buffer
(
&
cm
->
post_proc_buffer
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
cm
->
use_highbitdepth
,
...
...
vp10/decoder/decodeframe.c
View file @
89af744b
...
...
@@ -1236,7 +1236,7 @@ static void setup_frame_size(VP10_COMMON *cm, struct vpx_read_bit_buffer *rb) {
setup_display_size
(
cm
,
rb
);
lock_buffer_pool
(
pool
);
if
(
vp
9
_realloc_frame_buffer
(
if
(
vp
x
_realloc_frame_buffer
(
get_frame_new_buffer
(
cm
),
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -1317,7 +1317,7 @@ static void setup_frame_size_with_refs(VP10_COMMON *cm,
setup_display_size
(
cm
,
rb
);
lock_buffer_pool
(
pool
);
if
(
vp
9
_realloc_frame_buffer
(
if
(
vp
x
_realloc_frame_buffer
(
get_frame_new_buffer
(
cm
),
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
vp10/encoder/denoiser.c
View file @
89af744b
...
...
@@ -435,7 +435,7 @@ int vp10_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
assert
(
denoiser
!=
NULL
);
for
(
i
=
0
;
i
<
MAX_REF_FRAMES
;
++
i
)
{
fail
=
vp
9
_alloc_frame_buffer
(
&
denoiser
->
running_avg_y
[
i
],
width
,
height
,
fail
=
vp
x
_alloc_frame_buffer
(
&
denoiser
->
running_avg_y
[
i
],
width
,
height
,
ssx
,
ssy
,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth
,
...
...
@@ -450,7 +450,7 @@ int vp10_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
#endif
}
fail
=
vp
9
_alloc_frame_buffer
(
&
denoiser
->
mc_running_avg_y
,
width
,
height
,
fail
=
vp
x
_alloc_frame_buffer
(
&
denoiser
->
mc_running_avg_y
,
width
,
height
,
ssx
,
ssy
,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth
,
...
...
@@ -476,9 +476,9 @@ void vp10_denoiser_free(VP9_DENOISER *denoiser) {
return
;
}
for
(
i
=
0
;
i
<
MAX_REF_FRAMES
;
++
i
)
{
vp
9
_free_frame_buffer
(
&
denoiser
->
running_avg_y
[
i
]);
vp
x
_free_frame_buffer
(
&
denoiser
->
running_avg_y
[
i
]);
}
vp
9
_free_frame_buffer
(
&
denoiser
->
mc_running_avg_y
);
vp
x
_free_frame_buffer
(
&
denoiser
->
mc_running_avg_y
);
}
#ifdef OUTPUT_YUV_DENOISED
...
...
vp10/encoder/encoder.c
View file @
89af744b
...
...
@@ -382,10 +382,10 @@ static void dealloc_compressor_data(VP10_COMP *cpi) {
#endif
vp10_free_context_buffers
(
cm
);
vp
9
_free_frame_buffer
(
&
cpi
->
last_frame_uf
);
vp
9
_free_frame_buffer
(
&
cpi
->
scaled_source
);
vp
9
_free_frame_buffer
(
&
cpi
->
scaled_last_source
);
vp
9
_free_frame_buffer
(
&
cpi
->
alt_ref_buffer
);
vp
x
_free_frame_buffer
(
&
cpi
->
last_frame_uf
);
vp
x
_free_frame_buffer
(
&
cpi
->
scaled_source
);
vp
x
_free_frame_buffer
(
&
cpi
->
scaled_last_source
);
vp
x
_free_frame_buffer
(
&
cpi
->
alt_ref_buffer
);
vp10_lookahead_destroy
(
cpi
->
lookahead
);
vpx_free
(
cpi
->
tile_tok
[
0
][
0
]);
...
...
@@ -406,12 +406,12 @@ static void dealloc_compressor_data(VP10_COMP *cpi) {
}
for
(
i
=
0
;
i
<
MAX_LAG_BUFFERS
;
++
i
)
{
vp
9
_free_frame_buffer
(
&
cpi
->
svc
.
scaled_frames
[
i
]);
vp
x
_free_frame_buffer
(
&
cpi
->
svc
.
scaled_frames
[
i
]);
}
memset
(
&
cpi
->
svc
.
scaled_frames
[
0
],
0
,
MAX_LAG_BUFFERS
*
sizeof
(
cpi
->
svc
.
scaled_frames
[
0
]));
vp
9
_free_frame_buffer
(
&
cpi
->
svc
.
empty_frame
.
img
);
vp
x
_free_frame_buffer
(
&
cpi
->
svc
.
empty_frame
.
img
);
memset
(
&
cpi
->
svc
.
empty_frame
,
0
,
sizeof
(
cpi
->
svc
.
empty_frame
));
}
...
...
@@ -628,7 +628,7 @@ static void alloc_raw_frame_buffers(VP10_COMP *cpi) {
"Failed to allocate lag buffers"
);
// TODO(agrange) Check if ARF is enabled and skip allocation if not.
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
,
oxcf
->
width
,
oxcf
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -642,7 +642,7 @@ static void alloc_raw_frame_buffers(VP10_COMP *cpi) {
static
void
alloc_util_frame_buffers
(
VP10_COMP
*
cpi
)
{
VP10_COMMON
*
const
cm
=
&
cpi
->
common
;
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
last_frame_uf
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
last_frame_uf
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -653,7 +653,7 @@ static void alloc_util_frame_buffers(VP10_COMP *cpi) {
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_MEM_ERROR
,
"Failed to allocate last frame buffer"
);
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
scaled_source
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
scaled_source
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -664,7 +664,7 @@ static void alloc_util_frame_buffers(VP10_COMP *cpi) {
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_MEM_ERROR
,
"Failed to allocate scaled source buffer"
);
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
scaled_last_source
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
scaled_last_source
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -743,7 +743,7 @@ static void update_frame_size(VP10_COMP *cpi) {
set_tile_limits
(
cpi
);
if
(
is_two_pass_svc
(
cpi
))
{
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -2548,7 +2548,7 @@ static void scale_and_extend_frame_nonnormative(const YV12_BUFFER_CONFIG *src,
dsts
[
i
],
dst_heights
[
i
],
dst_widths
[
i
],
dst_strides
[
i
]);
#endif // CONFIG_VP9_HIGHBITDEPTH
}
vp
9
_extend_frame_borders
(
dst
);
vp
x
_extend_frame_borders
(
dst
);
}
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -2603,7 +2603,7 @@ static void scale_and_extend_frame(const YV12_BUFFER_CONFIG *src,
}
}
vp
9
_extend_frame_borders
(
dst
);
vp
x
_extend_frame_borders
(
dst
);
}
static
int
scale_down
(
VP10_COMP
*
cpi
,
int
q
)
{
...
...
@@ -2769,7 +2769,7 @@ static void loopfilter_frame(VP10_COMP *cpi, VP10_COMMON *cm) {
vp10_loop_filter_frame
(
cm
->
frame_to_show
,
cm
,
xd
,
lf
->
filter_level
,
0
,
0
);
}
vp
9
_extend_frame_inner_borders
(
cm
->
frame_to_show
);
vp
x
_extend_frame_inner_borders
(
cm
->
frame_to_show
);
}
static
INLINE
void
alloc_frame_mvs
(
const
VP10_COMMON
*
cm
,
...
...
@@ -2819,7 +2819,7 @@ void vp10_scale_references(VP10_COMP *cpi) {
if
(
force_scaling
||
new_fb_ptr
->
buf
.
y_crop_width
!=
cm
->
width
||
new_fb_ptr
->
buf
.
y_crop_height
!=
cm
->
height
)
{
vp
9
_realloc_frame_buffer
(
&
new_fb_ptr
->
buf
,
vp
x
_realloc_frame_buffer
(
&
new_fb_ptr
->
buf
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
cm
->
use_highbitdepth
,
...
...
@@ -2844,7 +2844,7 @@ void vp10_scale_references(VP10_COMP *cpi) {
if
(
force_scaling
||
new_fb_ptr
->
buf
.
y_crop_width
!=
cm
->
width
||
new_fb_ptr
->
buf
.
y_crop_height
!=
cm
->
height
)
{
vp
9
_realloc_frame_buffer
(
&
new_fb_ptr
->
buf
,
vp
x
_realloc_frame_buffer
(
&
new_fb_ptr
->
buf
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
VP9_ENC_BORDER_IN_PIXELS
,
cm
->
byte_alignment
,
...
...
@@ -3139,7 +3139,7 @@ static void set_frame_size(VP10_COMP *cpi) {
alloc_frame_mvs
(
cm
,
cm
->
new_fb_idx
);
// Reset the frame pointers to the current frame size.
vp
9
_realloc_frame_buffer
(
get_frame_new_buffer
(
cm
),
vp
x
_realloc_frame_buffer
(
get_frame_new_buffer
(
cm
),
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -3172,7 +3172,7 @@ static void set_frame_size(VP10_COMP *cpi) {
cm
->
width
,
cm
->
height
);
#endif // CONFIG_VP9_HIGHBITDEPTH
if
(
vp10_is_scaled
(
&
ref_buf
->
sf
))
vp
9
_extend_frame_borders
(
buf
);
vp
x
_extend_frame_borders
(
buf
);
}
else
{
ref_buf
->
buf
=
NULL
;
}
...
...
@@ -3563,7 +3563,7 @@ YV12_BUFFER_CONFIG *vp10_scale_if_required_fast(VP10_COMMON *cm,
// For 2x2 scaling down.
vpx_scale_frame
(
unscaled
,
scaled
,
unscaled
->
y_buffer
,
9
,
2
,
1
,
2
,
1
,
0
);
vp
9
_extend_frame_borders
(
scaled
);
vp
x
_extend_frame_borders
(
scaled
);
return
scaled
;
}
else
{
return
unscaled
;
...
...
@@ -4179,7 +4179,7 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
if
(
oxcf
->
arnr_max_frames
>
0
)
{
// Produce the filtered ARF frame.
vp10_temporal_filter
(
cpi
,
arf_src_index
);
vp
9
_extend_frame_borders
(
&
cpi
->
alt_ref_buffer
);
vp
x
_extend_frame_borders
(
&
cpi
->
alt_ref_buffer
);
force_src_buffer
=
&
cpi
->
alt_ref_buffer
;
}
...
...
@@ -4386,7 +4386,7 @@ int vp10_get_compressed_data(VP10_COMP *cpi, unsigned int *frame_flags,
PSNR_STATS
psnr2
;
double
frame_ssim2
=
0
,
weight
=
0
;
#if CONFIG_VP9_POSTPROC
if
(
vp
9
_alloc_frame_buffer
(
&
cm
->
post_proc_buffer
,
if
(
vp
x
_alloc_frame_buffer
(
&
cm
->
post_proc_buffer
,
recon
->
y_crop_width
,
recon
->
y_crop_height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
vp10/encoder/firstpass.c
View file @
89af744b
...
...
@@ -1114,7 +1114,7 @@ void vp10_first_pass(VP10_COMP *cpi, const struct lookahead_entry *source) {
++
twopass
->
sr_update_lag
;
}
vp
9
_extend_frame_borders
(
new_yv12
);
vp
x
_extend_frame_borders
(
new_yv12
);
if
(
lc
!=
NULL
)
{
vp10_update_reference_frames
(
cpi
);
...
...
vp10/encoder/lookahead.c
View file @
89af744b
...
...
@@ -38,7 +38,7 @@ void vp10_lookahead_destroy(struct lookahead_ctx *ctx) {
unsigned
int
i
;
for
(
i
=
0
;
i
<
ctx
->
max_sz
;
i
++
)
vp
9
_free_frame_buffer
(
&
ctx
->
buf
[
i
].
img
);
vp
x
_free_frame_buffer
(
&
ctx
->
buf
[
i
].
img
);
free
(
ctx
->
buf
);
}
free
(
ctx
);
...
...
@@ -72,7 +72,7 @@ struct lookahead_ctx *vp10_lookahead_init(unsigned int width,
if
(
!
ctx
->
buf
)
goto
bail
;
for
(
i
=
0
;
i
<
depth
;
i
++
)
if
(
vp
9
_alloc_frame_buffer
(
&
ctx
->
buf
[
i
].
img
,
if
(
vp
x
_alloc_frame_buffer
(
&
ctx
->
buf
[
i
].
img
,
width
,
height
,
subsampling_x
,
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth
,
...
...
@@ -172,7 +172,7 @@ int vp10_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src,
if
(
larger_dimensions
)
{
YV12_BUFFER_CONFIG
new_img
;
memset
(
&
new_img
,
0
,
sizeof
(
new_img
));
if
(
vp
9
_alloc_frame_buffer
(
&
new_img
,
if
(
vp
x
_alloc_frame_buffer
(
&
new_img
,
width
,
height
,
subsampling_x
,
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth
,
...
...
@@ -180,7 +180,7 @@ int vp10_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src,
VP9_ENC_BORDER_IN_PIXELS
,
0
))
return
1
;
vp
9
_free_frame_buffer
(
&
buf
->
img
);
vp
x
_free_frame_buffer
(
&
buf
->
img
);
buf
->
img
=
new_img
;
}
else
if
(
new_dimensions
)
{
buf
->
img
.
y_crop_width
=
src
->
y_crop_width
;
...
...
vp10/encoder/skin_detection.c
View file @
89af744b
...
...
@@ -61,10 +61,10 @@ void vp10_compute_skin_map(VP10_COMP *const cpi, FILE *yuv_skinmap_file) {
const
int
src_uvstride
=
cpi
->
Source
->
uv_stride
;
YV12_BUFFER_CONFIG
skinmap
;
memset
(
&
skinmap
,
0
,
sizeof
(
YV12_BUFFER_CONFIG
));
if
(
vp
9
_alloc_frame_buffer
(
&
skinmap
,
cm
->
width
,
cm
->
height
,
if
(
vp
x
_alloc_frame_buffer
(
&
skinmap
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
VP9_ENC_BORDER_IN_PIXELS
,
cm
->
byte_alignment
))
{
vp
9
_free_frame_buffer
(
&
skinmap
);
vp
x
_free_frame_buffer
(
&
skinmap
);
return
;
}
memset
(
skinmap
.
buffer_alloc
,
128
,
skinmap
.
frame_size
);
...
...
@@ -99,6 +99,6 @@ void vp10_compute_skin_map(VP10_COMP *const cpi, FILE *yuv_skinmap_file) {
src_v
+=
(
src_uvstride
<<
2
)
-
((
cm
->
mi_cols
-
1
)
<<
2
);
}
vp10_write_yuv_frame_420
(
&
skinmap
,
yuv_skinmap_file
);
vp
9
_free_frame_buffer
(
&
skinmap
);
vp
x
_free_frame_buffer
(
&
skinmap
);
}
#endif
vp10/encoder/svc_layercontext.c
View file @
89af744b
...
...
@@ -28,7 +28,7 @@ void vp10_init_layer_context(VP10_COMP *const cpi) {
svc
->
temporal_layer_id
=
0
;
if
(
cpi
->
oxcf
.
error_resilient_mode
==
0
&&
cpi
->
oxcf
.
pass
==
2
)
{
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
svc
.
empty_frame
.
img
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
svc
.
empty_frame
.
img
,
SMALL_FRAME_WIDTH
,
SMALL_FRAME_HEIGHT
,
cpi
->
common
.
subsampling_x
,
cpi
->
common
.
subsampling_y
,
...
...
vp10/encoder/temporal_filter.c
View file @
89af744b
...
...
@@ -705,7 +705,7 @@ void vp10_temporal_filter(VP10_COMP *cpi, int distance) {
for
(
frame
=
0
;
frame
<
frames_to_blur
;
++
frame
)
{
if
(
cm
->
mi_cols
*
MI_SIZE
!=
frames
[
frame
]
->
y_width
||
cm
->
mi_rows
*
MI_SIZE
!=
frames
[
frame
]
->
y_height
)
{
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
svc
.
scaled_frames
[
frame_used
],
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
svc
.
scaled_frames
[
frame_used
],
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
vp9/common/vp9_alloccommon.c
View file @
89af744b
...
...
@@ -95,14 +95,14 @@ void vp9_free_ref_frame_buffers(BufferPool *pool) {
}
vpx_free
(
pool
->
frame_bufs
[
i
].
mvs
);
pool
->
frame_bufs
[
i
].
mvs
=
NULL
;
vp
9
_free_frame_buffer
(
&
pool
->
frame_bufs
[
i
].
buf
);
vp
x
_free_frame_buffer
(
&
pool
->
frame_bufs
[
i
].
buf
);
}
}
void
vp9_free_postproc_buffers
(
VP9_COMMON
*
cm
)
{
#if CONFIG_VP9_POSTPROC
vp
9
_free_frame_buffer
(
&
cm
->
post_proc_buffer
);
vp
9
_free_frame_buffer
(
&
cm
->
post_proc_buffer_int
);
vp
x
_free_frame_buffer
(
&
cm
->
post_proc_buffer
);
vp
x
_free_frame_buffer
(
&
cm
->
post_proc_buffer_int
);
#else
(
void
)
cm
;
#endif
...
...
vp9/common/vp9_postproc.c
View file @
89af744b
...
...
@@ -659,7 +659,7 @@ int vp9_post_proc_frame(struct VP9Common *cm,
const
int
width
=
ALIGN_POWER_OF_TWO
(
cm
->
width
,
4
);
const
int
height
=
ALIGN_POWER_OF_TWO
(
cm
->
height
,
4
);
if
(
vp
9
_alloc_frame_buffer
(
&
cm
->
post_proc_buffer_int
,
width
,
height
,
if
(
vp
x
_alloc_frame_buffer
(
&
cm
->
post_proc_buffer_int
,
width
,
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
cm
->
use_highbitdepth
,
...
...
@@ -677,7 +677,7 @@ int vp9_post_proc_frame(struct VP9Common *cm,
}
}
if
(
vp
9
_realloc_frame_buffer
(
&
cm
->
post_proc_buffer
,
cm
->
width
,
cm
->
height
,
if
(
vp
x
_realloc_frame_buffer
(
&
cm
->
post_proc_buffer
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
cm
->
use_highbitdepth
,
...
...
vp9/decoder/vp9_decodeframe.c
View file @
89af744b
...
...
@@ -1235,7 +1235,7 @@ static void setup_frame_size(VP9_COMMON *cm, struct vpx_read_bit_buffer *rb) {
setup_display_size
(
cm
,
rb
);
lock_buffer_pool
(
pool
);
if
(
vp
9
_realloc_frame_buffer
(
if
(
vp
x
_realloc_frame_buffer
(
get_frame_new_buffer
(
cm
),
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -1316,7 +1316,7 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm,
setup_display_size
(
cm
,
rb
);
lock_buffer_pool
(
pool
);
if
(
vp
9
_realloc_frame_buffer
(
if
(
vp
x
_realloc_frame_buffer
(
get_frame_new_buffer
(
cm
),
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
vp9/encoder/vp9_denoiser.c
View file @
89af744b
...
...
@@ -431,7 +431,7 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
assert
(
denoiser
!=
NULL
);
for
(
i
=
0
;
i
<
MAX_REF_FRAMES
;
++
i
)
{
fail
=
vp
9
_alloc_frame_buffer
(
&
denoiser
->
running_avg_y
[
i
],
width
,
height
,
fail
=
vp
x
_alloc_frame_buffer
(
&
denoiser
->
running_avg_y
[
i
],
width
,
height
,
ssx
,
ssy
,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth
,
...
...
@@ -446,7 +446,7 @@ int vp9_denoiser_alloc(VP9_DENOISER *denoiser, int width, int height,
#endif
}
fail
=
vp
9
_alloc_frame_buffer
(
&
denoiser
->
mc_running_avg_y
,
width
,
height
,
fail
=
vp
x
_alloc_frame_buffer
(
&
denoiser
->
mc_running_avg_y
,
width
,
height
,
ssx
,
ssy
,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth
,
...
...
@@ -472,9 +472,9 @@ void vp9_denoiser_free(VP9_DENOISER *denoiser) {
return
;
}
for
(
i
=
0
;
i
<
MAX_REF_FRAMES
;
++
i
)
{
vp
9
_free_frame_buffer
(
&
denoiser
->
running_avg_y
[
i
]);
vp
x
_free_frame_buffer
(
&
denoiser
->
running_avg_y
[
i
]);
}
vp
9
_free_frame_buffer
(
&
denoiser
->
mc_running_avg_y
);
vp
x
_free_frame_buffer
(
&
denoiser
->
mc_running_avg_y
);
}
#ifdef OUTPUT_YUV_DENOISED
...
...
vp9/encoder/vp9_encoder.c
View file @
89af744b
...
...
@@ -381,10 +381,10 @@ static void dealloc_compressor_data(VP9_COMP *cpi) {
#endif
vp9_free_context_buffers
(
cm
);
vp
9
_free_frame_buffer
(
&
cpi
->
last_frame_uf
);
vp
9
_free_frame_buffer
(
&
cpi
->
scaled_source
);
vp
9
_free_frame_buffer
(
&
cpi
->
scaled_last_source
);
vp
9
_free_frame_buffer
(
&
cpi
->
alt_ref_buffer
);
vp
x
_free_frame_buffer
(
&
cpi
->
last_frame_uf
);
vp
x
_free_frame_buffer
(
&
cpi
->
scaled_source
);
vp
x
_free_frame_buffer
(
&
cpi
->
scaled_last_source
);
vp
x
_free_frame_buffer
(
&
cpi
->
alt_ref_buffer
);
vp9_lookahead_destroy
(
cpi
->
lookahead
);
vpx_free
(
cpi
->
tile_tok
[
0
][
0
]);
...
...
@@ -405,12 +405,12 @@ static void dealloc_compressor_data(VP9_COMP *cpi) {
}
for
(
i
=
0
;
i
<
MAX_LAG_BUFFERS
;
++
i
)
{
vp
9
_free_frame_buffer
(
&
cpi
->
svc
.
scaled_frames
[
i
]);
vp
x
_free_frame_buffer
(
&
cpi
->
svc
.
scaled_frames
[
i
]);
}
memset
(
&
cpi
->
svc
.
scaled_frames
[
0
],
0
,
MAX_LAG_BUFFERS
*
sizeof
(
cpi
->
svc
.
scaled_frames
[
0
]));
vp
9
_free_frame_buffer
(
&
cpi
->
svc
.
empty_frame
.
img
);
vp
x
_free_frame_buffer
(
&
cpi
->
svc
.
empty_frame
.
img
);
memset
(
&
cpi
->
svc
.
empty_frame
,
0
,
sizeof
(
cpi
->
svc
.
empty_frame
));
}
...
...
@@ -627,7 +627,7 @@ static void alloc_raw_frame_buffers(VP9_COMP *cpi) {
"Failed to allocate lag buffers"
);
// TODO(agrange) Check if ARF is enabled and skip allocation if not.
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
,
oxcf
->
width
,
oxcf
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -641,7 +641,7 @@ static void alloc_raw_frame_buffers(VP9_COMP *cpi) {
static
void
alloc_util_frame_buffers
(
VP9_COMP
*
cpi
)
{
VP9_COMMON
*
const
cm
=
&
cpi
->
common
;
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
last_frame_uf
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
last_frame_uf
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -652,7 +652,7 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) {
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_MEM_ERROR
,
"Failed to allocate last frame buffer"
);
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
scaled_source
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
scaled_source
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -663,7 +663,7 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) {
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_MEM_ERROR
,
"Failed to allocate scaled source buffer"
);
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
scaled_last_source
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
scaled_last_source
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -742,7 +742,7 @@ static void update_frame_size(VP9_COMP *cpi) {
set_tile_limits
(
cpi
);
if
(
is_two_pass_svc
(
cpi
))
{
if
(
vp
9
_realloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
,
if
(
vp
x
_realloc_frame_buffer
(
&
cpi
->
alt_ref_buffer
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -2547,7 +2547,7 @@ static void scale_and_extend_frame_nonnormative(const YV12_BUFFER_CONFIG *src,
dsts
[
i
],
dst_heights
[
i
],
dst_widths
[
i
],
dst_strides
[
i
]);
#endif // CONFIG_VP9_HIGHBITDEPTH
}
vp
9
_extend_frame_borders
(
dst
);
vp
x
_extend_frame_borders
(
dst
);
}
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -2602,7 +2602,7 @@ static void scale_and_extend_frame(const YV12_BUFFER_CONFIG *src,
}
}
vp
9
_extend_frame_borders
(
dst
);
vp
x
_extend_frame_borders
(
dst
);
}
static
int
scale_down
(
VP9_COMP
*
cpi
,
int
q
)
{
...
...
@@ -2768,7 +2768,7 @@ static void loopfilter_frame(VP9_COMP *cpi, VP9_COMMON *cm) {
vp9_loop_filter_frame
(
cm
->
frame_to_show
,
cm
,
xd
,
lf
->
filter_level
,
0
,
0
);
}
vp
9
_extend_frame_inner_borders
(
cm
->
frame_to_show
);
vp
x
_extend_frame_inner_borders
(
cm
->
frame_to_show
);
}
static
INLINE
void
alloc_frame_mvs
(
const
VP9_COMMON
*
cm
,
...
...
@@ -2818,7 +2818,7 @@ void vp9_scale_references(VP9_COMP *cpi) {
if
(
force_scaling
||
new_fb_ptr
->
buf
.
y_crop_width
!=
cm
->
width
||
new_fb_ptr
->
buf
.
y_crop_height
!=
cm
->
height
)
{
vp
9
_realloc_frame_buffer
(
&
new_fb_ptr
->
buf
,
vp
x
_realloc_frame_buffer
(
&
new_fb_ptr
->
buf
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
cm
->
use_highbitdepth
,
...
...
@@ -2843,7 +2843,7 @@ void vp9_scale_references(VP9_COMP *cpi) {
if
(
force_scaling
||
new_fb_ptr
->
buf
.
y_crop_width
!=
cm
->
width
||
new_fb_ptr
->
buf
.
y_crop_height
!=
cm
->
height
)
{
vp
9
_realloc_frame_buffer
(
&
new_fb_ptr
->
buf
,
vp
x
_realloc_frame_buffer
(
&
new_fb_ptr
->
buf
,
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
VP9_ENC_BORDER_IN_PIXELS
,
cm
->
byte_alignment
,
...
...
@@ -3138,7 +3138,7 @@ static void set_frame_size(VP9_COMP *cpi) {
alloc_frame_mvs
(
cm
,
cm
->
new_fb_idx
);
// Reset the frame pointers to the current frame size.
vp
9
_realloc_frame_buffer
(
get_frame_new_buffer
(
cm
),
vp
x
_realloc_frame_buffer
(
get_frame_new_buffer
(
cm
),
cm
->
width
,
cm
->
height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
@@ -3171,7 +3171,7 @@ static void set_frame_size(VP9_COMP *cpi) {
cm
->
width
,
cm
->
height
);
#endif // CONFIG_VP9_HIGHBITDEPTH
if
(
vp9_is_scaled
(
&
ref_buf
->
sf
))
vp
9
_extend_frame_borders
(
buf
);
vp
x
_extend_frame_borders
(
buf
);
}
else
{
ref_buf
->
buf
=
NULL
;
}
...
...
@@ -3562,7 +3562,7 @@ YV12_BUFFER_CONFIG *vp9_scale_if_required_fast(VP9_COMMON *cm,
// For 2x2 scaling down.
vpx_scale_frame
(
unscaled
,
scaled
,
unscaled
->
y_buffer
,
9
,
2
,
1
,
2
,
1
,
0
);
vp
9
_extend_frame_borders
(
scaled
);
vp
x
_extend_frame_borders
(
scaled
);
return
scaled
;
}
else
{
return
unscaled
;
...
...
@@ -4178,7 +4178,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
if
(
oxcf
->
arnr_max_frames
>
0
)
{
// Produce the filtered ARF frame.
vp9_temporal_filter
(
cpi
,
arf_src_index
);
vp
9
_extend_frame_borders
(
&
cpi
->
alt_ref_buffer
);
vp
x
_extend_frame_borders
(
&
cpi
->
alt_ref_buffer
);
force_src_buffer
=
&
cpi
->
alt_ref_buffer
;
}
...
...
@@ -4385,7 +4385,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
PSNR_STATS
psnr2
;
double
frame_ssim2
=
0
,
weight
=
0
;
#if CONFIG_VP9_POSTPROC
if
(
vp
9
_alloc_frame_buffer
(
&
cm
->
post_proc_buffer
,
if
(
vp
x
_alloc_frame_buffer
(
&
cm
->
post_proc_buffer
,
recon
->
y_crop_width
,
recon
->
y_crop_height
,
cm
->
subsampling_x
,
cm
->
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
...
...
vp9/encoder/vp9_firstpass.c
View file @
89af744b
...
...
@@ -1112,7 +1112,7 @@ void vp9_first_pass(VP9_COMP *cpi, const struct lookahead_entry *source) {
++
twopass
->
sr_update_lag
;
}
vp
9
_extend_frame_borders
(
new_yv12
);
vp
x
_extend_frame_borders
(
new_yv12
);
if
(
lc
!=
NULL
)
{
vp9_update_reference_frames
(
cpi
);
...
...
vp9/encoder/vp9_lookahead.c
View file @
89af744b
...
...
@@ -38,7 +38,7 @@ void vp9_lookahead_destroy(struct lookahead_ctx *ctx) {
unsigned
int
i
;
for
(
i
=
0
;
i
<
ctx
->
max_sz
;
i
++
)
vp
9
_free_frame_buffer
(
&
ctx
->
buf
[
i
].
img
);
vp
x
_free_frame_buffer
(
&
ctx
->
buf
[
i
].
img
);
free
(
ctx
->
buf
);
}
free
(
ctx
);
...
...
@@ -72,7 +72,7 @@ struct lookahead_ctx *vp9_lookahead_init(unsigned int width,
if
(
!
ctx
->
buf
)
goto
bail
;
for
(
i
=
0
;
i
<
depth
;
i
++
)
if
(
vp
9
_alloc_frame_buffer
(
&
ctx
->
buf
[
i
].
img
,
if
(
vp
x
_alloc_frame_buffer
(
&
ctx
->
buf
[
i
].
img
,
width
,
height
,
subsampling_x
,
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH
use_highbitdepth
,
...
...
@@ -172,7 +172,7 @@ int vp9_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src,
if
(
larger_dimensions
)
{
YV12_BUFFER_CONFIG
new_img
;
memset
(
&
new_img
,
0
,
sizeof
(
new_img
));
if
(
vp
9
_alloc_frame_buffer
(
&
new_img
,
if
(
vp
x
_alloc_frame_buffer
(
&
new_img
,
width
,
height
,
subsampling_x
,
subsampling_y
,
#if CONFIG_VP9_HIGHBITDEPTH