Mercurial > libavcodec.hg
comparison flacenc.c @ 12322:530bf62f3940 libavcodec
Remove unneeded wrapper function.
| author | jbr |
|---|---|
| date | Sat, 31 Jul 2010 16:50:27 +0000 |
| parents | b2940a8f3db6 |
| children | df22caaab59e |
comparison
equal
deleted
inserted
replaced
| 12321:b2940a8f3db6 | 12322:530bf62f3940 |
|---|---|
| 627 pmin = get_max_p_order(pmin, n, pred_order); | 627 pmin = get_max_p_order(pmin, n, pred_order); |
| 628 pmax = get_max_p_order(pmax, n, pred_order); | 628 pmax = get_max_p_order(pmax, n, pred_order); |
| 629 bits = pred_order*bps + 4 + 5 + pred_order*precision + 6; | 629 bits = pred_order*bps + 4 + 5 + pred_order*precision + 6; |
| 630 bits += calc_rice_params(rc, pmin, pmax, data, n, pred_order); | 630 bits += calc_rice_params(rc, pmin, pmax, data, n, pred_order); |
| 631 return bits; | 631 return bits; |
| 632 } | |
| 633 | |
| 634 | |
| 635 static void encode_residual_verbatim(int32_t *res, int32_t *smp, int n) | |
| 636 { | |
| 637 assert(n > 0); | |
| 638 memcpy(res, smp, n * sizeof(int32_t)); | |
| 639 } | 632 } |
| 640 | 633 |
| 641 | 634 |
| 642 static void encode_residual_fixed(int32_t *res, const int32_t *smp, int n, | 635 static void encode_residual_fixed(int32_t *res, const int32_t *smp, int n, |
| 643 int order) | 636 int order) |
| 822 } | 815 } |
| 823 | 816 |
| 824 /* VERBATIM */ | 817 /* VERBATIM */ |
| 825 if (frame->verbatim_only || n < 5) { | 818 if (frame->verbatim_only || n < 5) { |
| 826 sub->type = sub->type_code = FLAC_SUBFRAME_VERBATIM; | 819 sub->type = sub->type_code = FLAC_SUBFRAME_VERBATIM; |
| 827 encode_residual_verbatim(res, smp, n); | 820 memcpy(res, smp, n * sizeof(int32_t)); |
| 828 return sub->obits * n; | 821 return sub->obits * n; |
| 829 } | 822 } |
| 830 | 823 |
| 831 min_order = s->options.min_prediction_order; | 824 min_order = s->options.min_prediction_order; |
| 832 max_order = s->options.max_prediction_order; | 825 max_order = s->options.max_prediction_order; |