RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/flacdsp: split off wasted bit handling into dsp functions 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-05-12 11:07:37 -03:00
parent c00c8679ed
commit 1ba5287697
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/flacdec.c
View File

@ -602,13 +602,9 @@ static inline int decode_subframe(FLACContext *s, int channel)
if (wasted) {
if (wasted+bps == 33) {
int i;
for (i = 0; i < s->blocksize; i++)
s->decoded_33bps[i] = (uint64_t)decoded[i] << wasted;
s->dsp.wasted33(s->decoded_33bps, decoded, wasted, s->blocksize);
} else if (wasted < 32) {
int i;
for (i = 0; i < s->blocksize; i++)
decoded[i] = (unsigned)decoded[i] << wasted;
s->dsp.wasted32(decoded, wasted, s->blocksize);
}
}

16
libavcodec/flacdsp.c
View File

@ -84,11 +84,27 @@ static void flac_lpc_32_c(int32_t *decoded, const int coeffs[32],
}
static void flac_wasted_32_c(int32_t *decoded, int wasted, int len)
{
for (int i = 0; i < len; i++)
decoded[i] = (unsigned)decoded[i] << wasted;
}
static void flac_wasted_33_c(int64_t *decoded, const int32_t *residual,
int wasted, int len)
{
for (int i = 0; i < len; i++)
decoded[i] = (uint64_t)residual[i] << wasted;
}
av_cold void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int channels)
{
c->lpc16 = flac_lpc_16_c;
c->lpc32 = flac_lpc_32_c;
c->wasted32 = flac_wasted_32_c;
c->wasted33 = flac_wasted_33_c;
switch (fmt) {
case AV_SAMPLE_FMT_S32:
c->decorrelate[0] = flac_decorrelate_indep_c_32;

3
libavcodec/flacdsp.h
View File

@ -30,6 +30,9 @@ typedef struct FLACDSPContext {
int qlevel, int len);
void (*lpc32)(int32_t *samples, const int coeffs[32], int order,
int qlevel, int len);
void (*wasted32)(int32_t *decoded, int wasted, int len);
void (*wasted33)(int64_t *decoded, const int32_t *residual,
int wasted, int len);
void (*lpc16_encode)(int32_t *res, const int32_t *smp, int len, int order,
const int32_t coefs[32], int shift);
void (*lpc32_encode)(int32_t *res, const int32_t *smp, int len, int order,