wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Don't declare variables after statements"

Browse source
This commit is contained in:
Marco Nelissen 2015-06-25 14:28:51 +00:00 • committed by Gerrit Code Review
commit aabbf6052f
10 changed files with 55 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

12
encoder/ih264e_api.c
View file

@ -2624,10 +2624,11 @@ static WORD32 ih264e_init(codec_t *ps_codec)
*/
static WORD32 ih264e_get_num_rec(void *pv_api_ip, void *pv_api_op)
{
UNUSED(pv_api_ip);
/* api call I/O structures */
ih264e_num_mem_rec_op_t *ps_op = pv_api_op;
UNUSED(pv_api_ip);
ps_op->s_ive_op.u4_num_mem_rec = MEM_REC_CNT;
return IV_SUCCESS;
@ -4512,13 +4513,14 @@ static WORD32 ih264e_set_flush_mode(iv_obj_t *ps_codec_obj,
void *pv_api_ip,
void *pv_api_op)
{
UNUSED(pv_api_ip);
/* codec ctxt */
codec_t *ps_codec = (codec_t *) ps_codec_obj->pv_codec_handle;
/* ctrl call I/O structures */
ih264e_ctl_flush_op_t *ps_ctl_op = pv_api_op;
UNUSED(pv_api_ip);
ps_ctl_op->s_ive_op.u4_error_code = 0;
/* signal flush frame control call */
@ -4557,7 +4559,6 @@ static WORD32 ih264e_get_buf_info(iv_obj_t *ps_codec_obj,
void *pv_api_ip,
void *pv_api_op)
{
UNUSED(ps_codec_obj);
/* ctrl call I/O structures */
ih264e_ctl_getbufinfo_ip_t *ps_ip = pv_api_ip;
ih264e_ctl_getbufinfo_op_t *ps_op = pv_api_op;
@ -4567,6 +4568,8 @@ static WORD32 ih264e_get_buf_info(iv_obj_t *ps_codec_obj,
WORD32 ht = ALIGN16(ps_ip->s_ive_ip.u4_max_ht);
WORD32 i;
UNUSED(ps_codec_obj);
ps_op->s_ive_op.u4_error_code = 0;
/* Number of components in input buffers required for codec &
@ -5273,13 +5276,14 @@ static WORD32 ih264e_reset(iv_obj_t *ps_codec_obj,
void *pv_api_ip,
void *pv_api_op)
{
UNUSED(pv_api_ip);
/* codec ctxt */
codec_t * ps_codec = (codec_t *) (ps_codec_obj->pv_codec_handle);
/* ctrl call I/O structures */
ih264e_ctl_reset_op_t *ps_op = pv_api_op;
UNUSED(pv_api_ip);
ps_op->s_ive_op.u4_error_code = 0;
if (ps_codec != NULL)

11
encoder/irc_rd_model.c
View file

@ -115,11 +115,6 @@ static UWORD8 find_model_coeffs(UWORD32 *pi4_res_bits,
UWORD8 u1_num_frms_used = 0;
UWORD8 u1_frm_indx;
#if !(ENABLE_QUAD_RC_MODEL||ENABLE_LIN_MODEL_WITH_INTERCEPT)
UNUSED(pu1_num_skips);
UNUSED(pmc_model_coeff);
UNUSED(pmc_model_coeff_lin);
#endif
float sum_y = 0;
float sum_x_y = 0;
float sum_x2_y = 0;
@ -131,6 +126,12 @@ static UWORD8 find_model_coeffs(UWORD32 *pi4_res_bits,
float x0, y0;
float model_coeff_a = 0.0, model_coeff_b = 0.0, model_coeff_c = 0.0;
#if !(ENABLE_QUAD_RC_MODEL||ENABLE_LIN_MODEL_WITH_INTERCEPT)
UNUSED(pu1_num_skips);
UNUSED(pmc_model_coeff);
UNUSED(pmc_model_coeff_lin);
#endif
for(i = 0; i < u1_num_frms; i++)
{
if(-1 == pi1_frame_index[i])

4
encoder/x86/ime_distortion_metrics_sse42.c
View file

@ -249,12 +249,12 @@ void ime_compute_sad_16x8_sse42(UWORD8 *pu1_src,
WORD32 i4_max_sad,
WORD32 *pi4_mb_distortion)
{
UNUSED (i4_max_sad);
__m128i src_r0, src_r1, src_r2, src_r3;
__m128i est_r0, est_r1, est_r2, est_r3;
__m128i res_r0, res_r1, res_r2, res_r3;
__m128i sad_val;
int val1, val2;
UNUSED (i4_max_sad);
// Row 0-3 sad calculation
src_r0 = _mm_loadu_si128((__m128i *) (pu1_src));
@ -500,7 +500,6 @@ void ime_compute_sad_16x16_fast_sse42(UWORD8 *pu1_src,
WORD32 i4_max_sad,
WORD32 *pi4_mb_distortion)
{
UNUSED (i4_max_sad);
__m128i src_r0, src_r1, src_r2, src_r3;
__m128i est_r0, est_r1, est_r2, est_r3;
__m128i res_r0, res_r1, res_r2, res_r3;
@ -509,6 +508,7 @@ void ime_compute_sad_16x16_fast_sse42(UWORD8 *pu1_src,
WORD32 i4_sad;
UWORD8 *pu1_src_temp = pu1_src + src_strd;
UWORD8 *pu1_est_temp = pu1_est + est_strd;
UNUSED (i4_max_sad);
// Row 0,2,4,6 sad calculation
src_r0 = _mm_loadu_si128((__m128i *) (pu1_src));