Re: [PATCH 03/11] Make increment variable

[Marcel Holtmann <marcel@holtmann.org>]

Hi Fred,

>  sbc/sbc.c            |   13 +++++++------
>  sbc/sbc_primitives.h |    5 +++--
>  2 files changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/sbc/sbc.c b/sbc/sbc.c
> index 08b4993..6fff132 100644
> --- a/sbc/sbc.c
> +++ b/sbc/sbc.c
> @@ -688,30 +688,30 @@ static int sbc_analyze_audio(struct sbc_encoder_state *state,
>  	switch (frame->subbands) {
>  	case 4:
>  		for (ch = 0; ch < frame->channels; ch++) {
> -			x = &state->X[ch][state->position - 16 +
> +			x = &state->X[ch][state->position - 4 * state->inc +
>  							frame->blocks * 4];
> -			for (blk = 0; blk < frame->blocks; blk += 4) {
> +			for (blk = 0; blk < frame->blocks; blk += state->inc) {
>  				state->sbc_analyze_4b_4s(
>  					state, x,
>  					frame->sb_sample_f[blk][ch],
>  					frame->sb_sample_f[blk + 1][ch] -
>  					frame->sb_sample_f[blk][ch]);
> -				x -= 16;
> +				x -= 4 * state->inc;
>  			}
>  		}
>  		return frame->blocks * 4;
>  
>  	case 8:
>  		for (ch = 0; ch < frame->channels; ch++) {
> -			x = &state->X[ch][state->position - 32 +
> +			x = &state->X[ch][state->position - 8 * state->inc +
>  							frame->blocks * 8];
> -			for (blk = 0; blk < frame->blocks; blk += 4) {
> +			for (blk = 0; blk < frame->blocks; blk += state->inc) {
>  				state->sbc_analyze_4b_8s(
>  					state, x,
>  					frame->sb_sample_f[blk][ch],
>  					frame->sb_sample_f[blk + 1][ch] -
>  					frame->sb_sample_f[blk][ch]);
> -				x -= 32;
> +				x -= 8 * state->inc;
>  			}
>  		}
>  		return frame->blocks * 8;
> @@ -906,6 +906,7 @@ static void sbc_encoder_init(struct sbc_encoder_state *state,
>  {
>  	memset(&state->X, 0, sizeof(state->X));
>  	state->position = (SBC_X_BUFFER_SIZE - frame->subbands * 9) & ~7;
> +	state->inc = 4;
>  
>  	sbc_init_primitives(state);
>  }
> diff --git a/sbc/sbc_primitives.h b/sbc/sbc_primitives.h
> index 47363db..39cfbf2 100644
> --- a/sbc/sbc_primitives.h
> +++ b/sbc/sbc_primitives.h
> @@ -38,13 +38,14 @@
>  
>  struct sbc_encoder_state {
>  	int position;
> +	int inc;

I dislike the name, it is a bit short. Using ->increment seems to be a
bit better.

And what about documenting what it is for.

Regards

Marcel