Unified · Split
| @@ -56,14 +56,10 @@ · 55 unmodified lines | ||
| 56 | 56 | |
| 57 | 57 | #define sclip(x) av_clip(x,60,218) |
| 58 | 58 | |
| 59 | − | |
| 60 | −static av_always_inline int ff_pns_bits(const SingleChannelElement *sce, int w, int g) | |
| 59 | +/* Reflects the cost to change codebooks */ | |
| 60 | +static inline int ff_pns_bits(SingleChannelElement *sce, int w, int g) | |
| 61 | 61 | { |
| 62 | − if (!g || !sce->zeroes[w*16+g-1] || !sce->can_pns[w*16+g-1]) { | |
| 63 | − return 9; | |
| 64 | − } else { | |
| 65 | − return 5; | |
| 66 | − } | |
| 62 | + return (!g || !sce->zeroes[w*16+g-1] || !sce->can_pns[w*16+g-1]) ? 9 : 5; | |
| 67 | 63 | } |
| 68 | 64 | |
| 69 | 65 | /** |