ref: 6f9982e3c27598cb7958fdb0a43217ab10cfb5b9
parent: 799ab7c064ec4fec8f0ea1a480f814fc4d4e97bf
author: Johann <[email protected]>
date: Mon Jun 13 08:08:47 EDT 2016
vp8_[cd]x_iface.c: Initialize structures to 0 Use vp8_zero() or specify every element. Cleans warning in Android build: missing field 'deblocking_level' initializer vp8_ppflags_t flags = {0}; ^ missing field 'sz' initializer {0}, /* rc_twopass_stats_in */ ^ missing field 'sz' initializer {0}, /* rc_firstpass_mb_stats_in */ ^ missing field 'layer_target_bitrate' initializer }}, ^ missing field 'deblocking_level' initializer vp8_ppflags_t flags = {0}; ^ missing field 'mr_get_mem_loc' initializer } ^ Change-Id: Iaedde9a77faac7a40316aee67d60d02ba7313500
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -22,6 +22,7 @@
#include "vpx/vp8cx.h"
#include "vp8/encoder/firstpass.h"
#include "vp8/common/onyx.h"
+#include "vp8/common/common.h"
#include <stdlib.h>
#include <string.h>
@@ -1116,7 +1117,8 @@
{
YV12_BUFFER_CONFIG sd;
- vp8_ppflags_t flags = {0};
+ vp8_ppflags_t flags;
+ vp8_zero(flags);
if (ctx->preview_ppcfg.post_proc_flag)
{
@@ -1305,8 +1307,8 @@
30, /* rc_resize_up_thresold */
VPX_VBR, /* rc_end_usage */
- {0}, /* rc_twopass_stats_in */
- {0}, /* rc_firstpass_mb_stats_in */
+ {NULL, 0}, /* rc_twopass_stats_in */
+ {NULL, 0}, /* rc_firstpass_mb_stats_in */
256, /* rc_target_bandwidth */
4, /* rc_min_quantizer */
63, /* rc_max_quantizer */
@@ -1334,6 +1336,8 @@
{0}, /* ts_rate_decimator */
0, /* ts_periodicity */
{0}, /* ts_layer_id */
+ {0}, /* layer_target_bitrate */
+ 0 /* temporal_layering_mode */
}},
};
--- a/vp8/vp8_dx_iface.c
+++ b/vp8/vp8_dx_iface.c
@@ -522,7 +522,8 @@
{
YV12_BUFFER_CONFIG sd;
int64_t time_stamp = 0, time_end_stamp = 0;
- vp8_ppflags_t flags = {0};
+ vp8_ppflags_t flags;
+ vp8_zero(flags);
if (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC)
{
@@ -816,11 +817,12 @@
},
{ /* encoder functions */
0,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL
+ NULL, /* vpx_codec_enc_cfg_map_t */
+ NULL, /* vpx_codec_encode_fn_t */
+ NULL, /* vpx_codec_get_cx_data_fn_t */
+ NULL, /* vpx_codec_enc_config_set_fn_t */
+ NULL, /* vpx_codec_get_global_headers_fn_t */
+ NULL, /* vpx_codec_get_preview_frame_fn_t */
+ NULL /* vpx_codec_enc_mr_get_mem_loc_fn_t */
}
};