Skip to content
GitLab
Commit 6281a9ab authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Adding type casts to remove C++ compiler errors. 

Change-Id: I224e49955ad6c833d204feb8efc4056e37d206be
parent 29beeff1
v1.14.0-linphone 1.4.X feature/update_to_v1.9.0-linphone feature/uwp_nuget frame_parallel highbitdepth indianrunnerduck javanwhistlingduck khakicampbell linphone linphone-android linphone-old longtailedduck m49-2623 m52-2743 m54-2840 m56-2924 m66-3359 m68-3440 mandarinduck nextgen nextgenv2 playground sandbox/Jingning/experimental sandbox/Jingning/transcode sandbox/Jingning/vpx sandbox/aconverse@google.com/ansbench 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 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
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 18 additions and 13 deletions
vp9/common/vp9_alloccommon.c
+ 14
− 10
View file @ 6281a9ab
...@@ -101,22 +101,24 @@ int vp9_resize_frame_buffers(VP9_COMMON *cm, int width, int height) { ...@@ -101,22 +101,24 @@ int vp9_resize_frame_buffers(VP9_COMMON *cm, int width, int height) {
mi_size = cm->mode_info_stride * (cm->mi_rows + MI_BLOCK_SIZE); mi_size = cm->mode_info_stride * (cm->mi_rows + MI_BLOCK_SIZE);
vpx_free(cm->mip); vpx_free(cm->mip);
cm->mip = vpx_calloc(mi_size, sizeof(MODE_INFO)); cm->mip = (MODE_INFO *)vpx_calloc(mi_size, sizeof(MODE_INFO));
if (!cm->mip) if (!cm->mip)
goto fail; goto fail;
vpx_free(cm->prev_mip); vpx_free(cm->prev_mip);
cm->prev_mip = vpx_calloc(mi_size, sizeof(MODE_INFO)); cm->prev_mip = (MODE_INFO *)vpx_calloc(mi_size, sizeof(MODE_INFO));
if (!cm->prev_mip) if (!cm->prev_mip)
goto fail; goto fail;
vpx_free(cm->mi_grid_base); vpx_free(cm->mi_grid_base);
cm->mi_grid_base = vpx_calloc(mi_size, sizeof(*cm->mi_grid_base)); cm->mi_grid_base =
(MODE_INFO **)vpx_calloc(mi_size, sizeof(*cm->mi_grid_base));
if (!cm->mi_grid_base) if (!cm->mi_grid_base)
goto fail; goto fail;
vpx_free(cm->prev_mi_grid_base); vpx_free(cm->prev_mi_grid_base);
cm->prev_mi_grid_base = vpx_calloc(mi_size, sizeof(*cm->prev_mi_grid_base)); cm->prev_mi_grid_base =
(MODE_INFO **)vpx_calloc(mi_size, sizeof(*cm->prev_mi_grid_base));
if (!cm->prev_mi_grid_base) if (!cm->prev_mi_grid_base)
goto fail; goto fail;
...@@ -124,7 +126,7 @@ int vp9_resize_frame_buffers(VP9_COMMON *cm, int width, int height) { ...@@ -124,7 +126,7 @@ int vp9_resize_frame_buffers(VP9_COMMON *cm, int width, int height) {
// Create the segmentation map structure and set to 0. // Create the segmentation map structure and set to 0.
vpx_free(cm->last_frame_seg_map); vpx_free(cm->last_frame_seg_map);
cm->last_frame_seg_map = vpx_calloc(cm->mi_rows * cm->mi_cols, 1); cm->last_frame_seg_map = (uint8_t *)vpx_calloc(cm->mi_rows * cm->mi_cols, 1);
if (!cm->last_frame_seg_map) if (!cm->last_frame_seg_map)
goto fail; goto fail;
...@@ -170,26 +172,28 @@ int vp9_alloc_frame_buffers(VP9_COMMON *cm, int width, int height) { ...@@ -170,26 +172,28 @@ int vp9_alloc_frame_buffers(VP9_COMMON *cm, int width, int height) {
// Allocation // Allocation
mi_size = cm->mode_info_stride * (cm->mi_rows + MI_BLOCK_SIZE); mi_size = cm->mode_info_stride * (cm->mi_rows + MI_BLOCK_SIZE);
cm->mip = vpx_calloc(mi_size, sizeof(MODE_INFO)); cm->mip = (MODE_INFO *)vpx_calloc(mi_size, sizeof(MODE_INFO));
if (!cm->mip) if (!cm->mip)
goto fail; goto fail;
cm->prev_mip = vpx_calloc(mi_size, sizeof(MODE_INFO)); cm->prev_mip = (MODE_INFO *)vpx_calloc(mi_size, sizeof(MODE_INFO));
if (!cm->prev_mip) if (!cm->prev_mip)
goto fail; goto fail;
cm->mi_grid_base = vpx_calloc(mi_size, sizeof(*cm->mi_grid_base)); cm->mi_grid_base =
(MODE_INFO **)vpx_calloc(mi_size, sizeof(*cm->mi_grid_base));
if (!cm->mi_grid_base) if (!cm->mi_grid_base)
goto fail; goto fail;
cm->prev_mi_grid_base = vpx_calloc(mi_size, sizeof(*cm->prev_mi_grid_base)); cm->prev_mi_grid_base =
(MODE_INFO **)vpx_calloc(mi_size, sizeof(*cm->prev_mi_grid_base));
if (!cm->prev_mi_grid_base) if (!cm->prev_mi_grid_base)
goto fail; goto fail;
setup_mi(cm); setup_mi(cm);
// Create the segmentation map structure and set to 0. // Create the segmentation map structure and set to 0.
cm->last_frame_seg_map = vpx_calloc(cm->mi_rows * cm->mi_cols, 1); cm->last_frame_seg_map = (uint8_t *)vpx_calloc(cm->mi_rows * cm->mi_cols, 1);
if (!cm->last_frame_seg_map) if (!cm->last_frame_seg_map)
goto fail; goto fail;
......
vp9/common/vp9_frame_buffers.c
+ 3
− 2
View file @ 6281a9ab
...@@ -19,8 +19,9 @@ int vp9_alloc_internal_frame_buffers(InternalFrameBufferList *list) { ...@@ -19,8 +19,9 @@ int vp9_alloc_internal_frame_buffers(InternalFrameBufferList *list) {
list->num_internal_frame_buffers = list->num_internal_frame_buffers =
VP9_MAXIMUM_REF_BUFFERS + VPX_MAXIMUM_WORK_BUFFERS; VP9_MAXIMUM_REF_BUFFERS + VPX_MAXIMUM_WORK_BUFFERS;
list->int_fb = vpx_calloc(list->num_internal_frame_buffers, list->int_fb =
sizeof(*list->int_fb)); (InternalFrameBuffer *)vpx_calloc(list->num_internal_frame_buffers,
sizeof(*list->int_fb));
return (list->int_fb == NULL); return (list->int_fb == NULL);
} }
......
vpx/src/vpx_encoder.c
+ 1
− 1
View file @ 6281a9ab
...@@ -394,7 +394,7 @@ const vpx_codec_cx_pkt_t *vpx_codec_pkt_list_get(struct vpx_codec_pkt_list *list ...@@ -394,7 +394,7 @@ const vpx_codec_cx_pkt_t *vpx_codec_pkt_list_get(struct vpx_codec_pkt_list *list
*iter = list->pkts; *iter = list->pkts;
} }
pkt = (const void *) * iter; pkt = (const vpx_codec_cx_pkt_t *)*iter;
if ((size_t)(pkt - list->pkts) < list->cnt) if ((size_t)(pkt - list->pkts) < list->cnt)
*iter = pkt + 1; *iter = pkt + 1;
......
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