Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
libvpx
Commits
c2574414
Commit
c2574414
authored
11 years ago
by
Ronald S. Bultje
Browse files
Options
Download
Patches
Plain Diff
Align frame size to 8 instead of 16.
Change-Id: Ic22f416a33de558519d5c30a929f6a954546ade9
parent
6ef805eb
v1.14.0-linphone
1.4.X
experimental
feature/update_to_v1.9.0-linphone
feature/uwp_nuget
forest
frame_parallel
highbitdepth
indianrunnerduck
javanwhistlingduck
khakicampbell
linphone
linphone-android
linphone-old
longtailedduck
m29-baseline
m31-baseline
m49-2623
m52-2743
m54-2840
m56-2924
m66-3359
m68-3440
mandarinduck
mcw
mcw2
nextgen
nextgenv2
pcs-2013
playground
sandbox/Jingning/experimental
sandbox/Jingning/transcode
sandbox/Jingning/vpx
sandbox/aconverse@google.com/ansbench
sandbox/debargha/playground
sandbox/hkuang/frame_parallel
sandbox/hkuang@google.com/decode
sandbox/jimbankoski@google.com/proposed-aom
sandbox/jingning@google.com/decoder_test_suite
sandbox/jingning@google.com/experimental
sandbox/jzern@google.com/test
sandbox/wangch@google.com/vp9
sandbox/yaowu@google.com/mergeaom
stable-vp9-decoder
v1.12.0-linphone
v1.6.1_linphone
v1.7.0-linphone
v1.9.0-linphone
v1.9.0
v1.9.0-rc1
v1.8.2
v1.8.1
v1.8.0
v1.7.0
v1.6.1
v1.6.0
v1.5.0
v1.4.0
v1.3.0
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
vp9/common/vp9_alloccommon.c
+6
-6
vp9/common/vp9_alloccommon.c
vp9/common/vp9_common.h
+2
-2
vp9/common/vp9_common.h
vp9/vp9_iface_common.h
+1
-1
vp9/vp9_iface_common.h
with
9 additions
and
9 deletions
vp9/common/vp9_alloccommon.c
+
6
−
6
View file @
c2574414
...
...
@@ -68,8 +68,8 @@ void vp9_free_frame_buffers(VP9_COMMON *oci) {
}
static
void
set_mb_mi
(
VP9_COMMON
*
cm
,
int
aligned_width
,
int
aligned_height
)
{
cm
->
mb_cols
=
aligned_width
>>
4
;
cm
->
mb_rows
=
aligned_height
>>
4
;
cm
->
mb_cols
=
(
aligned_width
+
8
)
>>
4
;
cm
->
mb_rows
=
(
aligned_height
+
8
)
>>
4
;
cm
->
MBs
=
cm
->
mb_rows
*
cm
->
mb_cols
;
cm
->
mi_cols
=
aligned_width
>>
LOG2_MI_SIZE
;
...
...
@@ -95,8 +95,8 @@ int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) {
int
i
,
mi_cols
;
// Our internal buffers are always multiples of 16
const
int
aligned_width
=
multiple
16
(
width
);
const
int
aligned_height
=
multiple
16
(
height
);
const
int
aligned_width
=
multiple
8
(
width
);
const
int
aligned_height
=
multiple
8
(
height
);
const
int
ss_x
=
oci
->
subsampling_x
;
const
int
ss_y
=
oci
->
subsampling_y
;
...
...
@@ -222,8 +222,8 @@ void vp9_initialize_common() {
}
void
vp9_update_frame_size
(
VP9_COMMON
*
cm
)
{
const
int
aligned_width
=
multiple
16
(
cm
->
width
);
const
int
aligned_height
=
multiple
16
(
cm
->
height
);
const
int
aligned_width
=
multiple
8
(
cm
->
width
);
const
int
aligned_height
=
multiple
8
(
cm
->
height
);
set_mb_mi
(
cm
,
aligned_width
,
aligned_height
);
setup_mi
(
cm
);
...
...
This diff is collapsed.
Click to expand it.
vp9/common/vp9_common.h
+
2
−
2
View file @
c2574414
...
...
@@ -56,8 +56,8 @@ static INLINE double fclamp(double value, double low, double high) {
return
value
<
low
?
low
:
(
value
>
high
?
high
:
value
);
}
static
INLINE
int
multiple
16
(
int
value
)
{
return
(
value
+
15
)
&
~
15
;
static
INLINE
int
multiple
8
(
int
value
)
{
return
(
value
+
7
)
&
~
7
;
}
#define SYNC_CODE_0 0x49
...
...
This diff is collapsed.
Click to expand it.
vp9/vp9_iface_common.h
+
1
−
1
View file @
c2574414
...
...
@@ -29,7 +29,7 @@ static void yuvconfig2image(vpx_image_t *img, const YV12_BUFFER_CONFIG *yv12,
img
->
fmt
=
VPX_IMG_FMT_I420
;
}
img
->
w
=
yv12
->
y_stride
;
img
->
h
=
multiple
16
(
yv12
->
y_height
+
2
*
VP9BORDERINPIXELS
);
img
->
h
=
multiple
8
(
yv12
->
y_height
+
2
*
VP9BORDERINPIXELS
);
img
->
d_w
=
yv12
->
y_crop_width
;
img
->
d_h
=
yv12
->
y_crop_height
;
img
->
x_chroma_shift
=
yv12
->
uv_width
<
yv12
->
y_width
;
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets