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

Combine and simplify output_subframe_fixed() and output_subframe_lpc(). 

Originally committed as revision 24605 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2010-07-30 20:28:46 +00:00
parent 89912b5ff1
commit 175a57113f
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/flacenc.c
View File

@ -1147,36 +1147,22 @@ static void output_residual(FlacEncodeContext *s, FlacSubframe *sub)
}
static void output_subframe_fixed(FlacEncodeContext *s, FlacSubframe *sub)
static void output_subframe_lpc(FlacEncodeContext *s, FlacSubframe *sub)
{
int i;
/* warm-up samples */
for (i = 0; i < sub->order; i++)
put_sbits(&s->pb, sub->obits, sub->residual[i]);
/* residual */
output_residual(s, sub);
}
static void output_subframe_lpc(FlacEncodeContext *s, FlacSubframe *sub)
{
int i, cbits;
FlacFrame *frame;
frame = &s->frame;
/* warm-up samples */
for (i = 0; i < sub->order; i++)
put_sbits(&s->pb, sub->obits, sub->residual[i]);
/* LPC coefficients */
cbits = s->options.lpc_coeff_precision;
if (sub->type == FLAC_SUBFRAME_LPC) {
int cbits = s->options.lpc_coeff_precision;
put_bits( &s->pb, 4, cbits-1);
put_sbits(&s->pb, 5, sub->shift);
for (i = 0; i < sub->order; i++)
put_sbits(&s->pb, cbits, sub->coefs[i]);
}
/* residual */
output_residual(s, sub);
@ -1203,7 +1189,7 @@ static void output_subframes(FlacEncodeContext *s)
switch (sub->type) {
case FLAC_SUBFRAME_CONSTANT:
case FLAC_SUBFRAME_VERBATIM: output_subframe_verbatim(s, sub); break;
case FLAC_SUBFRAME_FIXED: output_subframe_fixed( s, sub); break;
case FLAC_SUBFRAME_FIXED:
case FLAC_SUBFRAME_LPC: output_subframe_lpc( s, sub); break;
}
}