Skip to content
GitLab
Commit 976d0450 authored by Paul Wilkins's avatar Paul Wilkins Committed by Gerrit Code Review
Browse files

Merge "alloccommon: give exported symbols a vp9_ prefix." into experimental

parents 10afa9e2 7228a38a
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 vp9-preview 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
Hide whitespace changes
Inline Side-by-side
Showing
with 13 additions and 10 deletions
vp8/common/alloccommon.c
+ 5
− 4
View file @ 976d0450
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
extern void vp8_init_scan_order_mask(); 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 stride = cpi->mode_info_stride;
int i; int i;
...@@ -33,7 +33,8 @@ void update_mode_info_border(VP8_COMMON *cpi, MODE_INFO *mi_base) { ...@@ -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)); 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; int i, j;
// For each in image mode_info element set the in image flag to 1 // 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) { ...@@ -139,8 +140,8 @@ int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height) {
return 1; return 1;
} }
update_mode_info_border(oci, oci->mip); vp9_update_mode_info_border(oci, oci->mip);
update_mode_info_in_image(oci, oci->mi); vp9_update_mode_info_in_image(oci, oci->mi);
return 0; return 0;
} }
......
vp8/common/alloccommon.h
+ 3
− 0
View file @ 976d0450
...@@ -20,4 +20,7 @@ void vp8_de_alloc_frame_buffers(VP8_COMMON *oci); ...@@ -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); int vp8_alloc_frame_buffers(VP8_COMMON *oci, int width, int height);
void vp8_setup_version(VP8_COMMON *oci); 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 #endif
vp8/decoder/decodframe.c
+ 2
− 2
View file @ 976d0450
...@@ -786,8 +786,8 @@ static void init_frame(VP8D_COMP *pbi) { ...@@ -786,8 +786,8 @@ static void init_frame(VP8D_COMP *pbi) {
vpx_memset(pc->mip, 0, vpx_memset(pc->mip, 0,
(pc->mb_cols + 1) * (pc->mb_rows + 1)* sizeof(MODE_INFO)); (pc->mb_cols + 1) * (pc->mb_rows + 1)* sizeof(MODE_INFO));
update_mode_info_border(pc, pc->mip); vp9_update_mode_info_border(pc, pc->mip);
update_mode_info_in_image(pc, pc->mi); vp9_update_mode_info_in_image(pc, pc->mi);
} else { } else {
......
vp8/encoder/ratectrl.c
+ 3
− 4
View file @ 976d0450
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <assert.h> #include <assert.h>
#include "math.h" #include "math.h"
#include "vp8/common/alloccommon.h"
#include "vp8/common/common.h" #include "vp8/common/common.h"
#include "ratectrl.h" #include "ratectrl.h"
#include "vp8/common/entropymode.h" #include "vp8/common/entropymode.h"
...@@ -264,10 +265,8 @@ void vp8_setup_key_frame(VP8_COMP *cpi) { ...@@ -264,10 +265,8 @@ void vp8_setup_key_frame(VP8_COMP *cpi) {
vpx_memset(cm->mip, 0, vpx_memset(cm->mip, 0,
(cm->mb_cols + 1) * (cm->mb_rows + 1)* sizeof(MODE_INFO)); (cm->mb_cols + 1) * (cm->mb_rows + 1)* sizeof(MODE_INFO));
update_mode_info_border(cm, cm->mip); vp9_update_mode_info_border(cm, cm->mip);
update_mode_info_in_image(cm, cm->mi); vp9_update_mode_info_in_image(cm, cm->mi);
} }
void vp8_setup_inter_frame(VP8_COMP *cpi) { void vp8_setup_inter_frame(VP8_COMP *cpi) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment