On Sat, 16 Apr 2016, 05:57 Diego Biurrun, <[email protected]> wrote: > From: Kieran Kunhya <[email protected]> > > Decodes YUV 4:2:2 10-bit and RGB 12-bit files. > Older files with more subbands, skips, Bayer, alpha not supported. > Alpha requires addition of GBRAP12 pixel format. > --- > > The beast all squashed together, for ease of review. > I'm not aware of any more pending issues. > > Changelog | 1 + > doc/general.texi | 1 + > libavcodec/Makefile | 1 + > libavcodec/allcodecs.c | 1 + > libavcodec/avcodec.h | 1 + > libavcodec/cfhd.c | 783 > ++++++++++++++++++++++++++++++++++++++++++++++++ > libavcodec/cfhd.h | 109 +++++++ > libavcodec/cfhddata.c | 372 +++++++++++++++++++++++ > libavcodec/codec_desc.c | 7 + > libavcodec/version.h | 4 +- > libavformat/riff.c | 1 + > 11 files changed, 1279 insertions(+), 2 deletions(-) > create mode 100644 libavcodec/cfhd.c > create mode 100644 libavcodec/cfhd.h > create mode 100644 libavcodec/cfhddata.c > > diff --git a/Changelog b/Changelog > index a497fbc..6f128da 100644 > --- a/Changelog > +++ b/Changelog > @@ -55,6 +55,7 @@ version <next>: > - libnpp/CUDA-accelerated format conversion and scaling > - VAAPI-accelerate H.264/HEVC/MJPEG encoding > - Generic OpenMAX IL encoder with support for Raspberry Pi > +- Cineform HD decoder > > > version 11: > diff --git a/doc/general.texi b/doc/general.texi > index 15e4a66..c1d81be 100644 > --- a/doc/general.texi > +++ b/doc/general.texi > @@ -588,6 +588,7 @@ following image formats are supported: > @tab Amiga CD video codec > @item Chinese AVS video @tab E @tab X > @tab AVS1-P2, JiZhun profile, encoding through external library > libxavs > +@item Cineform HD @tab @tab X > @item Delphine Software International CIN video @tab @tab X > @tab Codec used in Delphine Software International games. > @item Discworld II BMV Video @tab @tab X > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index d9f614d..156afc8 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -171,6 +171,7 @@ OBJS-$(CONFIG_CAVS_DECODER) += cavs.o > cavsdec.o cavsdsp.o \ > cavsdata.o mpeg12data.o > OBJS-$(CONFIG_CDGRAPHICS_DECODER) += cdgraphics.o > OBJS-$(CONFIG_CDXL_DECODER) += cdxl.o > +OBJS-$(CONFIG_CFHD_DECODER) += cfhd.o cfhddata.o > OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o > OBJS-$(CONFIG_CLJR_DECODER) += cljrdec.o > OBJS-$(CONFIG_CLJR_ENCODER) += cljrenc.o > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index 16e9cd6..41afe0b 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -121,6 +121,7 @@ void avcodec_register_all(void) > REGISTER_DECODER(CAVS, cavs); > REGISTER_DECODER(CDGRAPHICS, cdgraphics); > REGISTER_DECODER(CDXL, cdxl); > + REGISTER_DECODER(CFHD, cfhd); > REGISTER_DECODER(CINEPAK, cinepak); > REGISTER_ENCDEC (CLJR, cljr); > REGISTER_DECODER(CLLC, cllc); > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h > index 26e6eb3..7099f20 100644 > --- a/libavcodec/avcodec.h > +++ b/libavcodec/avcodec.h > @@ -389,6 +389,7 @@ enum AVCodecID { > AV_CODEC_ID_DXV, > AV_CODEC_ID_SCREENPRESSO, > AV_CODEC_ID_RSCC, > + AV_CODEC_ID_CFHD, > > /* various PCM "codecs" */ > AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at > the start of audio codecs > diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c > new file mode 100644 > index 0000000..5cdc194 > --- /dev/null > +++ b/libavcodec/cfhd.c > @@ -0,0 +1,783 @@ > +/* > + * Copyright (c) 2015-2016 Kieran Kunhya <[email protected]> > + * > + * This file is part of Libav. > + * > + * Libav is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * Libav is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with Libav; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > 02110-1301 USA > + */ > + > +/** > + * @file > + * Cineform HD video decoder > + */ > + > +#include "libavutil/attributes.h" > +#include "libavutil/buffer.h" > +#include "libavutil/common.h" > +#include "libavutil/imgutils.h" > +#include "libavutil/intreadwrite.h" > +#include "libavutil/opt.h" > + > +#include "avcodec.h" > +#include "bytestream.h" > +#include "internal.h" > +#include "thread.h" > +#include "cfhd.h" > + > +#define SUBBAND_COUNT 10 > + > +static av_cold int cfhd_init(AVCodecContext *avctx) > +{ > + CFHDContext *s = avctx->priv_data; > + > + s->avctx = avctx; > + avctx->bits_per_raw_sample = 10; > + > + return ff_cfhd_init_vlcs(s); > +} > + > +static void init_plane_defaults(CFHDContext *s) > +{ > + s->subband_num = 0; > + s->level = 0; > + s->subband_num_actual = 0; > +} > + > +static void init_frame_defaults(CFHDContext *s) > +{ > + s->coded_width = 0; > + s->coded_height = 0; > + s->bpc = 10; > + s->channel_cnt = 4; > + s->subband_cnt = 10; > + s->channel_num = 0; > + s->lowpass_precision = 16; > + s->quantisation = 1; > + s->wavelet_depth = 3; > + s->pshift = 1; > + s->codebook = 0; > + init_plane_defaults(s); > +} > + > +/* TODO: merge with VLC tables or use LUT */ > +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; > +} > + > +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) > +{ > + 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; > + 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 + 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); > + } > + } > +} > + > +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) > +{ > + filter(output, 1, low, 1, high, 1, width, clip); > +} > + > +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) > +{ > + CFHDContext *s = avctx->priv_data; > + unsigned 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); > + } > + s->a_height = 0; > + s->a_width = 0; > +} > + > +static int alloc_buffers(AVCodecContext *avctx) > +{ > + CFHDContext *s = avctx->priv_data; > + int i, j, ret, planes; > + unsigned k; > + > + if ((ret = ff_set_dimensions(avctx, s->coded_width, s->coded_height)) > < 0) > + return ret; > + avctx->pix_fmt = s->coded_format; > + > + if ((ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, > + &s->chroma_x_shift, > + &s->chroma_y_shift)) < 0) > + return ret; > + planes = av_pix_fmt_count_planes(avctx->pix_fmt); > + > + for (i = 0; i < planes; i++) { > + int w8, h8, w4, h4, w2, h2; > + int width = i ? avctx->width >> s->chroma_x_shift : > avctx->width; > + int height = i ? avctx->height >> s->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); > + 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_malloc_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; > + s->plane[i].subband[2] = s->plane[i].idwt_buf + 1 * w8 * h8; > + s->plane[i].subband[3] = s->plane[i].idwt_buf + 3 * w8 * h8; > + s->plane[i].subband[4] = s->plane[i].idwt_buf + 2 * w4 * h4; > + s->plane[i].subband[5] = s->plane[i].idwt_buf + 1 * w4 * h4; > + s->plane[i].subband[6] = s->plane[i].idwt_buf + 3 * w4 * h4; > + s->plane[i].subband[7] = s->plane[i].idwt_buf + 2 * w2 * h2; > + s->plane[i].subband[8] = s->plane[i].idwt_buf + 1 * w2 * h2; > + s->plane[i].subband[9] = s->plane[i].idwt_buf + 3 * w2 * h2; > + > + for (j = 0; j < DWT_LEVELS; j++) { > + 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; > + } > + } > + > + /* 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[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[6] = s->plane[i].idwt_tmp; > + s->plane[i].l_h[7] = s->plane[i].idwt_tmp + 2 * w2 * h2; > + } > + > + s->a_height = s->coded_height; > + s->a_width = s->coded_width; > + s->a_format = s->coded_format; > + > + return 0; > +} > + > +static int parse_tag(AVCodecContext *avctx, CFHDContext *s, > GetByteContext gb, > + int16_t tag, uint16_t data, int *planes) > +{ > + switch (tag) { > + case 1: > + av_log(avctx, AV_LOG_DEBUG, "Sample type? %"PRIu16"\n", data); > + break; > + case 2: > + { > + int i; > + av_log(avctx, AV_LOG_DEBUG, > + "tag=2 header - skipping %"PRIu16" tag/value pairs\n", > data); > + if (data > bytestream2_get_bytes_left(&gb) / 4) { > + av_log(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(avctx, AV_LOG_DEBUG, > + "Tag/Value = %"PRIx16" %"PRIx16"\n", tag2, val2); > + } > + break; > + } > + case 10: > + if (data != 0) { > + avpriv_report_missing_feature(avctx, "Transform type %"PRIu16, > + data); > + return AVERROR_PATCHWELCOME; > + } > + av_log(avctx, AV_LOG_DEBUG, "Transform-type? %"PRIu16"\n", data); > + break; > + case 12: > + av_log(avctx, AV_LOG_DEBUG, "Channel count: %"PRIu16"\n", data); > + s->channel_cnt = data; > + if (data > 4) { > + avpriv_report_missing_feature(avctx, "Channel count %"PRIu16, > + data); > + return AVERROR_PATCHWELCOME; > + } > + break; > + case 14: > + av_log(avctx, AV_LOG_DEBUG, "Subband count: %"PRIu16"\n", data); > + if (data != SUBBAND_COUNT) { > + avpriv_report_missing_feature(avctx, "Subband count %"PRIu16, > + data); > + return AVERROR_PATCHWELCOME; > + } > + break; > + case 20: > + av_log(avctx, AV_LOG_DEBUG, "Width %"PRIu16"\n", data); > + s->coded_width = data; > + break; > + case 21: > + av_log(avctx, AV_LOG_DEBUG, "Height %"PRIu16"\n", data); > + s->coded_height = data; > + break; > + case 23: > + avpriv_report_missing_feature(avctx, "Skip frame"); > + return AVERROR_PATCHWELCOME; > + case 27: > + s->plane[s->channel_num].band[0][0].width = data; > + s->plane[s->channel_num].band[0][0].stride = data; > + av_log(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(avctx, AV_LOG_ERROR, "Invalid lowpass width\n"); > + return AVERROR_INVALIDDATA; > + } > + break; > + case 28: > + s->plane[s->channel_num].band[0][0].height = data; > + av_log(avctx, AV_LOG_DEBUG, "Lowpass height %"PRIu16"\n", data); > + if (data < 2 || data > > s->plane[s->channel_num].band[0][0].height) { > + av_log(avctx, AV_LOG_ERROR, "Invalid lowpass height\n"); > + return AVERROR_INVALIDDATA; > + } > + break; > + case 35: > + av_log(avctx, AV_LOG_DEBUG, "Lowpass precision bits: %"PRIu16"\n", > + data); > + break; > + case 41: > + 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); > + av_log(avctx, AV_LOG_DEBUG, > + "Highpass width %"PRIu16" channel %i level %i subband > %i\n", > + data, s->channel_num, s->level, s->subband_num); > + if (data < 2) { > + av_log(avctx, AV_LOG_ERROR, "Invalid highpass width\n"); > + return AVERROR_INVALIDDATA; > + } > + break; > + case 42: > + s->plane[s->channel_num].band[s->level][s->subband_num].height = > data; > + av_log(avctx, AV_LOG_DEBUG, "Highpass height %"PRIu16"\n", data); > + if (data < 2) { > + av_log(avctx, AV_LOG_ERROR, "Invalid highpass height\n"); > + return AVERROR_INVALIDDATA; > + } > + break; > + case 48: > + 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"); > + return AVERROR_INVALIDDATA; > + } > + if (s->subband_num > 3) { > + av_log(avctx, AV_LOG_ERROR, "Invalid subband number\n"); > + return AVERROR_INVALIDDATA; > + } > + break; > + case 49: > + 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); > + av_log(avctx, AV_LOG_DEBUG, "Highpass width2 %"PRIu16"\n", data); > + if (data < 2) { > + av_log(avctx, AV_LOG_ERROR, "Invalid highpass width2\n"); > + return AVERROR_INVALIDDATA; > + } > + break; > + case 50: > + s->plane[s->channel_num].band[s->level][s->subband_num].height = > data; > + av_log(avctx, AV_LOG_DEBUG, "Highpass height2 %"PRIu16"\n", data); > + if (data < 2) { > + av_log(avctx, AV_LOG_ERROR, "Invalid highpass height2\n"); > + return AVERROR_INVALIDDATA; > + } > + break; > + case 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"); > + return AVERROR_INVALIDDATA; > + } > + break; > + case 53: > + s->quantisation = data; > + av_log(avctx, AV_LOG_DEBUG, "Quantisation: %"PRIu16"\n", data); > + break; > + case 62: > + 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"); > + return AVERROR_INVALIDDATA; > + } > + init_plane_defaults(s); > + break; > + case 70: > + av_log(avctx, AV_LOG_DEBUG, > + "Subsampling or bit-depth flag? %"PRIu16"\n", data); > + s->bpc = data; > + if (!(s->bpc == 10 || s->bpc == 12)) { > + av_log(avctx, AV_LOG_ERROR, "Invalid bits per channel\n"); > + return AVERROR_INVALIDDATA; > + } > + break; > + case 71: > + s->codebook = data; > + av_log(avctx, AV_LOG_DEBUG, "Codebook %i\n", s->codebook); > + break; > + case 72: > + s->codebook = data; > + av_log(avctx, AV_LOG_DEBUG, "Other codebook? %i\n", s->codebook); > + break; > + case 84: > + av_log(avctx, AV_LOG_DEBUG, "Sample format? %"PRIu16"\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 %"PRIu16, > + data); > + return AVERROR_PATCHWELCOME; > + } > + *planes = av_pix_fmt_count_planes(s->coded_format); > + break; > + case 101: > + av_log(avctx, AV_LOG_DEBUG, "Bits per component: %"PRIu16"\n", > + data); > + s->bpc = data; > + break; > + case 109: > + 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): %"PRIx16"\n", > + data); > + break; > + default: > + av_log(avctx, AV_LOG_DEBUG, > + "Unknown tag %"PRIu16" data %"PRIx16"\n", tag, data); > + } > + > + return 0; > +} > + > +static int set_lowpass_coeffs(AVCodecContext *avctx, 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(int16_t) > > bytestream2_get_bytes_left(gb)) { > + av_log(avctx, AV_LOG_ERROR, "Too many lowpass coefficients\n"); > + return AVERROR_INVALIDDATA; > + } > + > + av_log(avctx, AV_LOG_DEBUG, > + "Start of lowpass coeffs component %"PRIu16" 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); > + > + coeff_data += lowpass_width; > + } > + > + /* Align to mod-4 position to continue reading tags */ > + bytestream2_seek(gb, bytestream2_tell(gb) & 3, SEEK_CUR); > + > + /* Copy last coefficients line 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(avctx, AV_LOG_DEBUG, "Lowpass coefficients %i\n", > + lowpass_width * lowpass_height); > + > + return 0; > +} > + > +static int set_highpass_coeffs(AVCodecContext *avctx, CFHDContext *s, > + GetByteContext *gb, int16_t *coeff_data) > +{ > + int i; > + 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 level, run, coeff; > + int count = 0; > + unsigned bytes; > + > + if (highpass_height > highpass_a_height || > + highpass_width > highpass_a_width || > + a_expected < expected) { > + av_log(avctx, AV_LOG_ERROR, "Too many highpass coefficients\n"); > + return AVERROR_INVALIDDATA; > + } > + > + 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); > + } > + > + if (count > expected) { > + av_log(avctx, AV_LOG_ERROR, > + "Escape codeword not found, probably corrupt data\n"); > + return AVERROR_INVALIDDATA; > + } > + > + bytes = FFALIGN(AV_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"); > + return AVERROR_INVALIDDATA; > + } 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)); > + } > + > + return 0; > +} > + > +static int filter_level(AVCodecContext *avctx, CFHDContext *s, void *data, > + 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(avctx, AV_LOG_ERROR, "Invalid plane dimensions\n"); > + return AVERROR_INVALIDDATA; > + } > + > + av_log(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++; > + } > + > + 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++; > + } > + > + low = s->plane[plane].l_h[0 + 3 * idx]; > + high = s->plane[plane].l_h[1 + 3 * idx]; > + > + if (level != 3) { > + output = s->plane[plane].subband[0]; > + for (i = 0; i < lowpass_height * 2; i++) { > + horiz_filter(output, low, high, lowpass_width); > + low += lowpass_width; > + high += lowpass_width; > + output += lowpass_width * 2; > + } > + if (s->bpc == 12 || level == 2) { > + output = s->plane[plane].subband[0]; > + for (i = 0; i < lowpass_height * 2; i++) { > + for (j = 0; j < lowpass_width * 2; j++) > + output[j] <<= 2; > + > + output += lowpass_width * 2; > + } > + } > + } else { > + int act_plane = plane == 1 ? 2 : plane == 2 ? 1 : plane; > + AVFrame *pic = data; > + dst = (int16_t *)pic->data[act_plane]; > + for (i = 0; i < lowpass_height * 2; i++) { > + horiz_filter_clip(dst, low, high, lowpass_width, s->bpc); > + low += lowpass_width; > + high += lowpass_width; > + dst += pic->linesize[act_plane] / 2; > + } > + } > + > + return 0; > +} > + > +static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, > + AVPacket *avpkt) > +{ > + CFHDContext *s = avctx->priv_data; > + GetByteContext gb; > + ThreadFrame frame = { .f = data }; > + int ret = 0, planes, plane, got_buffer = 0; > + int16_t *coeff_data; > + > + s->coded_format = AV_PIX_FMT_YUV422P10; > + init_frame_defaults(s); > + planes = av_pix_fmt_count_planes(s->coded_format); > + > + 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 %"PRIx16"\n", > + ((tagu & 0xff) << 16) | data); > + } else if (abstag >= 0x4000 && abstag <= 0x40ff) { > + av_log(avctx, AV_LOG_DEBUG, "Small chunk length %"PRIu16" > %s\n", > + data * 4, tag < 0 ? "optional" : "required"); > + bytestream2_skipu(&gb, data * 4); > + } else if ((ret = parse_tag(avctx, s, gb, tag, data, &planes)) < > 0) > + break; > + > + /* 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); > + if ((ret = alloc_buffers(avctx)) < 0) { > + free_buffers(avctx); > + return ret; > + } > + } > + > + if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) > + return ret; > + > + 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]; > + > + /* Lowpass coefficients */ > + if (tag == 4 && data == 0xf0f && s->a_width && s->a_height) { > + if ((ret = set_lowpass_coeffs(avctx, s, &gb, coeff_data)) < 0) > + return ret; > + } > + > + if (tag == 55 && s->subband_num_actual != 255 && > + s->a_width && s->a_height) { > + if ((ret = set_highpass_coeffs(avctx, s, &gb, coeff_data)) < > 0) > + return ret; > + } > + } > + > + 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"); > + return AVERROR_INVALIDDATA; > + } > + > + if (!got_buffer) { > + av_log(avctx, AV_LOG_ERROR, "No end of header tag found\n"); > + return AVERROR_INVALIDDATA; > + } > + > + planes = av_pix_fmt_count_planes(avctx->pix_fmt); > + for (plane = 0; plane < planes; plane++) { > + /* level 1 */ > + if ((ret = filter_level(avctx, s, data, plane, 1)) < 0) > + return ret; > + > + /* level 2 */ > + if ((ret = filter_level(avctx, s, data, plane, 2)) < 0) > + return ret; > + > + /* level 3 */ > + if ((ret = filter_level(avctx, s, data, plane, 3)) < 0) > + return ret; > + } > + > + *got_frame = 1; > + return avpkt->size; > +} > + > +static av_cold int cfhd_close(AVCodecContext *avctx) > +{ > + CFHDContext *s = avctx->priv_data; > + > + free_buffers(avctx); > + > + 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_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 > new file mode 100644 > index 0000000..81e1cba > --- /dev/null > +++ b/libavcodec/cfhd.h > @@ -0,0 +1,109 @@ > +/* > + * Copyright (c) 2015 Kieran Kunhya > + * > + * This file is part of Libav. > + * > + * Libav is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * Libav is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with Libav; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > 02110-1301 USA > + */ > + > +#ifndef AVCODEC_CFHD_H > +#define AVCODEC_CFHD_H > + > +#include <stdint.h> > + > +#include "avcodec.h" > +#include "get_bits.h" > + > +#define VLC_BITS 9 > + > +typedef struct CFHD_RL_VLC_ELEM { > + int16_t level; > + int8_t len; > + uint16_t run; > +} CFHD_RL_VLC_ELEM; > + > +#define DWT_LEVELS 3 > + > +typedef struct SubBand { > + int level; > + int orientation; > + int stride; > + int a_width; > + int width; > + int a_height; > + int height; > + int pshift; > + int quant; > + uint8_t *ibuf; > +} SubBand; > + > +typedef struct Plane { > + int width; > + int height; > + ptrdiff_t stride; > + > + int16_t *idwt_buf; > + int16_t *idwt_tmp; > + > + /* TODO: merge this into SubBand structure */ > + int16_t *subband[10]; > + int16_t *l_h[8]; > + > + SubBand band[DWT_LEVELS][4]; > +} Plane; > + > +typedef struct CFHDContext { > + AVCodecContext *avctx; > + > + CFHD_RL_VLC_ELEM table_9_rl_vlc[2088]; > + VLC vlc_9; > + > + CFHD_RL_VLC_ELEM table_18_rl_vlc[4572]; > + VLC vlc_18; > + > + GetBitContext gb; > + > + int chroma_x_shift; > + int chroma_y_shift; > + > + int coded_width; > + int coded_height; > + enum AVPixelFormat coded_format; > + > + int a_width; > + int a_height; > + int a_format; > + > + int bpc; > + int channel_cnt; > + int subband_cnt; > + int channel_num; > + uint8_t lowpass_precision; > + uint16_t quantisation; > + int wavelet_depth; > + int pshift; > + > + int codebook; > + int subband_num; > + int level; > + int subband_num_actual; > + > + uint8_t prescale_shift[3]; > + Plane plane[4]; > +} CFHDContext; > + > +int ff_cfhd_init_vlcs(CFHDContext *s); > + > +#endif /* AVCODEC_CFHD_H */ > diff --git a/libavcodec/cfhddata.c b/libavcodec/cfhddata.c > new file mode 100644 > index 0000000..6bf81b7 > --- /dev/null > +++ b/libavcodec/cfhddata.c > @@ -0,0 +1,372 @@ > +/* > + * Copyright (c) 2015 Kieran Kunhya > + * > + * This file is part of Libav. > + * > + * Libav is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * Libav is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with Libav; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA > 02110-1301 USA > + */ > + > +#include <stdint.h> > + > +#include "libavutil/attributes.h" > +#include "libavutil/avassert.h" > + > +#include "cfhd.h" > + > +#define NB_VLC_TABLE_9 (71 + 3) > +#define NB_VLC_TABLE_18 (263 + 1) > + > +/* 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 > + > +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, > + 9, 9, 9, 9, 10, 10, 11, 11, > + 11, 11, 12, 12, 12, 12, 13, 13, > + 13, 14, 14, 14, 14, 14, 14, 15, > + 15, 15, 15, 16, 16, 16, 16, 17, > + 17, 17, 17, 17, 18, 18, 18, 19, > + 19, 19, 20, 20, 20, 20, 20, 22, > + 23, 23, 23, 23, 24, 24, 24, 25, > + 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, > + 1, 1, 100, 1, 1, 1, 1, 1, > + 1, 1, 1, 1, 1, 1, 1, 1, > + 1, 1, 1, 1, 1, 1, 1, 1, > + 1, 1, 1, 1, 1, 1, 1, 1, > + 1, 1, 1, 1, 1, 1, 1, 1, > + 1, 1, 1, 1, 1, 1, 1, 1, > + 1, 1, 1, 1, 1, 1, 1, 1, > + 1, 1 > +}; > + > +static const uint8_t table_9_vlc_level[NB_VLC_TABLE_9] = { > + 0, 1, 2, 3, 0, 4, 0, 0, > + 5, 7, 6, 0, 9, 8, 0, 0, > + 11, 12, 0, 10, 13, 14, 17, 15, > + 16, 18, 22, 21, 20, 19, 25, 23, > + 24, 27, 31, 29, 28, 30, 26, 33, > + 34, 32, 35, 39, 37, 36, 38, 42, > + 40, 43, 41, 44, 45, 46, 47, 48, > + 50, 49, 52, 51, 53, 55, 54, 56, > + 57, 59, 60, 58, 61, 62, 63, 64, > + 64, 64, > +}; > + > +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, > +}; > + > +static const uint8_t table_18_vlc_len[NB_VLC_TABLE_18] = { > + 1, 2, 3, 5, 6, 6, 7, 7, > + 7, 7, 8, 8, 8, 9, 9, 9, > + 9, 10, 10, 10, 10, 10, 10, 11, > + 11, 11, 11, 11, 12, 12, 12, 12, > + 12, 12, 12, 13, 13, 13, 13, 13, > + 13, 13, 13, 14, 14, 14, 14, 14, > + 15, 15, 15, 15, 15, 15, 15, 16, > + 16, 16, 16, 16, 16, 17, 17, 17, > + 17, 17, 17, 17, 17, 18, 18, 18, > + 18, 18, 18, 18, 19, 19, 19, 19, > + 19, 19, 19, 19, 20, 20, 20, 20, > + 20, 20, 20, 20, 21, 21, 21, 21, > + 21, 21, 21, 21, 21, 22, 22, 22, > + 22, 22, 22, 22, 23, 23, 23, 23, > + 23, 23, 23, 24, 24, 24, 24, 24, > + 24, 24, 24, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 25, 25, > + 25, 25, 25, 25, 25, 25, 26, 26, > +}; > + > +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, > +}; > + > +static const uint8_t table_18_vlc_level[NB_VLC_TABLE_18] = { > + 0, 1, 2, 3, 4, 5, 8, 6, > + 0, 7, 0, 9, 10, 11, 0, 12, > + 13, 18, 14, 15, 0, 16, 17, 19, > + 20, 0, 21, 22, 29, 24, 25, 23, > + 26, 27, 28, 35, 30, 31, 0, 32, > + 33, 0, 34, 36, 37, 38, 39, 40, > + 46, 47, 42, 43, 41, 44, 45, 48, > + 49, 50, 53, 51, 52, 61, 60, 55, > + 56, 57, 58, 54, 59, 62, 63, 64, > + 65, 66, 67, 68, 69, 70, 71, 72, > + 73, 75, 76, 74, 77, 78, 79, 80, > + 81, 82, 83, 84, 85, 86, 87, 88, > + 89, 90, 91, 92, 93, 99, 100, 94, > + 95, 96, 97, 98, 102, 101, 103, 105, > + 104, 106, 107, 111, 109, 108, 113, 110, > + 112, 114, 115, 225, 189, 188, 203, 202, > + 197, 207, 169, 223, 159, 235, 152, 192, > + 179, 201, 172, 149, 178, 120, 219, 150, > + 127, 211, 125, 158, 247, 238, 163, 228, > + 183, 217, 168, 122, 128, 249, 187, 186, > + 136, 181, 255, 230, 135, 233, 222, 145, > + 134, 167, 248, 209, 243, 216, 164, 140, > + 157, 239, 191, 251, 156, 139, 242, 133, > + 162, 213, 165, 212, 227, 198, 236, 234, > + 117, 215, 124, 123, 254, 253, 148, 218, > + 146, 147, 224, 143, 184, 185, 166, 132, > + 129, 250, 151, 119, 193, 176, 245, 229, > + 206, 144, 208, 137, 241, 237, 190, 240, > + 131, 232, 252, 171, 205, 204, 118, 214, > + 180, 126, 182, 175, 141, 138, 177, 153, > + 194, 160, 121, 174, 246, 130, 200, 170, > + 221, 196, 142, 210, 199, 155, 154, 244, > + 220, 195, 161, 231, 173, 226, 116, 255, > +}; > + > +av_cold int ff_cfhd_init_vlcs(CFHDContext *s) > +{ > + int i, j, ret = 0; > + uint32_t new_cfhd_vlc_bits[NB_VLC_TABLE_18 * 2]; > + uint8_t new_cfhd_vlc_len[NB_VLC_TABLE_18 * 2]; > + uint16_t new_cfhd_vlc_run[NB_VLC_TABLE_18 * 2]; > + int16_t new_cfhd_vlc_level[NB_VLC_TABLE_18 * 2]; > + > + /** Similar to dv.c, generate signed VLC tables **/ > + > + /* Table 9 */ > + for (i = 0, j = 0; i < NB_VLC_TABLE_9; i++, j++) { > + new_cfhd_vlc_bits[j] = table_9_vlc_bits[i]; > + new_cfhd_vlc_len[j] = table_9_vlc_len[i]; > + new_cfhd_vlc_run[j] = table_9_vlc_run[i]; > + new_cfhd_vlc_level[j] = table_9_vlc_level[i]; > + > + /* Don't include the zero level nor escape bits */ > + if (table_9_vlc_level[i] && > + new_cfhd_vlc_bits[j] != table_9_vlc_bits[NB_VLC_TABLE_9 - 1]) > { > + new_cfhd_vlc_bits[j] <<= 1; > + new_cfhd_vlc_len[j]++; > + j++; > + new_cfhd_vlc_bits[j] = (table_9_vlc_bits[i] << 1) | 1; > + new_cfhd_vlc_len[j] = table_9_vlc_len[i] + 1; > + new_cfhd_vlc_run[j] = table_9_vlc_run[i]; > + new_cfhd_vlc_level[j] = -table_9_vlc_level[i]; > + } > + } > + > + ret = init_vlc(&s->vlc_9, VLC_BITS, j, new_cfhd_vlc_len, > + 1, 1, new_cfhd_vlc_bits, 4, 4, 0); > + if (ret < 0) > + return ret; > + for (i = 0; i < s->vlc_9.table_size; i++) { > + int code = s->vlc_9.table[i][0]; > + int len = s->vlc_9.table[i][1]; > + int level, run; > + > + if (len < 0) { // more bits needed > + run = 0; > + level = code; > + } else { > + run = new_cfhd_vlc_run[code]; > + level = new_cfhd_vlc_level[code]; > + } > + s->table_9_rl_vlc[i].len = len; > + s->table_9_rl_vlc[i].level = level; > + s->table_9_rl_vlc[i].run = run; > + } > + > + /* Table 18 */ > + for (i = 0, j = 0; i < NB_VLC_TABLE_18; i++, j++) { > + new_cfhd_vlc_bits[j] = table_18_vlc_bits[i]; > + new_cfhd_vlc_len[j] = table_18_vlc_len[i]; > + new_cfhd_vlc_run[j] = table_18_vlc_run[i]; > + new_cfhd_vlc_level[j] = table_18_vlc_level[i]; > + > + /* Don't include the zero level nor escape bits */ > + if (table_18_vlc_level[i] && > + new_cfhd_vlc_bits[j] != table_18_vlc_bits[NB_VLC_TABLE_18 - > 1]) { > + new_cfhd_vlc_bits[j] <<= 1; > + new_cfhd_vlc_len[j]++; > + j++; > + new_cfhd_vlc_bits[j] = (table_18_vlc_bits[i] << 1) | 1; > + new_cfhd_vlc_len[j] = table_18_vlc_len[i] + 1; > + new_cfhd_vlc_run[j] = table_18_vlc_run[i]; > + new_cfhd_vlc_level[j] = -table_18_vlc_level[i]; > + } > + } > + > + ret = init_vlc(&s->vlc_18, VLC_BITS, j, new_cfhd_vlc_len, > + 1, 1, new_cfhd_vlc_bits, 4, 4, 0); > + if (ret < 0) > + return ret; > + av_assert0(s->vlc_18.table_size == 4572); > + > + for (i = 0; i < s->vlc_18.table_size; i++) { > + int code = s->vlc_18.table[i][0]; > + int len = s->vlc_18.table[i][1]; > + int level, run; > + > + if (len < 0) { // more bits needed > + run = 0; > + level = code; > + } else { > + run = new_cfhd_vlc_run[code]; > + level = new_cfhd_vlc_level[code]; > + } > + s->table_18_rl_vlc[i].len = len; > + s->table_18_rl_vlc[i].level = level; > + s->table_18_rl_vlc[i].run = run; > + } > + > + return ret; > +} > diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c > index 7fd2cc6..8228a82 100644 > --- a/libavcodec/codec_desc.c > +++ b/libavcodec/codec_desc.c > @@ -1400,6 +1400,13 @@ static const AVCodecDescriptor codec_descriptors[] > = { > .long_name = NULL_IF_CONFIG_SMALL("XWD (X Window Dump) image"), > .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, > }, > + { > + .id = AV_CODEC_ID_CFHD, > + .type = AVMEDIA_TYPE_VIDEO, > + .name = "cfhd", > + .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"), > + .props = AV_CODEC_PROP_LOSSY, > + }, > > /* various PCM "codecs" */ > { > diff --git a/libavcodec/version.h b/libavcodec/version.h > index 4c28cdc..db3f33a 100644 > --- a/libavcodec/version.h > +++ b/libavcodec/version.h > @@ -28,8 +28,8 @@ > #include "libavutil/version.h" > > #define LIBAVCODEC_VERSION_MAJOR 57 > -#define LIBAVCODEC_VERSION_MINOR 18 > -#define LIBAVCODEC_VERSION_MICRO 2 > +#define LIBAVCODEC_VERSION_MINOR 19 > +#define LIBAVCODEC_VERSION_MICRO 0 > > #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ > LIBAVCODEC_VERSION_MINOR, \ > diff --git a/libavformat/riff.c b/libavformat/riff.c > index 2cbe038..d0d70f5 100644 > --- a/libavformat/riff.c > +++ b/libavformat/riff.c > @@ -365,6 +365,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { > { AV_CODEC_ID_SCREENPRESSO, MKTAG('S', 'P', 'V', '1') }, > { AV_CODEC_ID_RSCC, MKTAG('R', 'S', 'C', 'C') }, > { AV_CODEC_ID_RSCC, MKTAG('I', 'S', 'C', 'C') }, > + { AV_CODEC_ID_CFHD, MKTAG('C', 'F', 'H', 'D') }, > { AV_CODEC_ID_NONE, 0 } > }; > > -- > 2.7.3 > > _______________________________________________ > libav-devel mailing list > [email protected] > https://lists.libav.org/mailman/listinfo/libav-devel
I asked you not to squash this so please don't. Kieran > > _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
