ff_mjpeg_encode_huffman_increment(ctx[table_id], code);
}
- ret = ff_mjpeg_encode_huffman_close(&dc_luminance_ctx,
- m->bits_dc_luminance,
- m->val_dc_luminance, 12);
- av_assert0(!ret);
- ret = ff_mjpeg_encode_huffman_close(&dc_chrominance_ctx,
- m->bits_dc_chrominance,
- m->val_dc_chrominance, 12);
- av_assert0(!ret);
- ret = ff_mjpeg_encode_huffman_close(&ac_luminance_ctx,
- m->bits_ac_luminance,
- m->val_ac_luminance, 256);
- av_assert0(!ret);
- ret = ff_mjpeg_encode_huffman_close(&ac_chrominance_ctx,
- m->bits_ac_chrominance,
- m->val_ac_chrominance, 256);
- av_assert0(!ret);
+ ff_mjpeg_encode_huffman_close(&dc_luminance_ctx,
+ m->bits_dc_luminance,
+ m->val_dc_luminance, 12);
+ ff_mjpeg_encode_huffman_close(&dc_chrominance_ctx,
+ m->bits_dc_chrominance,
+ m->val_dc_chrominance, 12);
+ ff_mjpeg_encode_huffman_close(&ac_luminance_ctx,
+ m->bits_ac_luminance,
+ m->val_ac_luminance, 256);
+ ff_mjpeg_encode_huffman_close(&ac_chrominance_ctx,
+ m->bits_ac_chrominance,
+ m->val_ac_chrominance, 256);
ff_mjpeg_build_huffman_codes(m->huff_size_dc_luminance,
m->huff_code_dc_luminance,
#include <string.h>
#include <stdint.h>
#include <stdlib.h>
+#include "libavutil/avassert.h"
#include "libavutil/common.h"
#include "libavutil/error.h"
#include "libavutil/qsort.h"
* @param bits output array where the ith character represents how many input values have i length encoding
* @param val output array of input values sorted by their encoded length
* @param max_nval maximum number of distinct input values
- * @return int Return code, 0 if succeeded.
*/
-int ff_mjpeg_encode_huffman_close(MJpegEncHuffmanContext *s, uint8_t bits[17],
- uint8_t val[], int max_nval)
+void ff_mjpeg_encode_huffman_close(MJpegEncHuffmanContext *s, uint8_t bits[17],
+ uint8_t val[], int max_nval)
{
int i, j;
int nval = 0;
for (i = 0; i < 256; i++) {
if (s->val_count[i]) nval++;
}
- if (nval > max_nval) {
- return AVERROR(EINVAL);
- }
+ av_assert0 (nval <= max_nval);
j = 0;
for (i = 0; i < 256; i++) {
val[i] = distincts[i].code;
bits[distincts[i].length]++;
}
-
- return 0;
}
{
s->val_count[val]++;
}
-int ff_mjpeg_encode_huffman_close(MJpegEncHuffmanContext *s,
- uint8_t bits[17], uint8_t val[],
- int max_nval);
+void ff_mjpeg_encode_huffman_close(MJpegEncHuffmanContext *s,
+ uint8_t bits[17], uint8_t val[],
+ int max_nval);
/**