| Message ID | 20240621212013.188475-1-leo.izen@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,v2] avcodec/aacdec_lpd: remove unused local variables | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 6/21/24 5:20 PM, Leo Izen wrote: > int idx, and int first_tcx_flag are set but not used, so this commit > removes their declarations and assignments. > --- > libavcodec/aac/aacdec_lpd.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/libavcodec/aac/aacdec_lpd.c b/libavcodec/aac/aacdec_lpd.c > index 796edd2ab5..91a3268889 100644 > --- a/libavcodec/aac/aacdec_lpd.c > +++ b/libavcodec/aac/aacdec_lpd.c > @@ -99,7 +99,7 @@ static void parse_qn(GetBitContext *gb, int *qn, int nk_mode, int no_qn) > static int parse_codebook_idx(GetBitContext *gb, uint32_t *kv, > int nk_mode, int no_qn) > { > - int idx, n, nk; > + int n, nk; > > int qn[2]; > parse_qn(gb, qn, nk_mode, no_qn); > @@ -114,7 +114,7 @@ static int parse_codebook_idx(GetBitContext *gb, uint32_t *kv, > } > } > > - idx = get_bits(gb, 4*n); > + skip_bits(gb, 4*n); > > if (nk > 0) > for (int i = 0; i < 8; i++) > @@ -145,7 +145,6 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, > int k; > const uint8_t *mod; > int first_ldp_flag; > - int first_tcx_flag; > > ce->ldp.acelp_core_mode = get_bits(gb, 3); > ce->ldp.lpd_mode = get_bits(gb, 5); > @@ -157,7 +156,6 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, > mod = ff_aac_lpd_mode_tab[ce->ldp.lpd_mode]; > > first_ldp_flag = !ce->ldp.core_mode_last; > - first_tcx_flag = 1; > if (first_ldp_flag) > ce->ldp.last_lpd_mode = -1; /* last_ldp_mode is a **STATEFUL** value */ > > @@ -179,7 +177,6 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, > // parse_tcx_coding(); > ce->ldp.last_lpd_mode = mod[k]; > k += (1 << (mod[k] - 1)); > - first_tcx_flag = 0; > } > } > Bumping for review. - Leo Izen (Traneptora)
On 21/06/2024 23:20, Leo Izen wrote: > int idx, and int first_tcx_flag are set but not used, so this commit > removes their declarations and assignments. > --- > libavcodec/aac/aacdec_lpd.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/libavcodec/aac/aacdec_lpd.c b/libavcodec/aac/aacdec_lpd.c > index 796edd2ab5..91a3268889 100644 > --- a/libavcodec/aac/aacdec_lpd.c > +++ b/libavcodec/aac/aacdec_lpd.c > @@ -99,7 +99,7 @@ static void parse_qn(GetBitContext *gb, int *qn, int nk_mode, int no_qn) > static int parse_codebook_idx(GetBitContext *gb, uint32_t *kv, > int nk_mode, int no_qn) > { > - int idx, n, nk; > + int n, nk; > > int qn[2]; > parse_qn(gb, qn, nk_mode, no_qn); > @@ -114,7 +114,7 @@ static int parse_codebook_idx(GetBitContext *gb, uint32_t *kv, > } > } > > - idx = get_bits(gb, 4*n); > + skip_bits(gb, 4*n); > > if (nk > 0) > for (int i = 0; i < 8; i++) > @@ -145,7 +145,6 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, > int k; > const uint8_t *mod; > int first_ldp_flag; > - int first_tcx_flag; > > ce->ldp.acelp_core_mode = get_bits(gb, 3); > ce->ldp.lpd_mode = get_bits(gb, 5); > @@ -157,7 +156,6 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, > mod = ff_aac_lpd_mode_tab[ce->ldp.lpd_mode]; > > first_ldp_flag = !ce->ldp.core_mode_last; > - first_tcx_flag = 1; > if (first_ldp_flag) > ce->ldp.last_lpd_mode = -1; /* last_ldp_mode is a **STATEFUL** value */ > > @@ -179,7 +177,6 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, > // parse_tcx_coding(); > ce->ldp.last_lpd_mode = mod[k]; > k += (1 << (mod[k] - 1)); > - first_tcx_flag = 0; > } > } > Sorry, missed this patch, LGTM.
On 6/27/24 1:27 PM, Lynne via ffmpeg-devel wrote: > On 21/06/2024 23:20, Leo Izen wrote: >> int idx, and int first_tcx_flag are set but not used, so this commit >> removes their declarations and assignments. > > Sorry, missed this patch, LGTM. > Applied as 539d2e989d7ce3556a549d59ee9c5125ae7d7b6b - Leo Izen (Traneptora)
diff --git a/libavcodec/aac/aacdec_lpd.c b/libavcodec/aac/aacdec_lpd.c index 796edd2ab5..91a3268889 100644 --- a/libavcodec/aac/aacdec_lpd.c +++ b/libavcodec/aac/aacdec_lpd.c @@ -99,7 +99,7 @@ static void parse_qn(GetBitContext *gb, int *qn, int nk_mode, int no_qn) static int parse_codebook_idx(GetBitContext *gb, uint32_t *kv, int nk_mode, int no_qn) { - int idx, n, nk; + int n, nk; int qn[2]; parse_qn(gb, qn, nk_mode, no_qn); @@ -114,7 +114,7 @@ static int parse_codebook_idx(GetBitContext *gb, uint32_t *kv, } } - idx = get_bits(gb, 4*n); + skip_bits(gb, 4*n); if (nk > 0) for (int i = 0; i < 8; i++) @@ -145,7 +145,6 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, int k; const uint8_t *mod; int first_ldp_flag; - int first_tcx_flag; ce->ldp.acelp_core_mode = get_bits(gb, 3); ce->ldp.lpd_mode = get_bits(gb, 5); @@ -157,7 +156,6 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, mod = ff_aac_lpd_mode_tab[ce->ldp.lpd_mode]; first_ldp_flag = !ce->ldp.core_mode_last; - first_tcx_flag = 1; if (first_ldp_flag) ce->ldp.last_lpd_mode = -1; /* last_ldp_mode is a **STATEFUL** value */ @@ -179,7 +177,6 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac, // parse_tcx_coding(); ce->ldp.last_lpd_mode = mod[k]; k += (1 << (mod[k] - 1)); - first_tcx_flag = 0; } }