Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mlpenc: fix quant_step_size for 16bit sample format input

Browse Source
pull/390/head
Paul B Mahol 1 year ago
parent ffc783dea7
commit 7a444501d5
1 changed files with 4 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      libavcodec/mlpenc.c

7
libavcodec/mlpenc.c
Unescape View File

@ -1259,13 +1259,13 @@ static void input_to_sample_buffer(MLPEncodeContext *ctx)
****************************************************************************/ ****************************************************************************/
/** Counts the number of trailing zeroes in a value */ /** Counts the number of trailing zeroes in a value */
static int number_trailing_zeroes(int32_t sample) static int number_trailing_zeroes(int32_t sample, const int wordlength)
{ {
int bits = ff_ctz(sample); int bits = ff_ctz(sample);
/* All samples are 0. TODO Return previous quant_step_size to avoid /* All samples are 0. TODO Return previous quant_step_size to avoid
* writing a new header. */ * writing a new header. */
if (bits >= 24) if (bits >= wordlength)
return 0; return 0;
return bits; return bits;
@ -1279,6 +1279,7 @@ static void determine_quant_step_size(MLPEncodeContext *ctx)
DecodingParams *dp = ctx->cur_decoding_params; DecodingParams *dp = ctx->cur_decoding_params;
RestartHeader *rh = ctx->cur_restart_header; RestartHeader *rh = ctx->cur_restart_header;
MatrixParams *mp = &dp->matrix_params; MatrixParams *mp = &dp->matrix_params;
const int wordlength = ctx->wordlength;
int32_t *sample_buffer = ctx->sample_buffer; int32_t *sample_buffer = ctx->sample_buffer;
int32_t sample_mask[MAX_CHANNELS]; int32_t sample_mask[MAX_CHANNELS];
@ -1292,7 +1293,7 @@ static void determine_quant_step_size(MLPEncodeContext *ctx)
} }
for (unsigned int channel = 0; channel <= rh->max_channel; channel++) for (unsigned int channel = 0; channel <= rh->max_channel; channel++)
dp->quant_step_size[channel] = number_trailing_zeroes(sample_mask[channel]) - mp->shift[channel]; dp->quant_step_size[channel] = number_trailing_zeroes(sample_mask[channel], wordlength) - mp->shift[channel];
} }
/** Determines the smallest number of bits needed to encode the filter /** Determines the smallest number of bits needed to encode the filter

Write Preview
Loading…
Cancel
Save