ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Tue Oct 17 20:26:00 2017 -0300| [6007f7d4665e970714c2962c0ddb7de910d9da0c] | committer: James Almer
Merge commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f' * commit '5f794aa1653aa04c1da7397e9ccacad947fadf5f': Add Cineform HD Decoder See 3485332bf99602910fe8830b0230d02fc653135d. Some cosmetics are merged. The refactoring is not merged at the request of Kieran Kunhya. Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6007f7d4665e970714c2962c0ddb7de910d9da0c --- libavcodec/cfhd.c | 138 +++++++++++++++++++-------------- libavcodec/cfhd.h | 18 ++--- libavcodec/cfhddata.c | 208 +++++++++++++++++++++++++++++++------------------- 3 files changed, 217 insertions(+), 147 deletions(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 5ea8f24821..5646ee8271 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -20,24 +20,39 @@ /** * @file - * CFHD Video Decoder + * Cineform HD video decoder */ +#include "libavutil/attributes.h" #include "libavutil/buffer.h" #include "libavutil/common.h" -#include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" +#include "libavutil/intreadwrite.h" #include "libavutil/opt.h" #include "avcodec.h" -#include "internal.h" #include "bytestream.h" +#include "get_bits.h" +#include "internal.h" #include "thread.h" #include "cfhd.h" -#define SUBBAND_COUNT 10 +enum CFHDParam { + ChannelCount = 12, + SubbandCount = 14, + ImageWidth = 20, + ImageHeight = 21, + LowpassPrecision = 35, + SubbandNumber = 48, + Quantization = 53, + ChannelNumber = 62, + BitsPerComponent = 101, + ChannelWidth = 104, + ChannelHeight = 105, + PrescaleShift = 109, +}; -static av_cold int cfhd_decode_init(AVCodecContext *avctx) +static av_cold int cfhd_init(AVCodecContext *avctx) { CFHDContext *s = avctx->priv_data; @@ -60,7 +75,7 @@ static void init_frame_defaults(CFHDContext *s) s->coded_height = 0; s->bpc = 10; s->channel_cnt = 4; - s->subband_cnt = 10; + s->subband_cnt = SUBBAND_COUNT; s->channel_num = 0; s->lowpass_precision = 16; s->quantisation = 1; @@ -74,15 +89,18 @@ static void init_frame_defaults(CFHDContext *s) static inline int dequant_and_decompand(int level, int quantisation) { int64_t abslevel = abs(level); - return (abslevel + ((768 * abslevel * abslevel * abslevel) / (255 * 255 * 255))) * FFSIGN(level) * quantisation; + return (abslevel + ((768 * abslevel * abslevel * abslevel) / (255 * 255 * 255))) * + FFSIGN(level) * quantisation; } -static inline void filter(int16_t *output, ptrdiff_t out_stride, int16_t *low, ptrdiff_t low_stride, - int16_t *high, ptrdiff_t high_stride, int len, uint8_t clip) +static inline void filter(int16_t *output, ptrdiff_t out_stride, + int16_t *low, ptrdiff_t low_stride, + int16_t *high, ptrdiff_t high_stride, + int len, int clip) { int16_t tmp; - int i; + for (i = 0; i < len; i++) { if (i == 0) { tmp = (11*low[0*low_stride] - 4*low[1*low_stride] + low[2*low_stride] + 4) >> 3; @@ -118,28 +136,30 @@ static inline void filter(int16_t *output, ptrdiff_t out_stride, int16_t *low, p } } -static void horiz_filter(int16_t *output, int16_t *low, int16_t *high, int width) +static void horiz_filter(int16_t *output, int16_t *low, int16_t *high, + int width) { filter(output, 1, low, 1, high, 1, width, 0); } -static void horiz_filter_clip(int16_t *output, int16_t *low, int16_t *high, int width, uint8_t clip) +static void horiz_filter_clip(int16_t *output, int16_t *low, int16_t *high, + int width, int clip) { filter(output, 1, low, 1, high, 1, width, clip); } -static void vert_filter(int16_t *output, int out_stride, int16_t *low, int low_stride, - int16_t *high, int high_stride, int len) +static void vert_filter(int16_t *output, ptrdiff_t out_stride, + int16_t *low, ptrdiff_t low_stride, + int16_t *high, ptrdiff_t high_stride, int len) { filter(output, out_stride, low, low_stride, high, high_stride, len, 0); } -static void free_buffers(AVCodecContext *avctx) +static void free_buffers(CFHDContext *s) { - CFHDContext *s = avctx->priv_data; int i, j; - for (i = 0; i < 4; i++) { + for (i = 0; i < FF_ARRAY_ELEMS(s->plane); i++) { av_freep(&s->plane[i].idwt_buf); av_freep(&s->plane[i].idwt_tmp); @@ -156,37 +176,43 @@ static void free_buffers(AVCodecContext *avctx) static int alloc_buffers(AVCodecContext *avctx) { CFHDContext *s = avctx->priv_data; - int i, j, k, ret, planes; + int i, j, ret, planes; + int chroma_x_shift, chroma_y_shift; + unsigned k; if ((ret = ff_set_dimensions(avctx, s->coded_width, s->coded_height)) < 0) return ret; avctx->pix_fmt = s->coded_format; - avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift); - planes = av_pix_fmt_count_planes(avctx->pix_fmt); + if ((ret = av_pix_fmt_get_chroma_sub_sample(s->coded_format, + &chroma_x_shift, + &chroma_y_shift)) < 0) + return ret; + planes = av_pix_fmt_count_planes(s->coded_format); for (i = 0; i < planes; i++) { - int width = i ? avctx->width >> s->chroma_x_shift : avctx->width; - int height = i ? avctx->height >> s->chroma_y_shift : avctx->height; - int stride = FFALIGN(width / 8, 8) * 8; int w8, h8, w4, h4, w2, h2; - height = FFALIGN(height / 8, 2) * 8; - s->plane[i].width = width; + int width = i ? avctx->width >> chroma_x_shift : avctx->width; + int height = i ? avctx->height >> chroma_y_shift : avctx->height; + ptrdiff_t stride = FFALIGN(width / 8, 8) * 8; + height = FFALIGN(height / 8, 2) * 8; + s->plane[i].width = width; s->plane[i].height = height; s->plane[i].stride = stride; - w8 = FFALIGN(s->plane[i].width / 8, 8); + w8 = FFALIGN(s->plane[i].width / 8, 8); h8 = FFALIGN(s->plane[i].height / 8, 2); w4 = w8 * 2; h4 = h8 * 2; w2 = w4 * 2; h2 = h4 * 2; - s->plane[i].idwt_buf = av_mallocz_array(height * stride, sizeof(*s->plane[i].idwt_buf)); - s->plane[i].idwt_tmp = av_malloc_array(height * stride, sizeof(*s->plane[i].idwt_tmp)); - if (!s->plane[i].idwt_buf || !s->plane[i].idwt_tmp) { + s->plane[i].idwt_buf = + av_mallocz_array(height * stride, sizeof(*s->plane[i].idwt_buf)); + s->plane[i].idwt_tmp = + av_malloc_array(height * stride, sizeof(*s->plane[i].idwt_tmp)); + if (!s->plane[i].idwt_buf || !s->plane[i].idwt_tmp) return AVERROR(ENOMEM); - } s->plane[i].subband[0] = s->plane[i].idwt_buf; s->plane[i].subband[1] = s->plane[i].idwt_buf + 2 * w8 * h8; @@ -200,7 +226,7 @@ static int alloc_buffers(AVCodecContext *avctx) s->plane[i].subband[9] = s->plane[i].idwt_buf + 3 * w2 * h2; for (j = 0; j < DWT_LEVELS; j++) { - for(k = 0; k < 4; k++) { + for (k = 0; k < FF_ARRAY_ELEMS(s->plane[i].band[j]); k++) { s->plane[i].band[j][k].a_width = w8 << j; s->plane[i].band[j][k].a_height = h8 << j; } @@ -209,10 +235,10 @@ static int alloc_buffers(AVCodecContext *avctx) /* ll2 and ll1 commented out because they are done in-place */ s->plane[i].l_h[0] = s->plane[i].idwt_tmp; s->plane[i].l_h[1] = s->plane[i].idwt_tmp + 2 * w8 * h8; - //s->plane[i].l_h[2] = ll2; + // s->plane[i].l_h[2] = ll2; s->plane[i].l_h[3] = s->plane[i].idwt_tmp; s->plane[i].l_h[4] = s->plane[i].idwt_tmp + 2 * w4 * h4; - //s->plane[i].l_h[5] = ll1; + // s->plane[i].l_h[5] = ll1; s->plane[i].l_h[6] = s->plane[i].idwt_tmp; s->plane[i].l_h[7] = s->plane[i].idwt_tmp + 2 * w2 * h2; } @@ -250,10 +276,10 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, uint16_t data = bytestream2_get_be16(&gb); if (abs_tag8 >= 0x60 && abs_tag8 <= 0x6f) { av_log(avctx, AV_LOG_DEBUG, "large len %x\n", ((tagu & 0xff) << 16) | data); - } else if (tag == 20) { + } else if (tag == ImageWidth) { av_log(avctx, AV_LOG_DEBUG, "Width %"PRIu16"\n", data); s->coded_width = data; - } else if (tag == 21) { + } else if (tag == ImageHeight) { av_log(avctx, AV_LOG_DEBUG, "Height %"PRIu16"\n", data); s->coded_height = data; } else if (tag == 101) { @@ -264,7 +290,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, break; } s->bpc = data; - } else if (tag == 12) { + } else if (tag == ChannelCount) { av_log(avctx, AV_LOG_DEBUG, "Channel Count: %"PRIu16"\n", data); s->channel_cnt = data; if (data > 4) { @@ -272,14 +298,14 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, ret = AVERROR_PATCHWELCOME; break; } - } else if (tag == 14) { + } else if (tag == SubbandCount) { av_log(avctx, AV_LOG_DEBUG, "Subband Count: %"PRIu16"\n", data); if (data != SUBBAND_COUNT) { av_log(avctx, AV_LOG_ERROR, "Subband Count of %"PRIu16" is unsupported\n", data); ret = AVERROR_PATCHWELCOME; break; } - } else if (tag == 62) { + } else if (tag == ChannelNumber) { s->channel_num = data; av_log(avctx, AV_LOG_DEBUG, "Channel number %"PRIu16"\n", data); if (s->channel_num >= planes) { @@ -288,7 +314,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, break; } init_plane_defaults(s); - } else if (tag == 48) { + } else if (tag == SubbandNumber) { if (s->subband_num != 0 && data == 1) // hack s->level++; av_log(avctx, AV_LOG_DEBUG, "Subband number %"PRIu16"\n", data); @@ -311,12 +337,12 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, ret = AVERROR(EINVAL); break; } - } else if (tag == 35) + } else if (tag == LowpassPrecision) av_log(avctx, AV_LOG_DEBUG, "Lowpass precision bits: %"PRIu16"\n", data); - else if (tag == 53) { + else if (tag == Quantization) { s->quantisation = data; av_log(avctx, AV_LOG_DEBUG, "Quantisation: %"PRIu16"\n", data); - } else if (tag == 109) { + } else if (tag == PrescaleShift) { s->prescale_shift[0] = (data >> 0) & 0x7; s->prescale_shift[1] = (data >> 3) & 0x7; s->prescale_shift[2] = (data >> 6) & 0x7; @@ -437,9 +463,9 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, s->coded_format != AV_PIX_FMT_NONE) { if (s->a_width != s->coded_width || s->a_height != s->coded_height || s->a_format != s->coded_format) { - free_buffers(avctx); + free_buffers(s); if ((ret = alloc_buffers(avctx)) < 0) { - free_buffers(avctx); + free_buffers(s); return ret; } } @@ -775,11 +801,11 @@ end: return avpkt->size; } -static av_cold int cfhd_close_decoder(AVCodecContext *avctx) +static av_cold int cfhd_close(AVCodecContext *avctx) { CFHDContext *s = avctx->priv_data; - free_buffers(avctx); + free_buffers(s); if (!avctx->internal->is_copy) { ff_free_vlc(&s->vlc_9); @@ -790,14 +816,14 @@ static av_cold int cfhd_close_decoder(AVCodecContext *avctx) } AVCodec ff_cfhd_decoder = { - .name = "cfhd", - .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_CFHD, - .priv_data_size = sizeof(CFHDContext), - .init = cfhd_decode_init, - .close = cfhd_close_decoder, - .decode = cfhd_decode, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .name = "cfhd", + .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_CFHD, + .priv_data_size = sizeof(CFHDContext), + .init = cfhd_init, + .close = cfhd_close, + .decode = cfhd_decode, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h index 67a0e4c32c..b0a52088aa 100644 --- a/libavcodec/cfhd.h +++ b/libavcodec/cfhd.h @@ -27,10 +27,10 @@ #include "avcodec.h" #include "get_bits.h" +#include "vlc.h" -#define VLC_BITS 9 -#define NB_VLC_TABLE_9 (71+3) -#define NB_VLC_TABLE_18 (263+1) +#define VLC_BITS 9 +#define SUBBAND_COUNT 10 typedef struct CFHD_RL_VLC_ELEM { int16_t level; @@ -43,7 +43,7 @@ typedef struct CFHD_RL_VLC_ELEM { typedef struct SubBand { int level; int orientation; - int stride; + ptrdiff_t stride; int a_width; int width; int a_height; @@ -62,7 +62,7 @@ typedef struct Plane { int16_t *idwt_tmp; /* TODO: merge this into SubBand structure */ - int16_t *subband[10]; + int16_t *subband[SUBBAND_COUNT]; int16_t *l_h[8]; SubBand band[DWT_LEVELS][4]; @@ -79,18 +79,15 @@ typedef struct CFHDContext { GetBitContext gb; - int chroma_x_shift; - int chroma_y_shift; - int coded_width; int coded_height; - int coded_format; + enum AVPixelFormat coded_format; int a_width; int a_height; int a_format; - int bpc; + int bpc; // bits per channel/component int channel_cnt; int subband_cnt; int channel_num; @@ -106,7 +103,6 @@ typedef struct CFHDContext { uint8_t prescale_shift[3]; Plane plane[4]; - } CFHDContext; int ff_cfhd_init_vlcs(CFHDContext *s); diff --git a/libavcodec/cfhddata.c b/libavcodec/cfhddata.c index 9330d34645..5df68d4b3c 100644 --- a/libavcodec/cfhddata.c +++ b/libavcodec/cfhddata.c @@ -18,7 +18,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "stdint.h" +#include <stdint.h> + +#include "libavutil/attributes.h" + #include "cfhd.h" /* some special codewords, not sure what they all mean */ @@ -29,6 +32,31 @@ #define TABLE_9_BAND_END3 0x38F0B3Eh #define TABLE_9_BAND_END_LEN3 26 +#define NB_VLC_TABLE_9 (71 + 3) +#define NB_VLC_TABLE_18 (263 + 1) + +static const uint32_t table_9_vlc_bits[NB_VLC_TABLE_9] = { + 0, 0x2, 0xc, 0x1a, + 0x1d, 0x1e, 0x39, 0x3e, + 0x37, 0x7e, 0x6c, 0xe2, + 0xfe, 0xdb, 0xe0, 0x1c3, + 0x1c6, 0x1ff, 0x1fe, 0x1b5, + 0x369, 0x385, 0x71d, 0x6d0, + 0x708, 0x71f, 0xe3d, 0xe39, + 0xe13, 0xe12, 0x1c71, 0x1b45, + 0x1b47, 0x3689, 0x38f2, 0x38e1, + 0x38e0, 0x38f1, 0x3688, 0x6d1b, + 0x71e0, 0x6d19, 0x71e7, 0xe3cd, + 0xda35, 0xda30, 0xe3c3, 0x1b469, + 0x1b462, 0x1c798, 0x1b463, 0x1c799, + 0x38f08, 0x38f09, 0x38f0a, 0x6d1a0, + 0x6d1a3, 0x6d1a1, 0xda345, 0xda344, + 0xe3c2d, 0xe3c2f, 0xe3c2e, 0x38f0b2, + 0x71e160, 0x71e162, 0x71e166, 0x71e161, + 0xe3c2ce, 0xe3c2c6, 0xe3c2c7, 0x1C7859E, + 0x38F0B3F, 0x38F0B3E, +}; + static const uint8_t table_9_vlc_len[NB_VLC_TABLE_9] = { 1, 2, 4, 5, 5, 5, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, @@ -42,19 +70,6 @@ static const uint8_t table_9_vlc_len[NB_VLC_TABLE_9] = { 26, 26, }; -static const uint32_t table_9_vlc_bits[NB_VLC_TABLE_9] = { - 0, 0x2, 0xc, 0x1a, 0x1d, 0x1e, 0x39, 0x3e, - 0x37, 0x7e, 0x6c, 0xe2, 0xfe, 0xdb, 0xe0, 0x1c3, - 0x1c6, 0x1ff, 0x1fe, 0x1b5, 0x369, 0x385, 0x71d, 0x6d0, - 0x708, 0x71f, 0xe3d, 0xe39, 0xe13, 0xe12, 0x1c71, 0x1b45, - 0x1b47, 0x3689, 0x38f2, 0x38e1, 0x38e0, 0x38f1, 0x3688, 0x6d1b, - 0x71e0, 0x6d19, 0x71e7, 0xe3cd, 0xda35, 0xda30, 0xe3c3, 0x1b469, - 0x1b462, 0x1c798, 0x1b463, 0x1c799, 0x38f08, 0x38f09, 0x38f0a, 0x6d1a0, - 0x6d1a3, 0x6d1a1, 0xda345, 0xda344, 0xe3c2d, 0xe3c2f, 0xe3c2e, 0x38f0b2, - 0x71e160, 0x71e162, 0x71e166, 0x71e161, 0xe3c2ce, 0xe3c2c6, 0xe3c2c7, 0x1C7859E, - 0x38F0B3F, 0x38F0B3E, -}; - static const uint16_t table_9_vlc_run[NB_VLC_TABLE_9] = { 1, 1, 1, 1, 12, 1, 32, 160, 1, 1, 1, 320, 1, 1, 80, 120, @@ -82,39 +97,72 @@ static const uint8_t table_9_vlc_level[NB_VLC_TABLE_9] = { }; static const uint32_t table_18_vlc_bits[NB_VLC_TABLE_18] = { - 0, 0x2, 0x7, 0x19, 0x30, 0x36, 0x6f, 0x63, - 0x69, 0x6b, 0xd1, 0xd4, 0xdc, 0x189, 0x18a, 0x1a0, - 0x1ab, 0x377, 0x310, 0x316, 0x343, 0x354, 0x375, 0x623, - 0x684, 0x685, 0x6ab, 0x6ec, 0xddb, 0xc5c, 0xc5e, 0xc44, - 0xd55, 0xdd1, 0xdd3, 0x1bb5, 0x188b, 0x18bb, 0x18bf, 0x1aa8, - 0x1ba0, 0x1ba5, 0x1ba4, 0x3115, 0x3175, 0x317d, 0x3553, 0x3768, - 0x6e87, 0x6ed3, 0x62e8, 0x62f8, 0x6228, 0x6aa4, 0x6e85, 0xc453, - 0xc5d3, 0xc5f3, 0xdda4, 0xdd08, 0xdd0c, 0x1bb4b, 0x1bb4a, 0x18ba5, - 0x18be5, 0x1aa95, 0x1aa97, 0x188a4, 0x1ba13, 0x31748, 0x317c8, 0x35528, - 0x3552c, 0x37424, 0x37434, 0x37436, 0x62294, 0x62e92, 0x62f92, 0x6aa52, - 0x6aa5a, 0x6e86a, 0x6e86e, 0x6e84a, 0xc452a, 0xc5d27, 0xc5f26, 0xd54a6, - 0xd54b6, 0xdd096, 0xdd0d6, 0xdd0de, 0x188a56, 0x18ba4d, 0x18be4e, 0x18be4f, - 0x1aa96e, 0x1ba12e, 0x1ba12f, 0x1ba1af, 0x1ba1bf, 0x37435d, 0x37437d, 0x317498, - 0x35529c, 0x35529d, 0x3552de, 0x3552df, 0x62e933, 0x62295d, 0x6aa53d, 0x6aa53f, - 0x6aa53e, 0x6e86b9, 0x6e86f8, 0xd54a79, 0xc5d265, 0xc452b8, 0xdd0d71, 0xd54a78, - 0xdd0d70, 0xdd0df2, 0xdd0df3, 0x188a5f6, 0x188a5f5, 0x188a5f4, 0x188a5f3, 0x188a5f2, - 0x188a5f1, 0x188a5f0, 0x188a5ef, 0x188a5ee, 0x188a5ed, 0x188a5aa, 0x188a5e3, 0x188a5df, - 0x188a589, 0x188a5dd, 0x188a578, 0x188a5e0, 0x188a588, 0x188a5d6, 0x188a5db, 0x188a5e1, - 0x188a587, 0x188a59a, 0x188a5c4, 0x188a5ec, 0x188a586, 0x188a573, 0x188a59c, 0x188a5c8, - 0x188a5fb, 0x188a5a1, 0x188a5eb, 0x188a5a8, 0x188a584, 0x188a5d2, 0x188a599, 0x188a598, - 0x188a583, 0x18ba4c9, 0x188a5d0, 0x188a594, 0x188a582, 0x188a5cb, 0x188a5d8, 0x188a5e7, - 0x188a581, 0x188a5ea, 0x188a5a9, 0x188a5a6, 0x188a580, 0x188a5a0, 0x188a59d, 0x188a5c3, - 0x188a57f, 0x188a5c0, 0x188a5de, 0x188a5d4, 0x188a57e, 0x188a5c2, 0x188a592, 0x188a5cd, - 0x188a57d, 0x188a5a3, 0x188a5e8, 0x188a5a2, 0x188a57c, 0x188a58e, 0x188a5b3, 0x188a5b2, - 0x188a5b1, 0x188a5b0, 0x188a5af, 0x188a5ae, 0x188a5ad, 0x188a5ac, 0x188a5ab, 0x188a5da, - 0x188a5e4, 0x188a5e5, 0x188a5d9, 0x188a5b5, 0x188a5bc, 0x188a5bd, 0x188a5e9, 0x188a5cc, - 0x188a585, 0x188a5d3, 0x188a5e2, 0x188a595, 0x188a596, 0x188a5b8, 0x188a590, 0x188a5c9, - 0x188a5a4, 0x188a5e6, 0x188a5a5, 0x188a5ce, 0x188a5bf, 0x188a572, 0x188a59b, 0x188a5be, - 0x188a5c7, 0x188a5ca, 0x188a5d5, 0x188a57b, 0x188a58d, 0x188a58c, 0x188a58b, 0x188a58a, - 0x18ba4c8, 0x188a5c5, 0x188a5fa, 0x188a5bb, 0x188a5c1, 0x188a5cf, 0x188a5b9, 0x188a5b6, - 0x188a597, 0x188a5fe, 0x188a5d7, 0x188a5ba, 0x188a591, 0x188a5c6, 0x188a5dc, 0x188a57a, - 0x188a59f, 0x188a5f9, 0x188a5b4, 0x188a5a7, 0x188a58f, 0x188a5fd, 0x188a5b7, 0x188a593, - 0x188a59e, 0x188a5f8, 0x188a5ff, 0x188a5fc, 0x188a579, 0x188a5f7, 0x3114ba2, 0x3114ba3, + 0, 0x2, 0x7, 0x19, + 0x30, 0x36, 0x6f, 0x63, + 0x69, 0x6b, 0xd1, 0xd4, + 0xdc, 0x189, 0x18a, 0x1a0, + 0x1ab, 0x377, 0x310, 0x316, + 0x343, 0x354, 0x375, 0x623, + 0x684, 0x685, 0x6ab, 0x6ec, + 0xddb, 0xc5c, 0xc5e, 0xc44, + 0xd55, 0xdd1, 0xdd3, 0x1bb5, + 0x188b, 0x18bb, 0x18bf, 0x1aa8, + 0x1ba0, 0x1ba5, 0x1ba4, 0x3115, + 0x3175, 0x317d, 0x3553, 0x3768, + 0x6e87, 0x6ed3, 0x62e8, 0x62f8, + 0x6228, 0x6aa4, 0x6e85, 0xc453, + 0xc5d3, 0xc5f3, 0xdda4, 0xdd08, + 0xdd0c, 0x1bb4b, 0x1bb4a, 0x18ba5, + 0x18be5, 0x1aa95, 0x1aa97, 0x188a4, + 0x1ba13, 0x31748, 0x317c8, 0x35528, + 0x3552c, 0x37424, 0x37434, 0x37436, + 0x62294, 0x62e92, 0x62f92, 0x6aa52, + 0x6aa5a, 0x6e86a, 0x6e86e, 0x6e84a, + 0xc452a, 0xc5d27, 0xc5f26, 0xd54a6, + 0xd54b6, 0xdd096, 0xdd0d6, 0xdd0de, + 0x188a56, 0x18ba4d, 0x18be4e, 0x18be4f, + 0x1aa96e, 0x1ba12e, 0x1ba12f, 0x1ba1af, + 0x1ba1bf, 0x37435d, 0x37437d, 0x317498, + 0x35529c, 0x35529d, 0x3552de, 0x3552df, + 0x62e933, 0x62295d, 0x6aa53d, 0x6aa53f, + 0x6aa53e, 0x6e86b9, 0x6e86f8, 0xd54a79, + 0xc5d265, 0xc452b8, 0xdd0d71, 0xd54a78, + 0xdd0d70, 0xdd0df2, 0xdd0df3, 0x188a5f6, + 0x188a5f5, 0x188a5f4, 0x188a5f3, 0x188a5f2, + 0x188a5f1, 0x188a5f0, 0x188a5ef, 0x188a5ee, + 0x188a5ed, 0x188a5aa, 0x188a5e3, 0x188a5df, + 0x188a589, 0x188a5dd, 0x188a578, 0x188a5e0, + 0x188a588, 0x188a5d6, 0x188a5db, 0x188a5e1, + 0x188a587, 0x188a59a, 0x188a5c4, 0x188a5ec, + 0x188a586, 0x188a573, 0x188a59c, 0x188a5c8, + 0x188a5fb, 0x188a5a1, 0x188a5eb, 0x188a5a8, + 0x188a584, 0x188a5d2, 0x188a599, 0x188a598, + 0x188a583, 0x18ba4c9, 0x188a5d0, 0x188a594, + 0x188a582, 0x188a5cb, 0x188a5d8, 0x188a5e7, + 0x188a581, 0x188a5ea, 0x188a5a9, 0x188a5a6, + 0x188a580, 0x188a5a0, 0x188a59d, 0x188a5c3, + 0x188a57f, 0x188a5c0, 0x188a5de, 0x188a5d4, + 0x188a57e, 0x188a5c2, 0x188a592, 0x188a5cd, + 0x188a57d, 0x188a5a3, 0x188a5e8, 0x188a5a2, + 0x188a57c, 0x188a58e, 0x188a5b3, 0x188a5b2, + 0x188a5b1, 0x188a5b0, 0x188a5af, 0x188a5ae, + 0x188a5ad, 0x188a5ac, 0x188a5ab, 0x188a5da, + 0x188a5e4, 0x188a5e5, 0x188a5d9, 0x188a5b5, + 0x188a5bc, 0x188a5bd, 0x188a5e9, 0x188a5cc, + 0x188a585, 0x188a5d3, 0x188a5e2, 0x188a595, + 0x188a596, 0x188a5b8, 0x188a590, 0x188a5c9, + 0x188a5a4, 0x188a5e6, 0x188a5a5, 0x188a5ce, + 0x188a5bf, 0x188a572, 0x188a59b, 0x188a5be, + 0x188a5c7, 0x188a5ca, 0x188a5d5, 0x188a57b, + 0x188a58d, 0x188a58c, 0x188a58b, 0x188a58a, + 0x18ba4c8, 0x188a5c5, 0x188a5fa, 0x188a5bb, + 0x188a5c1, 0x188a5cf, 0x188a5b9, 0x188a5b6, + 0x188a597, 0x188a5fe, 0x188a5d7, 0x188a5ba, + 0x188a591, 0x188a5c6, 0x188a5dc, 0x188a57a, + 0x188a59f, 0x188a5f9, 0x188a5b4, 0x188a5a7, + 0x188a58f, 0x188a5fd, 0x188a5b7, 0x188a593, + 0x188a59e, 0x188a5f8, 0x188a5ff, 0x188a5fc, + 0x188a579, 0x188a5f7, 0x3114ba2, 0x3114ba3, }; static const uint8_t table_18_vlc_len[NB_VLC_TABLE_18] = { @@ -154,39 +202,39 @@ static const uint8_t table_18_vlc_len[NB_VLC_TABLE_18] = { }; static const uint16_t table_18_vlc_run[NB_VLC_TABLE_18] = { - 1, 1, 1, 1, 1, 1, 1, 1, - 12, 1, 20, 1, 1, 1, 32, 1, - 1, 1, 1, 1, 60, 1, 1, 1, - 1, 100, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 180, 1, - 1, 320, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, + 1, 1, 1, 1, 1, 1, 1, 1, + 12, 1, 20, 1, 1, 1, 32, 1, + 1, 1, 1, 1, 60, 1, 1, 1, + 1, 100, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 180, 1, + 1, 320, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 2, }; static const uint8_t table_18_vlc_level[NB_VLC_TABLE_18] = { ====================================================================== diff --cc libavcodec/cfhd.c index 5ea8f24821,e122deb7a4..5646ee8271 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@@ -30,8 -31,9 +31,9 @@@ #include "libavutil/opt.h" #include "avcodec.h" - #include "internal.h" -#include "bitstream.h" #include "bytestream.h" ++#include "get_bits.h" + #include "internal.h" #include "thread.h" #include "cfhd.h" @@@ -56,11 -73,13 +71,11 @@@ static void init_plane_defaults(CFHDCon static void init_frame_defaults(CFHDContext *s) { - s->coded_format = AV_PIX_FMT_YUV422P10; s->coded_width = 0; s->coded_height = 0; - s->cropped_height = 0; s->bpc = 10; s->channel_cnt = 4; - s->subband_cnt = 10; + s->subband_cnt = SUBBAND_COUNT; s->channel_num = 0; s->lowpass_precision = 16; s->quantisation = 1; @@@ -74,47 -96,44 +89,50 @@@ static inline int dequant_and_decompand(int level, int quantisation) { int64_t abslevel = abs(level); - return (abslevel + ((768 * abslevel * abslevel * abslevel) / (255 * 255 * 255))) * FFSIGN(level) * quantisation; + return (abslevel + ((768 * abslevel * abslevel * abslevel) / (255 * 255 * 255))) * + FFSIGN(level) * quantisation; } - static inline void filter(int16_t *output, ptrdiff_t out_stride, int16_t *low, ptrdiff_t low_stride, - int16_t *high, ptrdiff_t high_stride, int len, uint8_t clip) + static inline void filter(int16_t *output, ptrdiff_t out_stride, + int16_t *low, ptrdiff_t low_stride, + int16_t *high, ptrdiff_t high_stride, + int len, int clip) { int16_t tmp; - int i; + for (i = 0; i < len; i++) { if (i == 0) { - tmp = (11 * low[0 * low_stride] - 4 * low[1 * low_stride] + low[2 * low_stride] + 4) >> 3; - output[(2 * i + 0) * out_stride] = (tmp + high[0 * high_stride]) >> 1; - } else if (i == len - 1) { - tmp = (5 * low[i * low_stride] + 4 * low[(i - 1) * low_stride] - low[(i - 2) * low_stride] + 4) >> 3; - output[(2 * i + 0) * out_stride] = (tmp + high[i * high_stride]) >> 1; - } else { - tmp = (low[(i - 1) * low_stride] - low[(i + 1) * low_stride] + 4) >> 3; - output[(2 * i + 0) * out_stride] = (tmp + low[i * low_stride] + high[i * high_stride]) >> 1; - } - if (clip) - output[(2 * i + 0) * out_stride] = av_clip_uintp2_c(output[(2 * i + 0) * out_stride], clip); - - if (i == 0) { - tmp = (5 * low[0 * low_stride] + 4 * low[1 * low_stride] - low[2 * low_stride] + 4) >> 3; - output[(2 * i + 1) * out_stride] = (tmp - high[0 * high_stride]) >> 1; - } else if (i == len - 1) { - tmp = (11 * low[i * low_stride] - 4 * low[(i - 1) * low_stride] + low[(i - 2) * low_stride] + 4) >> 3; - output[(2 * i + 1) * out_stride] = (tmp - high[i * high_stride]) >> 1; + tmp = (11*low[0*low_stride] - 4*low[1*low_stride] + low[2*low_stride] + 4) >> 3; + output[(2*i+0)*out_stride] = (tmp + high[0*high_stride]) >> 1; + if (clip) + output[(2*i+0)*out_stride] = av_clip_uintp2_c(output[(2*i+0)*out_stride], clip); + + tmp = ( 5*low[0*low_stride] + 4*low[1*low_stride] - low[2*low_stride] + 4) >> 3; + output[(2*i+1)*out_stride] = (tmp - high[0*high_stride]) >> 1; + if (clip) + output[(2*i+1)*out_stride] = av_clip_uintp2_c(output[(2*i+1)*out_stride], clip); + } else if (i == len-1) { + tmp = ( 5*low[i*low_stride] + 4*low[(i-1)*low_stride] - low[(i-2)*low_stride] + 4) >> 3; + output[(2*i+0)*out_stride] = (tmp + high[i*high_stride]) >> 1; + if (clip) + output[(2*i+0)*out_stride] = av_clip_uintp2_c(output[(2*i+0)*out_stride], clip); + + tmp = (11*low[i*low_stride] - 4*low[(i-1)*low_stride] + low[(i-2)*low_stride] + 4) >> 3; + output[(2*i+1)*out_stride] = (tmp - high[i*high_stride]) >> 1; + if (clip) + output[(2*i+1)*out_stride] = av_clip_uintp2_c(output[(2*i+1)*out_stride], clip); } else { - tmp = (low[(i + 1) * low_stride] - low[(i - 1) * low_stride] + 4) >> 3; - output[(2 * i + 1) * out_stride] = (tmp + low[i * low_stride] - high[i * high_stride]) >> 1; + tmp = (low[(i-1)*low_stride] - low[(i+1)*low_stride] + 4) >> 3; + output[(2*i+0)*out_stride] = (tmp + low[i*low_stride] + high[i*high_stride]) >> 1; + if (clip) + output[(2*i+0)*out_stride] = av_clip_uintp2_c(output[(2*i+0)*out_stride], clip); + + tmp = (low[(i+1)*low_stride] - low[(i-1)*low_stride] + 4) >> 3; + output[(2*i+1)*out_stride] = (tmp + low[i*low_stride] - high[i*high_stride]) >> 1; + if (clip) + output[(2*i+1)*out_stride] = av_clip_uintp2_c(output[(2*i+1)*out_stride], clip); } - if (clip) - output[(2 * i + 1) * out_stride] = av_clip_uintp2_c(output[(2 * i + 1) * out_stride], clip); } } @@@ -134,44 -156,37 +155,48 @@@ static void vert_filter(int16_t *output filter(output, out_stride, low, low_stride, high, high_stride, len, 0); } - static void free_buffers(AVCodecContext *avctx) + static void free_buffers(CFHDContext *s) { - CFHDContext *s = avctx->priv_data; - unsigned i; + int i, j; - for (i = 0; i < 4; i++) { + for (i = 0; i < FF_ARRAY_ELEMS(s->plane); i++) { av_freep(&s->plane[i].idwt_buf); av_freep(&s->plane[i].idwt_tmp); + + for (j = 0; j < 9; j++) + s->plane[i].subband[j] = NULL; + + for (j = 0; j < 8; j++) + s->plane[i].l_h[j] = NULL; } s->a_height = 0; s->a_width = 0; } -static int alloc_buffers(CFHDContext *s) +static int alloc_buffers(AVCodecContext *avctx) { + CFHDContext *s = avctx->priv_data; - int i, j, k, ret, planes; + int i, j, ret, planes; + int chroma_x_shift, chroma_y_shift; + unsigned k; + if ((ret = ff_set_dimensions(avctx, s->coded_width, s->coded_height)) < 0) + return ret; + avctx->pix_fmt = s->coded_format; + - avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift); - planes = av_pix_fmt_count_planes(avctx->pix_fmt); + if ((ret = av_pix_fmt_get_chroma_sub_sample(s->coded_format, + &chroma_x_shift, + &chroma_y_shift)) < 0) + return ret; + planes = av_pix_fmt_count_planes(s->coded_format); for (i = 0; i < planes; i++) { - int width = i ? avctx->width >> s->chroma_x_shift : avctx->width; - int height = i ? avctx->height >> s->chroma_y_shift : avctx->height; - int stride = FFALIGN(width / 8, 8) * 8; int w8, h8, w4, h4, w2, h2; - height = FFALIGN(height / 8, 2) * 8; - s->plane[i].width = width; - int width = i ? s->coded_width >> chroma_x_shift : s->coded_width; - int height = i ? s->coded_height >> chroma_y_shift : s->coded_height; ++ int width = i ? avctx->width >> chroma_x_shift : avctx->width; ++ int height = i ? avctx->height >> chroma_y_shift : avctx->height; + ptrdiff_t stride = FFALIGN(width / 8, 8) * 8; + height = FFALIGN(height / 8, 2) * 8; + s->plane[i].width = width; s->plane[i].height = height; s->plane[i].stride = stride; @@@ -182,11 -197,12 +207,12 @@@ w2 = w4 * 2; h2 = h4 * 2; - s->plane[i].idwt_buf = av_mallocz_array(height * stride, sizeof(*s->plane[i].idwt_buf)); - s->plane[i].idwt_tmp = av_malloc_array(height * stride, sizeof(*s->plane[i].idwt_tmp)); - if (!s->plane[i].idwt_buf || !s->plane[i].idwt_tmp) { + s->plane[i].idwt_buf = - av_malloc_array(height * stride, sizeof(*s->plane[i].idwt_buf)); ++ av_mallocz_array(height * stride, sizeof(*s->plane[i].idwt_buf)); + s->plane[i].idwt_tmp = + av_malloc_array(height * stride, sizeof(*s->plane[i].idwt_tmp)); + if (!s->plane[i].idwt_buf || !s->plane[i].idwt_tmp) return AVERROR(ENOMEM); - } s->plane[i].subband[0] = s->plane[i].idwt_buf; s->plane[i].subband[1] = s->plane[i].idwt_buf + 2 * w8 * h8; @@@ -224,434 -240,386 +250,434 @@@ return 0; } -static int parse_tag(CFHDContext *s, GetByteContext *gb, - int16_t *tag_, uint16_t *value, int *planes) +static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, + AVPacket *avpkt) { - /* Bit weird but implement the tag parsing as the spec says */ - uint16_t tagu = bytestream2_get_be16(gb); - int16_t tag = tagu; - int8_t tag8 = tagu >> 8; - uint16_t abstag = abs(tag); - int8_t abs_tag8 = abs(tag8); - uint16_t data = bytestream2_get_be16(gb); - *tag_ = tag; - *value = data; - - if (abs_tag8 >= 0x60 && abs_tag8 <= 0x6F) { - av_log(s->avctx, AV_LOG_DEBUG, "large len %"PRIX16"\n", - ((tagu & 0xFF) << 16) | data); - return 0; - } else if (abstag >= 0x4000 && abstag <= 0x40FF) { - av_log(s->avctx, AV_LOG_DEBUG, "Small chunk length %"PRIu16" %s\n", - data * 4, tag < 0 ? "optional" : "required"); - bytestream2_skipu(gb, data * 4); - return 0; - } + CFHDContext *s = avctx->priv_data; + GetByteContext gb; + ThreadFrame frame = { .f = data }; + AVFrame *pic = data; + int ret = 0, i, j, planes, plane, got_buffer = 0; + int16_t *coeff_data; - switch (tag) { - case 1: - av_log(s->avctx, AV_LOG_DEBUG, "Sample type? %"PRIu16"\n", data); - break; - case 2: - { - int i; - av_log(s->avctx, AV_LOG_DEBUG, - "tag=2 header - skipping %"PRIu16" tag/value pairs\n", data); - if (data > bytestream2_get_bytes_left(gb) / 4) { - av_log(s->avctx, AV_LOG_ERROR, - "Too many tag/value pairs (%"PRIu16")\n", data); - return AVERROR_INVALIDDATA; - } - for (i = 0; i < data; i++) { - uint16_t tag2 = bytestream2_get_be16(gb); - uint16_t val2 = bytestream2_get_be16(gb); - av_log(s->avctx, AV_LOG_DEBUG, "Tag/Value = %"PRIX16" %"PRIX16"\n", - tag2, val2); - } - break; - } - case 10: - if (data != 0) { - avpriv_report_missing_feature(s->avctx, "Transform type %"PRIu16, data); - return AVERROR_PATCHWELCOME; - } - av_log(s->avctx, AV_LOG_DEBUG, "Transform-type? %"PRIu16"\n", data); - break; - case ChannelCount: - av_log(s->avctx, AV_LOG_DEBUG, "Channel count: %"PRIu16"\n", data); - if (data > 4) { - avpriv_report_missing_feature(s->avctx, "Channel count %"PRIu16, data); - return AVERROR_PATCHWELCOME; - } - s->channel_cnt = data; - break; - case SubbandCount: - av_log(s->avctx, AV_LOG_DEBUG, "Subband count: %"PRIu16"\n", data); - if (data != SUBBAND_COUNT) { - avpriv_report_missing_feature(s->avctx, "Subband count %"PRIu16, data); - return AVERROR_PATCHWELCOME; - } - break; - case ImageWidth: - av_log(s->avctx, AV_LOG_DEBUG, "Width %"PRIu16"\n", data); - s->coded_width = data; - break; - case ImageHeight: - av_log(s->avctx, AV_LOG_DEBUG, "Height %"PRIu16"\n", data); - s->coded_height = data; - break; - case 23: - avpriv_report_missing_feature(s->avctx, "Skip frame"); - return AVERROR_PATCHWELCOME; - case 27: - av_log(s->avctx, AV_LOG_DEBUG, "Lowpass width %"PRIu16"\n", data); - if (data < 2 || data > s->plane[s->channel_num].band[0][0].a_width) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid lowpass width\n"); - return AVERROR_INVALIDDATA; - } - s->plane[s->channel_num].band[0][0].width = data; - s->plane[s->channel_num].band[0][0].stride = data; - break; - case 28: - av_log(s->avctx, AV_LOG_DEBUG, "Lowpass height %"PRIu16"\n", data); - if (data < 2 || data > s->plane[s->channel_num].band[0][0].a_height) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid lowpass height\n"); - return AVERROR_INVALIDDATA; - } - s->plane[s->channel_num].band[0][0].height = data; - break; - case LowpassPrecision: - av_log(s->avctx, AV_LOG_DEBUG, "Lowpass precision bits: %"PRIu16"\n", data); - break; - case 41: - case 49: - av_log(s->avctx, AV_LOG_DEBUG, - "Highpass width%s %"PRIu16" channel %i level %i subband %i\n", - tag == 49 ? "2" : "", data, - s->channel_num, s->level, s->subband_num); - if (data < 2) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid highpass width%s\n", tag == 49 ? "2" : ""); - return AVERROR_INVALIDDATA; - } - s->plane[s->channel_num].band[s->level][s->subband_num].width = data; - s->plane[s->channel_num].band[s->level][s->subband_num].stride = FFALIGN(data, 8); - break; - case 42: - case 50: - av_log(s->avctx, AV_LOG_DEBUG, "Highpass height%s %"PRIu16"\n", tag == 50 ? "2" : "", data); - if (data < 2) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid highpass height%s\n", tag == 50 ? "2" : ""); - return AVERROR_INVALIDDATA; - } - s->plane[s->channel_num].band[s->level][s->subband_num].height = data; - break; - case SubbandNumber: - av_log(s->avctx, AV_LOG_DEBUG, "Subband number %"PRIu16"\n", data); - if (data > 3) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid subband number\n"); - return AVERROR_INVALIDDATA; - } - if (s->subband_num != 0 && data == 1) { - if (s->level + 1 >= DWT_LEVELS) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid level\n"); - return AVERROR_INVALIDDATA; - } + s->coded_format = AV_PIX_FMT_YUV422P10; + init_frame_defaults(s); + planes = av_pix_fmt_count_planes(s->coded_format); - s->level++; - } - s->subband_num = data; - break; - case 51: - av_log(s->avctx, AV_LOG_DEBUG, "Subband number actual %"PRIu16"\n", data); - if (data >= SUBBAND_COUNT) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid subband number actual\n"); - return AVERROR_INVALIDDATA; - } - s->subband_num_actual = data; - break; - case Quantization: - s->quantisation = data; - av_log(s->avctx, AV_LOG_DEBUG, "Quantisation: %"PRIu16"\n", data); - break; - case ChannelNumber: - av_log(s->avctx, AV_LOG_DEBUG, "Channel number %"PRIu16"\n", data); - if (data >= *planes) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid channel number\n"); - return AVERROR_INVALIDDATA; - } - s->channel_num = data; - init_plane_defaults(s); - break; - case 70: - av_log(s->avctx, AV_LOG_DEBUG, - "Subsampling or bit-depth flag? %"PRIu16"\n", data); - if (!(data == 10 || data == 12)) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid bits per channel\n"); - return AVERROR_INVALIDDATA; - } - s->bpc = data; - break; - case 71: - s->codebook = data; - av_log(s->avctx, AV_LOG_DEBUG, "Codebook %i\n", s->codebook); - break; - case 72: - s->codebook = data; - av_log(s->avctx, AV_LOG_DEBUG, "Other codebook? %i\n", s->codebook); - break; - case 84: - av_log(s->avctx, AV_LOG_DEBUG, "Sample format? %"PRIu16"\n", data); - switch (data) { - case 1: - s->coded_format = AV_PIX_FMT_YUV422P10; - break; - case 3: - s->coded_format = AV_PIX_FMT_GBRP12; - break; - case 4: - s->coded_format = AV_PIX_FMT_GBRAP12; + bytestream2_init(&gb, avpkt->data, avpkt->size); + + while (bytestream2_get_bytes_left(&gb) > 4) { + /* Bit weird but implement the tag parsing as the spec says */ + uint16_t tagu = bytestream2_get_be16(&gb); + int16_t tag = (int16_t)tagu; + int8_t tag8 = (int8_t)(tagu >> 8); + uint16_t abstag = abs(tag); + int8_t abs_tag8 = abs(tag8); + uint16_t data = bytestream2_get_be16(&gb); + if (abs_tag8 >= 0x60 && abs_tag8 <= 0x6f) { + av_log(avctx, AV_LOG_DEBUG, "large len %x\n", ((tagu & 0xff) << 16) | data); - } else if (tag == 20) { ++ } else if (tag == ImageWidth) { + av_log(avctx, AV_LOG_DEBUG, "Width %"PRIu16"\n", data); + s->coded_width = data; - } else if (tag == 21) { ++ } else if (tag == ImageHeight) { + av_log(avctx, AV_LOG_DEBUG, "Height %"PRIu16"\n", data); + s->coded_height = data; + } else if (tag == 101) { + av_log(avctx, AV_LOG_DEBUG, "Bits per component: %"PRIu16"\n", data); + if (data < 1 || data > 31) { + av_log(avctx, AV_LOG_ERROR, "Bits per component %d is invalid\n", data); + ret = AVERROR(EINVAL); + break; + } + s->bpc = data; - } else if (tag == 12) { ++ } else if (tag == ChannelCount) { + av_log(avctx, AV_LOG_DEBUG, "Channel Count: %"PRIu16"\n", data); + s->channel_cnt = data; + if (data > 4) { + av_log(avctx, AV_LOG_ERROR, "Channel Count of %"PRIu16" is unsupported\n", data); + ret = AVERROR_PATCHWELCOME; + break; + } - } else if (tag == 14) { ++ } else if (tag == SubbandCount) { + av_log(avctx, AV_LOG_DEBUG, "Subband Count: %"PRIu16"\n", data); + if (data != SUBBAND_COUNT) { + av_log(avctx, AV_LOG_ERROR, "Subband Count of %"PRIu16" is unsupported\n", data); + ret = AVERROR_PATCHWELCOME; + break; + } - } else if (tag == 62) { ++ } else if (tag == ChannelNumber) { + s->channel_num = data; + av_log(avctx, AV_LOG_DEBUG, "Channel number %"PRIu16"\n", data); + if (s->channel_num >= planes) { + av_log(avctx, AV_LOG_ERROR, "Invalid channel number\n"); + ret = AVERROR(EINVAL); + break; + } + init_plane_defaults(s); - } else if (tag == 48) { ++ } else if (tag == SubbandNumber) { + if (s->subband_num != 0 && data == 1) // hack + s->level++; + av_log(avctx, AV_LOG_DEBUG, "Subband number %"PRIu16"\n", data); + s->subband_num = data; + if (s->level >= DWT_LEVELS) { + av_log(avctx, AV_LOG_ERROR, "Invalid level\n"); + ret = AVERROR(EINVAL); + break; + } + if (s->subband_num > 3) { + av_log(avctx, AV_LOG_ERROR, "Invalid subband number\n"); + ret = AVERROR(EINVAL); + break; + } + } else if (tag == 51) { + av_log(avctx, AV_LOG_DEBUG, "Subband number actual %"PRIu16"\n", data); + s->subband_num_actual = data; + if (s->subband_num_actual >= 10) { + av_log(avctx, AV_LOG_ERROR, "Invalid subband number actual\n"); + ret = AVERROR(EINVAL); + break; + } - } else if (tag == 35) ++ } else if (tag == LowpassPrecision) + av_log(avctx, AV_LOG_DEBUG, "Lowpass precision bits: %"PRIu16"\n", data); - else if (tag == 53) { ++ else if (tag == Quantization) { + s->quantisation = data; + av_log(avctx, AV_LOG_DEBUG, "Quantisation: %"PRIu16"\n", data); - } else if (tag == 109) { ++ } else if (tag == PrescaleShift) { + s->prescale_shift[0] = (data >> 0) & 0x7; + s->prescale_shift[1] = (data >> 3) & 0x7; + s->prescale_shift[2] = (data >> 6) & 0x7; + av_log(avctx, AV_LOG_DEBUG, "Prescale shift (VC-5): %x\n", data); + } else if (tag == 27) { + av_log(avctx, AV_LOG_DEBUG, "Lowpass width %"PRIu16"\n", data); + if (data < 3 || data > s->plane[s->channel_num].band[0][0].a_width) { + av_log(avctx, AV_LOG_ERROR, "Invalid lowpass width\n"); + ret = AVERROR(EINVAL); + break; + } + s->plane[s->channel_num].band[0][0].width = data; + s->plane[s->channel_num].band[0][0].stride = data; + } else if (tag == 28) { + av_log(avctx, AV_LOG_DEBUG, "Lowpass height %"PRIu16"\n", data); + if (data < 3 || data > s->plane[s->channel_num].band[0][0].a_height) { + av_log(avctx, AV_LOG_ERROR, "Invalid lowpass height\n"); + ret = AVERROR(EINVAL); + break; + } + s->plane[s->channel_num].band[0][0].height = data; + } else if (tag == 1) + av_log(avctx, AV_LOG_DEBUG, "Sample type? %"PRIu16"\n", data); + else if (tag == 10) { + if (data != 0) { + avpriv_report_missing_feature(avctx, "Transform type of %"PRIu16, data); + ret = AVERROR_PATCHWELCOME; + break; + } + av_log(avctx, AV_LOG_DEBUG, "Transform-type? %"PRIu16"\n", data); + } else if (abstag >= 0x4000 && abstag <= 0x40ff) { + av_log(avctx, AV_LOG_DEBUG, "Small chunk length %d %s\n", data * 4, tag < 0 ? "optional" : "required"); + bytestream2_skipu(&gb, data * 4); + } else if (tag == 23) { + av_log(avctx, AV_LOG_DEBUG, "Skip frame\n"); + avpriv_report_missing_feature(avctx, "Skip frame"); + ret = AVERROR_PATCHWELCOME; break; - default: - avpriv_report_missing_feature(s->avctx, "Sample format %"PRIu16, data); - return AVERROR_PATCHWELCOME; - } - *planes = av_pix_fmt_count_planes(s->coded_format); - break; - case -85: - av_log(s->avctx, AV_LOG_DEBUG, "Cropped height %"PRIu16"\n", data); - s->cropped_height = data; - break; - case 101: - av_log(s->avctx, AV_LOG_DEBUG, "Bits per component: %"PRIu16"\n", data); - s->bpc = data; - break; - case PrescaleShift: - s->prescale_shift[0] = (data >> 0) & 0x7; - s->prescale_shift[1] = (data >> 3) & 0x7; - s->prescale_shift[2] = (data >> 6) & 0x7; - av_log(s->avctx, AV_LOG_DEBUG, "Prescale shift (VC-5): %"PRIX16"\n", data); - break; - default: - av_log(s->avctx, AV_LOG_DEBUG, "Unknown tag %"PRIu16" data %"PRIX16"\n", - tag, data); - } + } else if (tag == 2) { + av_log(avctx, AV_LOG_DEBUG, "tag=2 header - skipping %i tag/value pairs\n", data); + if (data > bytestream2_get_bytes_left(&gb) / 4) { + av_log(avctx, AV_LOG_ERROR, "too many tag/value pairs (%d)\n", data); + ret = AVERROR_INVALIDDATA; + break; + } + for (i = 0; i < data; i++) { + uint16_t tag2 = bytestream2_get_be16(&gb); + uint16_t val2 = bytestream2_get_be16(&gb); + av_log(avctx, AV_LOG_DEBUG, "Tag/Value = %x %x\n", tag2, val2); + } + } else if (tag == 41) { + av_log(avctx, AV_LOG_DEBUG, "Highpass width %i channel %i level %i subband %i\n", data, s->channel_num, s->level, s->subband_num); + if (data < 3) { + av_log(avctx, AV_LOG_ERROR, "Invalid highpass width\n"); + ret = AVERROR(EINVAL); + break; + } + s->plane[s->channel_num].band[s->level][s->subband_num].width = data; + s->plane[s->channel_num].band[s->level][s->subband_num].stride = FFALIGN(data, 8); + } else if (tag == 42) { + av_log(avctx, AV_LOG_DEBUG, "Highpass height %i\n", data); + if (data < 3) { + av_log(avctx, AV_LOG_ERROR, "Invalid highpass height\n"); + ret = AVERROR(EINVAL); + break; + } + s->plane[s->channel_num].band[s->level][s->subband_num].height = data; + } else if (tag == 49) { + av_log(avctx, AV_LOG_DEBUG, "Highpass width2 %i\n", data); + if (data < 3) { + av_log(avctx, AV_LOG_ERROR, "Invalid highpass width2\n"); + ret = AVERROR(EINVAL); + break; + } + s->plane[s->channel_num].band[s->level][s->subband_num].width = data; + s->plane[s->channel_num].band[s->level][s->subband_num].stride = FFALIGN(data, 8); + } else if (tag == 50) { + av_log(avctx, AV_LOG_DEBUG, "Highpass height2 %i\n", data); + if (data < 3) { + av_log(avctx, AV_LOG_ERROR, "Invalid highpass height2\n"); + ret = AVERROR(EINVAL); + break; + } + s->plane[s->channel_num].band[s->level][s->subband_num].height = data; + } else if (tag == 71) { + s->codebook = data; + av_log(avctx, AV_LOG_DEBUG, "Codebook %i\n", s->codebook); + } else if (tag == 72) { + s->codebook = data; + av_log(avctx, AV_LOG_DEBUG, "Other codebook? %i\n", s->codebook); + } else if (tag == 70) { + av_log(avctx, AV_LOG_DEBUG, "Subsampling or bit-depth flag? %i\n", data); + if (!(data == 10 || data == 12)) { + av_log(avctx, AV_LOG_ERROR, "Invalid bits per channel\n"); + ret = AVERROR(EINVAL); + break; + } + s->bpc = data; + } else if (tag == 84) { + av_log(avctx, AV_LOG_DEBUG, "Sample format? %i\n", data); + if (data == 1) + s->coded_format = AV_PIX_FMT_YUV422P10; + else if (data == 3) + s->coded_format = AV_PIX_FMT_GBRP12; + else if (data == 4) + s->coded_format = AV_PIX_FMT_GBRAP12; + else { + avpriv_report_missing_feature(avctx, "Sample format of %"PRIu16, data); + ret = AVERROR_PATCHWELCOME; + break; + } + planes = av_pix_fmt_count_planes(s->coded_format); + } else + av_log(avctx, AV_LOG_DEBUG, "Unknown tag %i data %x\n", tag, data); - return 0; -} + /* Some kind of end of header tag */ + if (tag == 4 && data == 0x1a4a && s->coded_width && s->coded_height && + s->coded_format != AV_PIX_FMT_NONE) { + if (s->a_width != s->coded_width || s->a_height != s->coded_height || + s->a_format != s->coded_format) { - free_buffers(avctx); ++ free_buffers(s); + if ((ret = alloc_buffers(avctx)) < 0) { - free_buffers(avctx); ++ free_buffers(s); + return ret; + } + } + ret = ff_set_dimensions(avctx, s->coded_width, s->coded_height); + if (ret < 0) + return ret; + frame.f->width = + frame.f->height = 0; -static int read_lowpass_coeffs(CFHDContext *s, GetByteContext *gb, - int16_t *coeff_data) -{ - int i, j; - int lowpass_height = s->plane[s->channel_num].band[0][0].height; - int lowpass_width = s->plane[s->channel_num].band[0][0].width; - int lowpass_a_height = s->plane[s->channel_num].band[0][0].a_height; - int lowpass_a_width = s->plane[s->channel_num].band[0][0].a_width; - - if (lowpass_height > lowpass_a_height || - lowpass_width > lowpass_a_width || - lowpass_a_width * lowpass_a_height * sizeof(*coeff_data) > bytestream2_get_bytes_left(gb)) { - av_log(s->avctx, AV_LOG_ERROR, "Too many lowpass coefficients\n"); - return AVERROR_INVALIDDATA; - } + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) + return ret; - av_log(s->avctx, AV_LOG_DEBUG, - "Start of lowpass coeffs component %d height:%d, width:%d\n", - s->channel_num, lowpass_height, lowpass_width); - for (i = 0; i < lowpass_height; i++) { - for (j = 0; j < lowpass_width; j++) - coeff_data[j] = bytestream2_get_be16u(gb); + s->coded_width = 0; + s->coded_height = 0; + s->coded_format = AV_PIX_FMT_NONE; + got_buffer = 1; + } + coeff_data = s->plane[s->channel_num].subband[s->subband_num_actual]; - coeff_data += lowpass_width; - } + /* Lowpass coefficients */ + if (tag == 4 && data == 0xf0f && s->a_width && s->a_height) { + int lowpass_height = s->plane[s->channel_num].band[0][0].height; + int lowpass_width = s->plane[s->channel_num].band[0][0].width; + int lowpass_a_height = s->plane[s->channel_num].band[0][0].a_height; + int lowpass_a_width = s->plane[s->channel_num].band[0][0].a_width; + + if (!got_buffer) { + av_log(avctx, AV_LOG_ERROR, "No end of header tag found\n"); + ret = AVERROR(EINVAL); + goto end; + } - /* Align to mod-4 position to continue reading tags */ - bytestream2_seek(gb, bytestream2_tell(gb) & 3, SEEK_CUR); + if (lowpass_height > lowpass_a_height || lowpass_width > lowpass_a_width || + lowpass_a_width * lowpass_a_height * sizeof(int16_t) > bytestream2_get_bytes_left(&gb)) { + av_log(avctx, AV_LOG_ERROR, "Too many lowpass coefficients\n"); + ret = AVERROR(EINVAL); + goto end; + } - /* Copy last coefficient line if height is odd. */ - if (lowpass_height & 1) { - int16_t *last_line = &coeff_data[lowpass_height * lowpass_width]; - memcpy(last_line, &last_line[-lowpass_width], - lowpass_width * sizeof(*coeff_data)); - } + av_log(avctx, AV_LOG_DEBUG, "Start of lowpass coeffs component %d height:%d, width:%d\n", s->channel_num, lowpass_height, lowpass_width); + for (i = 0; i < lowpass_height; i++) { + for (j = 0; j < lowpass_width; j++) + coeff_data[j] = bytestream2_get_be16u(&gb); - av_log(s->avctx, AV_LOG_DEBUG, "Lowpass coefficients %i\n", - lowpass_width * lowpass_height); + coeff_data += lowpass_width; + } - return 0; -} + /* Align to mod-4 position to continue reading tags */ + bytestream2_seek(&gb, bytestream2_tell(&gb) & 3, SEEK_CUR); -#define DECODE_SUBBAND_COEFFS(TABLE, COND) \ - while (1) { \ - int level, run, coeff; \ - BITSTREAM_RL_VLC(level, run, &s->bc, s->TABLE, VLC_BITS, 3); \ - \ - /* escape */ \ - if (COND) \ - break; \ - \ - count += run; \ - \ - if (count > expected) { \ - av_log(s->avctx, AV_LOG_ERROR, "Escape codeword not found, " \ - "probably corrupt data\n"); \ - return AVERROR_INVALIDDATA; \ - } \ - \ - coeff = dequant_and_decompand(level, s->quantisation); \ - for (i = 0; i < run; i++) \ - *coeff_data++ = coeff; \ - } \ - -static int read_highpass_coeffs(CFHDContext *s, GetByteContext *gb, - int16_t *coeff_data) -{ - int i, ret; - int highpass_height = s->plane[s->channel_num].band[s->level][s->subband_num].height; - int highpass_width = s->plane[s->channel_num].band[s->level][s->subband_num].width; - int highpass_a_width = s->plane[s->channel_num].band[s->level][s->subband_num].a_width; - int highpass_a_height = s->plane[s->channel_num].band[s->level][s->subband_num].a_height; - ptrdiff_t highpass_stride = s->plane[s->channel_num].band[s->level][s->subband_num].stride; - int expected = highpass_height * highpass_stride; - int a_expected = highpass_a_height * highpass_a_width; - int count = 0; - unsigned bytes; - - if (highpass_height > highpass_a_height || - highpass_width > highpass_a_width || - a_expected < expected) { - av_log(s->avctx, AV_LOG_ERROR, "Too many highpass coefficients\n"); - return AVERROR_INVALIDDATA; - } + /* Copy last line of coefficients if odd height */ + if (lowpass_height & 1) { + memcpy(&coeff_data[lowpass_height * lowpass_width], + &coeff_data[(lowpass_height - 1) * lowpass_width], + lowpass_width * sizeof(*coeff_data)); + } - av_log(s->avctx, AV_LOG_DEBUG, - "Start subband coeffs plane %i level %i codebook %i expected %i\n", - s->channel_num, s->level, s->codebook, expected); + av_log(avctx, AV_LOG_DEBUG, "Lowpass coefficients %d\n", lowpass_width * lowpass_height); + } - if ((ret = bitstream_init8(&s->bc, gb->buffer, - bytestream2_get_bytes_left(gb))) < 0) - return ret; - if (!s->codebook) { - DECODE_SUBBAND_COEFFS(table_9_rl_vlc, level == 64) - } else { - DECODE_SUBBAND_COEFFS(table_18_rl_vlc, level == 255 && run == 2) - } + if (tag == 55 && s->subband_num_actual != 255 && s->a_width && s->a_height) { + int highpass_height = s->plane[s->channel_num].band[s->level][s->subband_num].height; + int highpass_width = s->plane[s->channel_num].band[s->level][s->subband_num].width; + int highpass_a_width = s->plane[s->channel_num].band[s->level][s->subband_num].a_width; + int highpass_a_height = s->plane[s->channel_num].band[s->level][s->subband_num].a_height; + int highpass_stride = s->plane[s->channel_num].band[s->level][s->subband_num].stride; + int expected; + int a_expected = highpass_a_height * highpass_a_width; + int level, run, coeff; + int count = 0, bytes; + + if (!got_buffer) { + av_log(avctx, AV_LOG_ERROR, "No end of header tag found\n"); + ret = AVERROR(EINVAL); + goto end; + } - bytes = FFALIGN(AV_CEIL_RSHIFT(bitstream_tell(&s->bc), 3), 4); - if (bytes > bytestream2_get_bytes_left(gb)) { - av_log(s->avctx, AV_LOG_ERROR, "Bitstream overread error\n"); - return AVERROR_INVALIDDATA; - } else - bytestream2_seek(gb, bytes, SEEK_CUR); - - av_log(s->avctx, AV_LOG_DEBUG, "End subband coeffs %i extra %i\n", - count, count - expected); - s->codebook = 0; - - /* Copy last coefficient line if height is odd. */ - if (highpass_height & 1) { - int16_t *last_line = &coeff_data[expected]; - memcpy(last_line, &last_line[-highpass_stride], - highpass_stride * sizeof(*coeff_data)); - } + if (highpass_height > highpass_a_height || highpass_width > highpass_a_width || a_expected < highpass_height * (uint64_t)highpass_stride) { + av_log(avctx, AV_LOG_ERROR, "Too many highpass coefficients\n"); + ret = AVERROR(EINVAL); + goto end; + } + expected = highpass_height * highpass_stride; + + av_log(avctx, AV_LOG_DEBUG, "Start subband coeffs plane %i level %i codebook %i expected %i\n", s->channel_num, s->level, s->codebook, expected); + + init_get_bits(&s->gb, gb.buffer, bytestream2_get_bytes_left(&gb) * 8); + { + OPEN_READER(re, &s->gb); + if (!s->codebook) { + while (1) { + UPDATE_CACHE(re, &s->gb); + GET_RL_VLC(level, run, re, &s->gb, s->table_9_rl_vlc, + VLC_BITS, 3, 1); + + /* escape */ + if (level == 64) + break; + + count += run; + + if (count > expected) + break; + + coeff = dequant_and_decompand(level, s->quantisation); + for (i = 0; i < run; i++) + *coeff_data++ = coeff; + } + } else { + while (1) { + UPDATE_CACHE(re, &s->gb); + GET_RL_VLC(level, run, re, &s->gb, s->table_18_rl_vlc, + VLC_BITS, 3, 1); + + /* escape */ + if (level == 255 && run == 2) + break; + + count += run; + + if (count > expected) + break; + + coeff = dequant_and_decompand(level, s->quantisation); + for (i = 0; i < run; i++) + *coeff_data++ = coeff; + } + } + CLOSE_READER(re, &s->gb); + } - return 0; -} + if (count > expected) { + av_log(avctx, AV_LOG_ERROR, "Escape codeword not found, probably corrupt data\n"); + ret = AVERROR(EINVAL); + goto end; + } -static int reconstruct_level(CFHDContext *s, AVFrame *pic, int plane, int level) -{ - int i, j, idx = level - 1, idx2 = level > 1 ? 1 : 0; - int16_t *low, *high, *output, *dst; - int lowpass_height = s->plane[plane].band[idx][idx2].height; - int lowpass_width = s->plane[plane].band[idx][idx2].width; - ptrdiff_t highpass_stride = s->plane[plane].band[idx][1].stride; - - if (lowpass_height > s->plane[plane].band[idx][idx2].a_height || - lowpass_width > s->plane[plane].band[idx][idx2].a_width || - s->plane[plane].band[idx][1].width > s->plane[plane].band[idx][1].a_width || - !highpass_stride) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid plane dimensions\n"); - return AVERROR_INVALIDDATA; + bytes = FFALIGN(FF_CEIL_RSHIFT(get_bits_count(&s->gb), 3), 4); + if (bytes > bytestream2_get_bytes_left(&gb)) { + av_log(avctx, AV_LOG_ERROR, "Bitstream overread error\n"); + ret = AVERROR(EINVAL); + goto end; + } else + bytestream2_seek(&gb, bytes, SEEK_CUR); + + av_log(avctx, AV_LOG_DEBUG, "End subband coeffs %i extra %i\n", count, count - expected); + s->codebook = 0; + + /* Copy last line of coefficients if odd height */ + if (highpass_height & 1) { + memcpy(&coeff_data[highpass_height * highpass_stride], + &coeff_data[(highpass_height - 1) * highpass_stride], + highpass_stride * sizeof(*coeff_data)); + } + } } - av_log(s->avctx, AV_LOG_DEBUG, "Level %d plane %i %i %i %ti\n", - level, plane, lowpass_height, lowpass_width, highpass_stride); - - low = s->plane[plane].subband[0]; - high = s->plane[plane].subband[2 + 3 * idx]; - output = s->plane[plane].l_h[3 * idx]; - for (i = 0; i < lowpass_width; i++) { - vert_filter(output, lowpass_width, low, lowpass_width, high, - highpass_stride, lowpass_height); - low++; - high++; - output++; + if (!s->a_width || !s->a_height || s->a_format == AV_PIX_FMT_NONE || + s->coded_width || s->coded_height || s->coded_format != AV_PIX_FMT_NONE) { + av_log(avctx, AV_LOG_ERROR, "Invalid dimensions\n"); + ret = AVERROR(EINVAL); + goto end; } - low = s->plane[plane].subband[1 + 3 * idx]; - high = s->plane[plane].subband[3 + 3 * idx]; - output = s->plane[plane].l_h[1 + 3 * idx]; - for (i = 0; i < lowpass_width; i++) { - // note the stride of "low" is highpass_stride - vert_filter(output, lowpass_width, low, highpass_stride, high, - highpass_stride, lowpass_height); - low++; - high++; - output++; + if (!got_buffer) { + av_log(avctx, AV_LOG_ERROR, "No end of header tag found\n"); + ret = AVERROR(EINVAL); + goto end; } - low = s->plane[plane].l_h[0 + 3 * idx]; - high = s->plane[plane].l_h[1 + 3 * idx]; + planes = av_pix_fmt_count_planes(avctx->pix_fmt); + for (plane = 0; plane < planes && !ret; plane++) { + /* level 1 */ + int lowpass_height = s->plane[plane].band[0][0].height; + int lowpass_width = s->plane[plane].band[0][0].width; + int highpass_stride = s->plane[plane].band[0][1].stride; + int act_plane = plane == 1 ? 2 : plane == 2 ? 1 : plane; + int16_t *low, *high, *output, *dst; + + if (lowpass_height > s->plane[plane].band[0][0].a_height || lowpass_width > s->plane[plane].band[0][0].a_width || + !highpass_stride || s->plane[plane].band[0][1].width > s->plane[plane].band[0][1].a_width) { + av_log(avctx, AV_LOG_ERROR, "Invalid plane dimensions\n"); + ret = AVERROR(EINVAL); + goto end; + } - if (level != 3) { + av_log(avctx, AV_LOG_DEBUG, "Decoding level 1 plane %i %i %i %i\n", plane, lowpass_height, lowpass_width, highpass_stride); + + low = s->plane[plane].subband[0]; + high = s->plane[plane].subband[2]; + output = s->plane[plane].l_h[0]; + for (i = 0; i < lowpass_width; i++) { + vert_filter(output, lowpass_width, low, lowpass_width, high, highpass_stride, lowpass_height); + low++; + high++; + output++; + } + + low = s->plane[plane].subband[1]; + high = s->plane[plane].subband[3]; + output = s->plane[plane].l_h[1]; + + for (i = 0; i < lowpass_width; i++) { + // note the stride of "low" is highpass_stride + vert_filter(output, lowpass_width, low, highpass_stride, high, highpass_stride, lowpass_height); + low++; + high++; + output++; + } + + low = s->plane[plane].l_h[0]; + high = s->plane[plane].l_h[1]; output = s->plane[plane].subband[0]; for (i = 0; i < lowpass_height * 2; i++) { horiz_filter(output, low, high, lowpass_width); @@@ -779,25 -747,24 +805,25 @@@ static av_cold int cfhd_close(AVCodecCo { CFHDContext *s = avctx->priv_data; - free_buffers(avctx); + free_buffers(s); - ff_free_vlc(&s->vlc_9); - ff_free_vlc(&s->vlc_18); + if (!avctx->internal->is_copy) { + ff_free_vlc(&s->vlc_9); + ff_free_vlc(&s->vlc_18); + } return 0; } AVCodec ff_cfhd_decoder = { - .name = "cfhd", - .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_CFHD, - .priv_data_size = sizeof(CFHDContext), - .init = cfhd_decode_init, - .close = cfhd_close_decoder, - .decode = cfhd_decode, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, + .name = "cfhd", + .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_CFHD, + .priv_data_size = sizeof(CFHDContext), + .init = cfhd_init, - .init_thread_copy = ONLY_IF_THREADS_ENABLED(cfhd_init), + .close = cfhd_close, + .decode = cfhd_decode, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; diff --cc libavcodec/cfhd.h index 67a0e4c32c,c5da0b6ec7..b0a52088aa --- a/libavcodec/cfhd.h +++ b/libavcodec/cfhd.h @@@ -23,14 -23,11 +23,14 @@@ #include <stdint.h> +#include "libavutil/avassert.h" + #include "avcodec.h" -#include "bitstream.h" +#include "get_bits.h" ++#include "vlc.h" - #define VLC_BITS 9 - #define NB_VLC_TABLE_9 (71+3) - #define NB_VLC_TABLE_18 (263+1) + #define VLC_BITS 9 + #define SUBBAND_COUNT 10 typedef struct CFHD_RL_VLC_ELEM { int16_t level; @@@ -77,14 -74,12 +77,11 @@@ typedef struct CFHDContext CFHD_RL_VLC_ELEM table_18_rl_vlc[4572]; VLC vlc_18; - BitstreamContext bc; + GetBitContext gb; - int chroma_x_shift; - int chroma_y_shift; - int coded_width; int coded_height; - int coded_format; - int cropped_height; + enum AVPixelFormat coded_format; int a_width; int a_height; diff --cc libavcodec/cfhddata.c index 9330d34645,3a9d6bdfb9..5df68d4b3c --- a/libavcodec/cfhddata.c +++ b/libavcodec/cfhddata.c @@@ -18,17 -18,37 +18,45 @@@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - #include "stdint.h" + #include <stdint.h> + + #include "libavutil/attributes.h" + #include "cfhd.h" +/* some special codewords, not sure what they all mean */ +#define TABLE_9_BAND_END1 0x1C7859Eh +#define TABLE_9_BAND_END_LEN1 25 +#define TABLE_9_BAND_END2 0x38F0B3Fh +#define TABLE_9_BAND_END_LEN2 26 +#define TABLE_9_BAND_END3 0x38F0B3Eh +#define TABLE_9_BAND_END_LEN3 26 + + #define NB_VLC_TABLE_9 (71 + 3) + #define NB_VLC_TABLE_18 (263 + 1) + + static const uint32_t table_9_vlc_bits[NB_VLC_TABLE_9] = { + 0, 0x2, 0xc, 0x1a, + 0x1d, 0x1e, 0x39, 0x3e, + 0x37, 0x7e, 0x6c, 0xe2, + 0xfe, 0xdb, 0xe0, 0x1c3, + 0x1c6, 0x1ff, 0x1fe, 0x1b5, + 0x369, 0x385, 0x71d, 0x6d0, + 0x708, 0x71f, 0xe3d, 0xe39, + 0xe13, 0xe12, 0x1c71, 0x1b45, + 0x1b47, 0x3689, 0x38f2, 0x38e1, + 0x38e0, 0x38f1, 0x3688, 0x6d1b, + 0x71e0, 0x6d19, 0x71e7, 0xe3cd, + 0xda35, 0xda30, 0xe3c3, 0x1b469, + 0x1b462, 0x1c798, 0x1b463, 0x1c799, + 0x38f08, 0x38f09, 0x38f0a, 0x6d1a0, + 0x6d1a3, 0x6d1a1, 0xda345, 0xda344, + 0xe3c2d, 0xe3c2f, 0xe3c2e, 0x38f0b2, + 0x71e160, 0x71e162, 0x71e166, 0x71e161, + 0xe3c2ce, 0xe3c2c6, 0xe3c2c7, 0x1C7859E, + 0x38F0B3F, 0x38F0B3E, + }; + static const uint8_t table_9_vlc_len[NB_VLC_TABLE_9] = { 1, 2, 4, 5, 5, 5, 6, 6, 6, 7, 7, 8, 8, 8, 8, 9, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
