diff options
| author | Martin Storsjo <martin@martin.st> | 2015-06-10 14:15:24 +0300 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-07-31 18:48:14 +0000 |
| commit | b0aadd0c45cb959d102cbe39ab870e4e3292ce97 (patch) | |
| tree | 496af72c4498091bd074a1b573fc36d1d3f72c85 /encoder | |
| parent | 0cf554f73bbac4df9499cd7a4497e09c282d9e70 (diff) | |
| download | android_external_libavc-b0aadd0c45cb959d102cbe39ab870e4e3292ce97.tar.gz android_external_libavc-b0aadd0c45cb959d102cbe39ab870e4e3292ce97.tar.bz2 android_external_libavc-b0aadd0c45cb959d102cbe39ab870e4e3292ce97.zip | |
Remove the now unused stride field from the set dimensions struct
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
Diffstat (limited to 'encoder')
| -rw-r--r-- | encoder/ih264e_api.c | 9 | ||||
| -rw-r--r-- | encoder/ive2.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/encoder/ih264e_api.c b/encoder/ih264e_api.c index 96122de..c034681 100644 --- a/encoder/ih264e_api.c +++ b/encoder/ih264e_api.c @@ -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; diff --git a/encoder/ive2.h b/encoder/ive2.h index 7a543bb..cbf7087 100644 --- a/encoder/ive2.h +++ b/encoder/ive2.h @@ -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; |