Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
976d0450
Commit
976d0450
authored
Oct 30, 2012
by
Paul Wilkins
Committed by
Gerrit Code Review
Oct 30, 2012
Browse files
Options
Browse Files
Download
Plain Diff
Merge "alloccommon: give exported symbols a vp9_ prefix." into experimental
parents
10afa9e2
7228a38a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
10 deletions
+13
-10
vp8/common/alloccommon.c
vp8/common/alloccommon.c
+5
-4
vp8/common/alloccommon.h
vp8/common/alloccommon.h
+3
-0
vp8/decoder/decodframe.c
vp8/decoder/decodframe.c
+2
-2
vp8/encoder/ratectrl.c
vp8/encoder/ratectrl.c
+3
-4
No files found.
vp8/common/alloccommon.c
View file @
976d0450
...
...
@@ -21,7 +21,7 @@
extern
void
vp8_init_scan_order_mask
();
void
update_mode_info_border
(
VP8_COMMON
*
cpi
,
MODE_INFO
*
mi_base
)
{
void
vp9_
update_mode_info_border
(
VP8_COMMON
*
cpi
,
MODE_INFO
*
mi_base
)
{
int
stride
=
cpi
->
mode_info_stride
;
int
i
;
...
...
@@ -33,7 +33,8 @@ void update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base) {
vpx_memset
(
&
mi_base
[
i
*
stride
],
0
,
sizeof
(
MODE_INFO
));
}
}
void
update_mode_info_in_image
(
VP8_COMMON
*
cpi
,
MODE_INFO
*
mi
)
{
void
vp9_update_mode_info_in_image
(
VP8_COMMON
*
cpi
,
MODE_INFO
*
mi
)
{
int
i
,
j
;
// For each in image mode_info element set the in image flag to 1
...
...
@@ -139,8 +140,8 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) {
return
1
;
}
update_mode_info_border
(
oci
,
oci
->
mip
);
update_mode_info_in_image
(
oci
,
oci
->
mi
);
vp9_
update_mode_info_border
(
oci
,
oci
->
mip
);
vp9_
update_mode_info_in_image
(
oci
,
oci
->
mi
);
return
0
;
}
...
...
vp8/common/alloccommon.h
View file @
976d0450
...
...
@@ -20,4 +20,7 @@ void vp8_de_alloc_frame_buffers(VP8_COMMON *oci);
int
vp8_alloc_frame_buffers
(
VP8_COMMON
*
oci
,
int
width
,
int
height
);
void
vp8_setup_version
(
VP8_COMMON
*
oci
);
void
vp9_update_mode_info_border
(
VP8_COMMON
*
cpi
,
MODE_INFO
*
mi_base
);
void
vp9_update_mode_info_in_image
(
VP8_COMMON
*
cpi
,
MODE_INFO
*
mi
);
#endif
vp8/decoder/decodframe.c
View file @
976d0450
...
...
@@ -786,8 +786,8 @@ static void init_frame(VP8D_COMP *pbi) {
vpx_memset
(
pc
->
mip
,
0
,
(
pc
->
mb_cols
+
1
)
*
(
pc
->
mb_rows
+
1
)
*
sizeof
(
MODE_INFO
));
update_mode_info_border
(
pc
,
pc
->
mip
);
update_mode_info_in_image
(
pc
,
pc
->
mi
);
vp9_
update_mode_info_border
(
pc
,
pc
->
mip
);
vp9_
update_mode_info_in_image
(
pc
,
pc
->
mi
);
}
else
{
...
...
vp8/encoder/ratectrl.c
View file @
976d0450
...
...
@@ -16,6 +16,7 @@
#include <assert.h>
#include "math.h"
#include "vp8/common/alloccommon.h"
#include "vp8/common/common.h"
#include "ratectrl.h"
#include "vp8/common/entropymode.h"
...
...
@@ -264,10 +265,8 @@ void vp8_setup_key_frame(VP8_COMP *cpi) {
vpx_memset
(
cm
->
mip
,
0
,
(
cm
->
mb_cols
+
1
)
*
(
cm
->
mb_rows
+
1
)
*
sizeof
(
MODE_INFO
));
update_mode_info_border
(
cm
,
cm
->
mip
);
update_mode_info_in_image
(
cm
,
cm
->
mi
);
vp9_update_mode_info_border
(
cm
,
cm
->
mip
);
vp9_update_mode_info_in_image
(
cm
,
cm
->
mi
);
}
void
vp8_setup_inter_frame
(
VP8_COMP
*
cpi
)
{
...
...
Write
Preview
Markdown
is supported
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