[SCM] libav/experimental: Combine and simplify output_subframe_fixed() and output_subframe_lpc().
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:13:06 UTC 2013
The following commit has been merged in the experimental branch:
commit 175a57113f932dc6ebf13385970d46d22cc8236e
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Fri Jul 30 20:28:46 2010 +0000
Combine and simplify output_subframe_fixed() and output_subframe_lpc().
Originally committed as revision 24605 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index ef29548..e7d1921 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -1147,36 +1147,22 @@ static void output_residual(FlacEncodeContext *s, FlacSubframe *sub)
}
-static void output_subframe_fixed(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;
+ int i;
/* 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;
}
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list