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

Remove the now unused stride field from the set dimensions struct

Browse source 
Since 90a3904fd3 and d020be5ac7, this field doesn't have any actual
effect - the strides are taken from the input pictures.

Bug: 22860270

Change-Id: I9b08cbf8ee558e038d0017a6176d7b3bd3c428bd
This commit is contained in:
Martin Storsjo 2015-06-10 14:15:24 +03:00 • committed by Marco Nelissen
parent 0cf554f73b
commit b0aadd0c45
3 changed files with 0 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
encoder/ih264e_api.c
View file

@ -1819,18 +1819,11 @@ IH264E_ERROR_T ih264e_codec_update_config(codec_t *ps_codec,
UWORD32 ht_aln = ALIGN16(ps_cfg->u4_ht);
if (ps_curr_cfg->u4_wd != wd_aln || ps_curr_cfg->u4_ht != ht_aln
|| ps_curr_cfg->u4_strd != ps_cfg->u4_strd
|| ps_curr_cfg->u4_disp_wd != ps_cfg->u4_disp_wd
|| ps_curr_cfg->u4_disp_ht != ps_cfg->u4_disp_ht)
{
ps_curr_cfg->u4_wd = wd_aln;
ps_curr_cfg->u4_ht = ht_aln;
ps_curr_cfg->u4_strd = ps_cfg->u4_strd;
if (ps_curr_cfg->u4_strd == 0)
{
ps_curr_cfg->u4_strd = ps_curr_cfg->u4_wd;
}
ps_curr_cfg->u4_disp_wd = ps_cfg->u4_disp_wd;
ps_curr_cfg->u4_disp_ht = ps_cfg->u4_disp_ht;
@ -2320,7 +2313,6 @@ static WORD32 ih264e_set_default_params(cfg_params_t *ps_cfg)
ps_cfg->u4_disp_ht = MAX_HT;
ps_cfg->u4_wd = MAX_WD;
ps_cfg->u4_ht = MAX_HT;
ps_cfg->u4_strd = ALIGN16(MAX_WD);
ps_cfg->u4_src_frame_rate = DEFAULT_SRC_FRAME_RATE;
ps_cfg->u4_tgt_frame_rate = DEFAULT_TGT_FRAME_RATE;
ps_cfg->u4_target_bitrate = DEFAULT_BITRATE;
@ -4667,7 +4659,6 @@ static IV_STATUS_T ih264e_set_dimensions(void *pv_api_ip,
ps_cfg->u4_wd = ALIGN16(ps_ip->s_ive_ip.u4_wd);
ps_cfg->u4_ht = ALIGN16(ps_ip->s_ive_ip.u4_ht);
ps_cfg->u4_strd = ps_ip->s_ive_ip.u4_strd;
ps_cfg->i4_wd_mbs = ps_cfg->u4_wd >> 4;
ps_cfg->i4_ht_mbs = ps_cfg->u4_ht >> 4;
ps_cfg->u4_disp_wd = ps_ip->s_ive_ip.u4_wd;

3
encoder/ive2.h
View file

@ -848,9 +848,6 @@ typedef struct
/** Input height */
UWORD32 u4_ht;
/** Input stride */
UWORD32 u4_strd;
/** Lower 32bits of time stamp corresponding to input buffer,
* from which this command takes effect */
UWORD32 u4_timestamp_low;

1
test/encoder/main.c
View file

@ -1011,7 +1011,6 @@ void set_dimensions(app_ctxt_t *ps_app_ctxt,
s_frame_dimensions_ip.s_ive_ip.u4_ht = ps_app_ctxt->u4_ht;
s_frame_dimensions_ip.s_ive_ip.u4_wd = ps_app_ctxt->u4_wd;
s_frame_dimensions_ip.s_ive_ip.u4_strd = ps_app_ctxt->u4_strd;
s_frame_dimensions_ip.s_ive_ip.u4_timestamp_high = u4_timestamp_high;
s_frame_dimensions_ip.s_ive_ip.u4_timestamp_low = u4_timestamp_low;