diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 01:14:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-16 16:59:15 +0100 |
| commit | b53aab1a5819abe7c65b5f645e09559bb42db793 (patch) | |
| tree | ef402d37750932538e0b090cc3d0b964a51cbfc8 /libavcodec/huffyuv.c | |
| parent | 6c004e8aada00d96f5c38e50c9770efb1eaaaa59 (diff) | |
| download | ffmpeg-b53aab1a5819abe7c65b5f645e09559bb42db793.tar.gz | |
libavcodec/huffyuv: >8 bit support
This adds only yuv420p10, others are trivial to add after this commit
and will be added in a subsequent commit.
Currently the implementation is not optimized, optimizations will be
added later
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/huffyuv.c')
| -rw-r--r-- | libavcodec/huffyuv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c index b4ef76f198..c183bdf075 100644 --- a/libavcodec/huffyuv.c +++ b/libavcodec/huffyuv.c @@ -35,13 +35,13 @@ #include "avcodec.h" #include "huffyuv.h" -int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table) +int ff_huffyuv_generate_bits_table(uint32_t *dst, const uint8_t *len_table, int n) { int len, index; uint32_t bits = 0; for (len = 32; len > 0; len--) { - for (index = 0; index < 256; index++) { + for (index = 0; index < n; index++) { if (len_table[index] == len) dst[index] = bits++; } @@ -60,9 +60,10 @@ av_cold int ff_huffyuv_alloc_temp(HYuvContext *s) if (s->bitstream_bpp<24) { for (i=0; i<3; i++) { - s->temp[i]= av_malloc(s->width + 16); + s->temp[i]= av_malloc(2*s->width + 16); if (!s->temp[i]) return AVERROR(ENOMEM); + s->temp16[i] = (uint16_t*)s->temp[i]; } } else { s->temp[0]= av_mallocz(4*s->width + 16); @@ -93,5 +94,6 @@ av_cold void ff_huffyuv_common_end(HYuvContext *s) for(i = 0; i < 3; i++) { av_freep(&s->temp[i]); + s->temp16[i] = NULL; } } |