Mercurial > libavcodec.hg
comparison flacenc.c @ 12328:6b57b1b2095c libavcodec
cosmetics: rename find_subblock_rice_params() to find_subframe_rice_params()
| author | jbr |
|---|---|
| date | Sat, 31 Jul 2010 20:19:07 +0000 |
| parents | dd8053936c33 |
| children | 6644e439130d |
comparison
equal
deleted
inserted
replaced
| 12327:dd8053936c33 | 12328:6b57b1b2095c |
|---|---|
| 604 porder = FFMIN(porder, av_log2(n/order)); | 604 porder = FFMIN(porder, av_log2(n/order)); |
| 605 return porder; | 605 return porder; |
| 606 } | 606 } |
| 607 | 607 |
| 608 | 608 |
| 609 static uint32_t find_subblock_rice_params(FlacEncodeContext *s, | 609 static uint32_t find_subframe_rice_params(FlacEncodeContext *s, |
| 610 FlacSubframe *sub, int pred_order) | 610 FlacSubframe *sub, int pred_order) |
| 611 { | 611 { |
| 612 int pmin = get_max_p_order(s->options.min_partition_order, | 612 int pmin = get_max_p_order(s->options.min_partition_order, |
| 613 s->frame.blocksize, pred_order); | 613 s->frame.blocksize, pred_order); |
| 614 int pmax = get_max_p_order(s->options.max_partition_order, | 614 int pmax = get_max_p_order(s->options.max_partition_order, |
| 824 max_order = MAX_FIXED_ORDER; | 824 max_order = MAX_FIXED_ORDER; |
| 825 opt_order = 0; | 825 opt_order = 0; |
| 826 bits[0] = UINT32_MAX; | 826 bits[0] = UINT32_MAX; |
| 827 for (i = min_order; i <= max_order; i++) { | 827 for (i = min_order; i <= max_order; i++) { |
| 828 encode_residual_fixed(res, smp, n, i); | 828 encode_residual_fixed(res, smp, n, i); |
| 829 bits[i] = find_subblock_rice_params(s, sub, i); | 829 bits[i] = find_subframe_rice_params(s, sub, i); |
| 830 if (bits[i] < bits[opt_order]) | 830 if (bits[i] < bits[opt_order]) |
| 831 opt_order = i; | 831 opt_order = i; |
| 832 } | 832 } |
| 833 sub->order = opt_order; | 833 sub->order = opt_order; |
| 834 sub->type_code = sub->type | sub->order; | 834 sub->type_code = sub->type | sub->order; |
| 835 if (sub->order != max_order) { | 835 if (sub->order != max_order) { |
| 836 encode_residual_fixed(res, smp, n, sub->order); | 836 encode_residual_fixed(res, smp, n, sub->order); |
| 837 return find_subblock_rice_params(s, sub, sub->order); | 837 return find_subframe_rice_params(s, sub, sub->order); |
| 838 } | 838 } |
| 839 return bits[sub->order]; | 839 return bits[sub->order]; |
| 840 } | 840 } |
| 841 | 841 |
| 842 /* LPC */ | 842 /* LPC */ |
| 858 for (i = levels-1; i >= 0; i--) { | 858 for (i = levels-1; i >= 0; i--) { |
| 859 order = min_order + (((max_order-min_order+1) * (i+1)) / levels)-1; | 859 order = min_order + (((max_order-min_order+1) * (i+1)) / levels)-1; |
| 860 if (order < 0) | 860 if (order < 0) |
| 861 order = 0; | 861 order = 0; |
| 862 encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]); | 862 encode_residual_lpc(res, smp, n, order+1, coefs[order], shift[order]); |
| 863 bits[i] = find_subblock_rice_params(s, sub, order+1); | 863 bits[i] = find_subframe_rice_params(s, sub, order+1); |
| 864 if (bits[i] < bits[opt_index]) { | 864 if (bits[i] < bits[opt_index]) { |
| 865 opt_index = i; | 865 opt_index = i; |
| 866 opt_order = order; | 866 opt_order = order; |
| 867 } | 867 } |
| 868 } | 868 } |
| 872 uint32_t bits[MAX_LPC_ORDER]; | 872 uint32_t bits[MAX_LPC_ORDER]; |
| 873 opt_order = 0; | 873 opt_order = 0; |
| 874 bits[0] = UINT32_MAX; | 874 bits[0] = UINT32_MAX; |
| 875 for (i = min_order-1; i < max_order; i++) { | 875 for (i = min_order-1; i < max_order; i++) { |
| 876 encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); | 876 encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); |
| 877 bits[i] = find_subblock_rice_params(s, sub, i+1); | 877 bits[i] = find_subframe_rice_params(s, sub, i+1); |
| 878 if (bits[i] < bits[opt_order]) | 878 if (bits[i] < bits[opt_order]) |
| 879 opt_order = i; | 879 opt_order = i; |
| 880 } | 880 } |
| 881 opt_order++; | 881 opt_order++; |
| 882 } else if (omethod == ORDER_METHOD_LOG) { | 882 } else if (omethod == ORDER_METHOD_LOG) { |
| 890 int last = opt_order; | 890 int last = opt_order; |
| 891 for (i = last-step; i <= last+step; i += step) { | 891 for (i = last-step; i <= last+step; i += step) { |
| 892 if (i < min_order-1 || i >= max_order || bits[i] < UINT32_MAX) | 892 if (i < min_order-1 || i >= max_order || bits[i] < UINT32_MAX) |
| 893 continue; | 893 continue; |
| 894 encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); | 894 encode_residual_lpc(res, smp, n, i+1, coefs[i], shift[i]); |
| 895 bits[i] = find_subblock_rice_params(s, sub, i+1); | 895 bits[i] = find_subframe_rice_params(s, sub, i+1); |
| 896 if (bits[i] < bits[opt_order]) | 896 if (bits[i] < bits[opt_order]) |
| 897 opt_order = i; | 897 opt_order = i; |
| 898 } | 898 } |
| 899 } | 899 } |
| 900 opt_order++; | 900 opt_order++; |
| 906 for (i = 0; i < sub->order; i++) | 906 for (i = 0; i < sub->order; i++) |
| 907 sub->coefs[i] = coefs[sub->order-1][i]; | 907 sub->coefs[i] = coefs[sub->order-1][i]; |
| 908 | 908 |
| 909 encode_residual_lpc(res, smp, n, sub->order, sub->coefs, sub->shift); | 909 encode_residual_lpc(res, smp, n, sub->order, sub->coefs, sub->shift); |
| 910 | 910 |
| 911 return find_subblock_rice_params(s, sub, sub->order); | 911 return find_subframe_rice_params(s, sub, sub->order); |
| 912 } | 912 } |
| 913 | 913 |
| 914 | 914 |
| 915 static int count_frame_header(FlacEncodeContext *s) | 915 static int count_frame_header(FlacEncodeContext *s) |
| 916 { | 916 { |