Only used here.
Showing the changes to libavcodec (2 of 2 files). Show all
Unified · Split
| @@ -88,6 +88,9 @@ static int encode_picture(MpegEncContext *s, const AVPacket *pkt); · 87 unmodified lines | |||
| 88 | static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale); | 88 | static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale); |
| 89 | static int sse_mb(MpegEncContext *s); | 89 | static int sse_mb(MpegEncContext *s); |
| 90 | static void denoise_dct_c(MpegEncContext *s, int16_t *block); | 90 | static void denoise_dct_c(MpegEncContext *s, int16_t *block); |
| 91 | static int dct_quantize_c(MpegEncContext *s, | ||
| 92 | int16_t *block, int n, | ||
| 93 | int qscale, int *overflow); | ||
| 91 | static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); | 94 | static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); |
| 92 | 95 | ||
| 93 | static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_DMV * 2 + 1]; | 96 | static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_DMV * 2 + 1]; |
| @@ -297,7 +300,7 @@ av_cold int ff_dct_encode_init(MpegEncContext *s) · 203 unmodified lines | |||
| 297 | if (CONFIG_H263_ENCODER) | 300 | if (CONFIG_H263_ENCODER) |
| 298 | ff_h263dsp_init(&s->h263dsp); | 301 | ff_h263dsp_init(&s->h263dsp); |
| 299 | if (!s->dct_quantize) | 302 | if (!s->dct_quantize) |
| 300 | s->dct_quantize = ff_dct_quantize_c; | 303 | s->dct_quantize = dct_quantize_c; |
| 301 | if (!s->denoise_dct) | 304 | if (!s->denoise_dct) |
| 302 | s->denoise_dct = denoise_dct_c; | 305 | s->denoise_dct = denoise_dct_c; |
| 303 | s->fast_dct_quantize = s->dct_quantize; | 306 | s->fast_dct_quantize = s->dct_quantize; |
| @@ -2425,7 +2428,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, · 2121 unmodified lines | |||
| 2425 | } | 2428 | } |
| 2426 | 2429 | ||
| 2427 | // non c quantize code returns incorrect block_last_index FIXME | 2430 | // non c quantize code returns incorrect block_last_index FIXME |
| 2428 | if (s->alternate_scan && s->dct_quantize != ff_dct_quantize_c) { | 2431 | if (s->alternate_scan && s->dct_quantize != dct_quantize_c) { |
| 2429 | for (i = 0; i < mb_block_count; i++) { | 2432 | for (i = 0; i < mb_block_count; i++) { |
| 2430 | int j; | 2433 | int j; |
| 2431 | if (s->block_last_index[i] > 0) { | 2434 | if (s->block_last_index[i] > 0) { |
| @@ -4554,9 +4557,9 @@ void ff_block_permute(int16_t *block, const uint8_t *permutation, · 2122 unmodified lines | |||
| 4554 | } | 4557 | } |
| 4555 | } | 4558 | } |
| 4556 | 4559 | ||
| 4557 | int ff_dct_quantize_c(MpegEncContext *s, | 4560 | static int dct_quantize_c(MpegEncContext *s, |
| 4558 | int16_t *block, int n, | 4561 | int16_t *block, int n, |
| 4559 | int qscale, int *overflow) | 4562 | int qscale, int *overflow) |
| 4560 | { | 4563 | { |
| 4561 | int i, j, level, last_non_zero, q, start_i; | 4564 | int i, j, level, last_non_zero, q, start_i; |
| 4562 | const int *qmat; | 4565 | const int *qmat; |
| @@ -148,7 +148,6 @@ void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix); · 147 unmodified lines | |||
| 148 | int ff_dct_encode_init(MpegEncContext *s); | 148 | int ff_dct_encode_init(MpegEncContext *s); |
| 149 | void ff_dct_encode_init_x86(MpegEncContext *s); | 149 | void ff_dct_encode_init_x86(MpegEncContext *s); |
| 150 | 150 | ||
| 151 | int ff_dct_quantize_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); | ||
| 152 | void ff_convert_matrix(MpegEncContext *s, int (*qmat)[64], uint16_t (*qmat16)[2][64], | 151 | void ff_convert_matrix(MpegEncContext *s, int (*qmat)[64], uint16_t (*qmat16)[2][64], |
| 153 | const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra); | 152 | const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra); |
| 154 | 153 | ||