---
libavcodec/Makefile | 1 +
libavcodec/allcodecs.c | 1 +
libavcodec/avcodec.h | 1 +
libavcodec/cfhd.c | 707 ++++++++++++++++++++++++++++++++++++++++++++++++
libavcodec/cfhd.h | 97 +++++++
libavcodec/cfhddata.c | 466 +++++++++++++++++++++++++++++++
libavcodec/codec_desc.c | 6 +
libavformat/riff.c | 1 +
8 files changed, 1280 insertions(+)
create mode 100644 libavcodec/cfhd.c
create mode 100644 libavcodec/cfhd.h
create mode 100644 libavcodec/cfhddata.c
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1c7568b..7e72cf1 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -211,6 +211,7 @@ OBJS-$(CONFIG_CDGRAPHICS_DECODER) += cdgraphics.o
OBJS-$(CONFIG_CDXL_DECODER) += cdxl.o
OBJS-$(CONFIG_CINEPAK_DECODER) += cinepak.o
OBJS-$(CONFIG_CINEPAK_ENCODER) += cinepakenc.o elbg.o
+OBJS-$(CONFIG_CFHD_DECODER) += cfhd.o cfhddata.o
OBJS-$(CONFIG_CLJR_DECODER) += cljrdec.o
OBJS-$(CONFIG_CLJR_ENCODER) += cljrenc.o
OBJS-$(CONFIG_CLLC_DECODER) += cllc.o canopus.o
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 4eeb6f3..ca6e4c2 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -147,6 +147,7 @@ void avcodec_register_all(void)
REGISTER_DECODER(CAVS, cavs);
REGISTER_DECODER(CDGRAPHICS, cdgraphics);
REGISTER_DECODER(CDXL, cdxl);
+ REGISTER_DECODER(CFHD, cfhd);
REGISTER_ENCDEC (CINEPAK, cinepak);
REGISTER_ENCDEC (CLJR, cljr);
REGISTER_DECODER(CLLC, cllc);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 35965d7..a76f695 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -315,6 +315,7 @@ enum AVCodecID {
AV_CODEC_ID_SMVJPEG,
AV_CODEC_ID_APNG,
AV_CODEC_ID_DAALA,
+ 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..6b15f70
--- /dev/null
+++ b/libavcodec/cfhd.c
@@ -0,0 +1,707 @@
+/*
+ * Copyright (c) 2015 Kieran Kunhya
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * CFHD Video Decoder
+ */
+
+#include "avcodec.h"
+#include "bswapdsp.h"
+#include "internal.h"
+#include "cfhd.h"
+#include "libavutil/avassert.h"
+#include "libavutil/buffer.h"
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
+
+static av_cold int cfhd_init_decoder(AVCodecContext *avctx)
+{
+ CFHDContext *s = avctx->priv_data;
+
+ ff_cfhd_init_vlcs(s);
+
+ avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
+ avctx->bits_per_raw_sample = 16;
+ s->avctx = avctx;
+
+ return 0;
+}
+
+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->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);
+}
+
+static inline int dequant_and_decompand(int level, int quantisation)
+{
+ int abslevel = abs(level);
+ return (abslevel + ((768 * abslevel * abslevel * abslevel) / (255 * 255 *
255))) * FFSIGN(level) * quantisation;
+}
+
+static inline void filter(int16_t *output, int out_stride, int16_t *low, int
low_stride,
+ int16_t *high, int high_stride, int len)
+{
+ int32_t tmp;
+ for( int 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;
+ 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 = ( 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;
+ 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;
+ }
+ 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;
+ 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;
+ }
+ }
+}
+
+static void horiz_filter(int16_t *output, int16_t *low, int16_t *high, int
width)
+{
+ filter(output, 1, low, 1, high, 1, width);
+}
+
+static void vert_filter(int16_t *output, int out_stride, int16_t *low, int
low_stride,
+ int16_t *high, int high_stride, int len)
+{
+ filter(output, out_stride, low, low_stride, high, high_stride, len);
+}
+
+static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
+ AVPacket *avpkt)
+{
+ CFHDContext *s = avctx->priv_data;
+ uint8_t *bs = avpkt->data;
+ int cnt = 0;
+ AVFrame *pic = data;
+ int ret;
+ int16_t *ll3 = av_malloc( (1<<23) * sizeof(*ll3));
+ int16_t *lh3 = av_malloc( (1<<23) * sizeof(*lh3));
+ int16_t *hl3 = av_malloc( (1<<23) * sizeof(*hl3));
+ int16_t *hh3 = av_malloc( (1<<23) * sizeof(*hh3));
+ int16_t *l3 = av_malloc( (1<<23) * sizeof(*l3));
+ int16_t *h3 = av_malloc( (1<<23) * sizeof(*h3));
+ int16_t *ll2 = av_malloc( (1<<23) * sizeof(*ll2));
+ int16_t *lh2 = av_malloc( (1<<23) * sizeof(*lh2));
+ int16_t *hl2 = av_malloc( (1<<23) * sizeof(*hl2));
+ int16_t *hh2 = av_malloc( (1<<23) * sizeof(*hh2));
+ int16_t *l2 = av_malloc( (1<<23) * sizeof(*l2));
+ int16_t *h2 = av_malloc( (1<<23) * sizeof(*h2));
+ int16_t *ll1 = av_malloc( (1<<23) * sizeof(*ll2));
+ int16_t *lh1 = av_malloc( (1<<23) * sizeof(*lh1));
+ int16_t *hl1 = av_malloc( (1<<23) * sizeof(*hl1));
+ int16_t *hh1 = av_malloc( (1<<23) * sizeof(*hh1));
+ int16_t *l1 = av_malloc( (1<<23) * sizeof(*l1));
+ int16_t *h1 = av_malloc( (1<<23) * sizeof(*h1));
+
+ int16_t *ll3_u = av_malloc( (1<<23) * sizeof(*ll3_u));
+ int16_t *lh3_u = av_malloc( (1<<23) * sizeof(*lh3_u));
+ int16_t *hl3_u = av_malloc( (1<<23) * sizeof(*hl3_u));
+ int16_t *hh3_u = av_malloc( (1<<23) * sizeof(*hh3_u));
+ int16_t *l3_u = av_malloc( (1<<23) * sizeof(*l3_u));
+ int16_t *h3_u = av_malloc( (1<<23) * sizeof(*h3_u));
+ int16_t *ll2_u = av_malloc( (1<<23) * sizeof(*ll2_u));
+ int16_t *lh2_u = av_malloc( (1<<23) * sizeof(*lh2_u));
+ int16_t *hl2_u = av_malloc( (1<<23) * sizeof(*hl2_u));
+ int16_t *hh2_u = av_malloc( (1<<23) * sizeof(*hh2_u));
+ int16_t *l2_u = av_malloc( (1<<23) * sizeof(*l2_u));
+ int16_t *h2_u = av_malloc( (1<<23) * sizeof(*h2_u));
+ int16_t *ll1_u = av_malloc( (1<<23) * sizeof(*ll2_u));
+ int16_t *lh1_u = av_malloc( (1<<23) * sizeof(*lh1_u));
+ int16_t *hl1_u = av_malloc( (1<<23) * sizeof(*hl1_u));
+ int16_t *hh1_u = av_malloc( (1<<23) * sizeof(*hh1_u));
+ int16_t *l1_u = av_malloc( (1<<23) * sizeof(*l1_u));
+ int16_t *h1_u = av_malloc( (1<<23) * sizeof(*h1_u));
+
+ int16_t *ll3_v = av_malloc( (1<<23) * sizeof(*ll3_v));
+ int16_t *lh3_v = av_malloc( (1<<23) * sizeof(*lh3_v));
+ int16_t *hl3_v = av_malloc( (1<<23) * sizeof(*hl3_v));
+ int16_t *hh3_v = av_malloc( (1<<23) * sizeof(*hh3_v));
+ int16_t *l3_v = av_malloc( (1<<23) * sizeof(*l3_v));
+ int16_t *h3_v = av_malloc( (1<<23) * sizeof(*h3_v));
+ int16_t *ll2_v = av_malloc( (1<<23) * sizeof(*ll2_v));
+ int16_t *lh2_v = av_malloc( (1<<23) * sizeof(*lh2_v));
+ int16_t *hl2_v = av_malloc( (1<<23) * sizeof(*hl2_v));
+ int16_t *hh2_v = av_malloc( (1<<23) * sizeof(*hh2_v));
+ int16_t *l2_v = av_malloc( (1<<23) * sizeof(*l2_v));
+ int16_t *h2_v = av_malloc( (1<<23) * sizeof(*h2_v));
+ int16_t *ll1_v = av_malloc( (1<<23) * sizeof(*ll2_v));
+ int16_t *lh1_v = av_malloc( (1<<23) * sizeof(*lh1_v));
+ int16_t *hl1_v = av_malloc( (1<<23) * sizeof(*hl1_v));
+ int16_t *hh1_v = av_malloc( (1<<23) * sizeof(*hh1_v));
+ int16_t *l1_v = av_malloc( (1<<23) * sizeof(*l1_v));
+ int16_t *h1_v = av_malloc( (1<<23) * sizeof(*h1_v));
+
+ int16_t *subband[3][10] = {{0}};
+ subband[0][0] = ll3;
+ subband[0][1] = lh3;
+ subband[0][2] = hl3;
+ subband[0][3] = hh3;
+ subband[0][4] = lh2;
+ subband[0][5] = hl2;
+ subband[0][6] = hh2;
+ subband[0][7] = lh1;
+ subband[0][8] = hl1;
+ subband[0][9] = hh1;
+
+ subband[1][0] = ll3_u;
+ subband[1][1] = lh3_u;
+ subband[1][2] = hl3_u;
+ subband[1][3] = hh3_u;
+ subband[1][4] = lh2_u;
+ subband[1][5] = hl2_u;
+ subband[1][6] = hh2_u;
+ subband[1][7] = lh1_u;
+ subband[1][8] = hl1_u;
+ subband[1][9] = hh1_u;
+
+ subband[2][0] = ll3_v;
+ subband[2][1] = lh3_v;
+ subband[2][2] = hl3_v;
+ subband[2][3] = hh3_v;
+ subband[2][4] = lh2_v;
+ subband[2][5] = hl2_v;
+ subband[2][6] = hh2_v;
+ subband[2][7] = lh1_v;
+ subband[2][8] = hl1_v;
+ subband[2][9] = hh1_v;
+
+ int16_t *l_h[3][8];
+ l_h[0][0] = l3;
+ l_h[0][1] = h3;
+ l_h[0][2] = ll2;
+ l_h[0][3] = l2;
+ l_h[0][4] = h2;
+ l_h[0][5] = ll1;
+ l_h[0][6] = l1;
+ l_h[0][7] = h1;
+
+ l_h[1][0] = l3_u;
+ l_h[1][1] = h3_u;
+ l_h[1][2] = ll2_u;
+ l_h[1][3] = l2_u;
+ l_h[1][4] = h2_u;
+ l_h[1][5] = ll1_u;
+ l_h[1][6] = l1_u;
+ l_h[1][7] = h1_u;
+
+ l_h[2][0] = l3_v;
+ l_h[2][1] = h3_v;
+ l_h[2][2] = ll2_v;
+ l_h[2][3] = l2_v;
+ l_h[2][4] = h2_v;
+ l_h[2][5] = ll1_v;
+ l_h[2][6] = l1_v;
+ l_h[2][7] = h1_v;
+
+ init_frame_defaults(s);
+ avcodec_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift,
&s->chroma_y_shift);
+
+ if ((ret = ff_get_buffer(avctx, pic, 0)) < 0)
+ return ret;
+
+ while( cnt < avpkt->size )
+ {
+ int16_t tag = AV_RB16(&bs[cnt]);
+ int8_t tag8 = (int8_t)bs[cnt];
+ uint16_t abstag = abs(tag);
+ int8_t abs_tag8 = abs(tag8);
+ uint16_t data = AV_RB16(&bs[cnt+2]);
+ if(abs_tag8 >= 0x60 && abs_tag8 <= 0x6f)
+ {
+ printf("\n large len %x \n", AV_RB24(&bs[cnt+1]));
+ }
+ else if( tag == 20 )
+ {
+ printf("\n width %u %x \n", data, cnt );
+ avctx->width = data;
+ }
+ else if( tag == 21 )
+ {
+ printf("\n height %u %x \n", data, cnt );
+ avctx->height = data;
+ }
+ else if( tag == 101 )
+ {
+ s->bpc = data;
+ printf("\n bitspercmpnt %u \n", data);
+ }
+ else if( tag == 12 )
+ {
+ s->channel_cnt = data;
+ printf("\n channel count %u \n", data);
+ }
+ else if( tag == 14 )
+ printf("\n subband count %u %x \n", data, cnt);
+ else if( tag == 62 )
+ {
+ s->channel_num = data;
+ printf("\n channel number %u \n", data);
+ init_plane_defaults(s);
+ }
+ else if( tag == 48 )
+ {
+ if( s->subband_num != 0 && data == 1 ) // hack
+ s->level++;
+ printf("\n subband number %u %x \n", data, cnt);
+ s->subband_num = data;
+ }
+ else if( tag == 51 )
+ {
+ printf("\n subband number actual %u %x \n", data, cnt);
+ s->subband_num_actual = data;
+ }
+ else if( tag == 35 )
+ printf("\n lowpass precision %u %x \n", data, cnt);
+ else if( tag == 53 )
+ {
+ s->quantisation = data;
+ printf("\n quantisation %u %x \n", data, cnt);
+ }
+ else if( tag == 109 )
+ {
+ s->prescale_shift[0] = (data >> 0) & 0x7;
+ s->prescale_shift[1] = (data >> 3) & 0x7;
+ s->prescale_shift[2] = (data >> 6) & 0x7;
+ printf("\n prescaleshift %u %x \n", data, cnt);
+ }
+ else if( tag == 27 )
+ {
+ s->plane[s->channel_num].band[0][0].width = data;
+ s->plane[s->channel_num].band[0][0].stride = data;
+ printf("\n lowpasswidth %u %x \n", data, cnt );
+ }
+ else if( tag == 28 )
+ {
+ s->plane[s->channel_num].band[0][0].height = data;
+ printf("\n lowpassheight %u %x \n", data, cnt );
+ }
+ else if( tag == 1 )
+ printf("\n sample-type? %u %x \n", data, cnt );
+ else if( tag == 10 )
+ printf("\n transform-type? %u %x \n", data, cnt );
+ else if( abstag >= 0x4000 && abstag <= 0x40ff )
+ {
+ printf("\n small3 chunk length %u %s %x \n", data*4, tag < 0 ?
"optional" : "required", cnt );
+ cnt += data * 4;
+ }
+ else if( tag == 23 )
+ {
+ printf("\n skip frame \n");
+ }
+ else if( tag == 2 )
+ {
+ printf("\n tag=2 header - skipping %i tag/value pairs \n", data);
+ int i;
+ for( i = 0; i < data; i++ )
+ {
+ printf("\n %x %x \n", AV_RB16(&bs[cnt]), AV_RB16(&bs[cnt+2]) );
+ cnt += 4;
+ }
+ }
+ else if( tag == 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);
+ printf("\n highpass width %i channel %i level %i subband %i \n",
data, s->channel_num, s->level, s->subband_num);
+ }
+ else if( tag == 42 )
+ {
+ s->plane[s->channel_num].band[s->level][s->subband_num].height =
data;
+ printf("\n highpass height %i \n", data);
+ }
+ else if( tag == 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);
+ printf("\n highpass width2 %i \n", data);
+ }
+ else if( tag == 50 )
+ {
+ s->plane[s->channel_num].band[s->level][s->subband_num].height =
data;
+ printf("\n highpass height2 %i \n", data);
+ }
+ else if( tag == 71 )
+ {
+ s->codebook = data;
+ printf("\n codebook %i \n", s->codebook );
+ }
+ else if( tag == 72 )
+ {
+ s->codebook = data;
+ printf("\n other codebook? %i \n", s->codebook );
+ }
+ else if( tag != 4 && data != 0xf0f )
+ {
+ printf("\n unknown tag %i data %x pos %x \n", tag, data, cnt);
+ }
+ cnt += 4;
+
+ int16_t *coeff_data = subband[s->channel_num][s->subband_num_actual];
+
+ // Lowpass coefficients
+ if( tag == 4 && data == 0xf0f )
+ {
+ int lowpass_height = s->plane[s->channel_num].band[0][0].height;
+ int lowpass_width = s->plane[s->channel_num].band[0][0].width;
+ uint16_t coeffs = 0;
+ printf("\n start of lowpass coeffs cmpnt %u \n", s->channel_num);
+ int i, j;
+ for( i = 0; i < lowpass_height; i++ )
+ {
+ for( j = 0; j < lowpass_width; j++ )
+ {
+ coeff_data[j] = AV_RB16(&bs[cnt]);
+
+ coeffs++;
+ cnt += 2;
+ }
+ coeff_data += lowpass_width;
+ }
+
+ /* 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) );
+ }
+
+ printf("\n coeffs %u \n", coeffs);
+ }
+
+ if( tag == 55 && s->subband_num_actual != 255 )
+ {
+ 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_stride =
s->plane[s->channel_num].band[s->level][s->subband_num].stride;
+
+ int expected = highpass_height * highpass_stride;
+ printf("\n start subband coeffs plane %i level %i codebook %i
expected %i \n", s->channel_num, s->level, s->codebook, expected);
+ int level, run, coeff;
+ int count = 0;
+
+ init_get_bits(&s->gb, &bs[cnt], (avpkt->size - cnt) * 8);
+ OPEN_READER(re, &s->gb);
+ if (!s->codebook) {
+ for (;;) {
+ 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;
+
+ coeff = dequant_and_decompand(level, s->quantisation);
+ for( int i = 0; i < run; i++ )
+ *coeff_data++ = coeff;
+ }
+ }
+ else {
+ for (;;) {
+ 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;
+
+ coeff = dequant_and_decompand(level, s->quantisation);
+ for( int i = 0; i < run; i++ )
+ *coeff_data++ = coeff;
+ }
+ }
+ CLOSE_READER(re, &s->gb);
+ int bytes = FF_CEIL_RSHIFT(get_bits_count(&s->gb), 3);
+ cnt += FFALIGN(bytes, 4);
+ printf("\n end subband coeffs %i extra %i %x %x \n", count, count
- expected, subband[s->subband_num_actual], coeff_data);
+ 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) );
+ }
+
+ }
+ }
+
+ int16_t *low, *high, *output;
+ for( int plane = 0; plane < 3; 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;
+
+ printf("\n level 1 plane %i %i %i %i \n", plane, lowpass_height,
lowpass_width, highpass_stride);
+
+ low = subband[plane][0];
+ high = subband[plane][2];
+ output = l_h[plane][0];
+ for( int i = 0; i < lowpass_width; i++ )
+ {
+ vert_filter(output, lowpass_width, low, lowpass_width, high,
highpass_stride, lowpass_height);
+ low++;
+ high++;
+ output++;
+ }
+
+ low = subband[plane][1];
+ high = subband[plane][3];
+ output = l_h[plane][1];
+ for( int 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 = l_h[plane][0];
+ high = l_h[plane][1];
+ output = l_h[plane][2];
+ for( int i = 0; i < lowpass_height*2; i++ )
+ {
+ horiz_filter(output, low, high, lowpass_width);
+ low += lowpass_width;
+ high += lowpass_width;
+ output += lowpass_width*2;
+ }
+
+
+ /* level 2 */
+ lowpass_height = s->plane[plane].band[1][1].height;
+ lowpass_width = s->plane[plane].band[1][1].width;
+ highpass_stride = s->plane[plane].band[1][1].stride;
+
+ printf("\n level 2 plane %i %i %i %i \n", plane, lowpass_height,
lowpass_width, highpass_stride);
+
+ low = l_h[plane][2];
+ high = subband[plane][5];
+ output = l_h[plane][3];
+ for( int i = 0; i < lowpass_width; i++ )
+ {
+ vert_filter(output, lowpass_width, low, lowpass_width, high,
highpass_stride, lowpass_height);
+ low++;
+ high++;
+ output++;
+ }
+
+ low = subband[plane][4];
+ high = subband[plane][6];
+ output = l_h[plane][4];
+ for( int i = 0; i < lowpass_width; i++ )
+ {
+ vert_filter(output, lowpass_width, low, highpass_stride, high,
highpass_stride, lowpass_height);
+ low++;
+ high++;
+ output++;
+ }
+
+ low = l_h[plane][3];
+ high = l_h[plane][4];
+ output = l_h[plane][5];
+ for( int i = 0; i < lowpass_height*2; i++ )
+ {
+ horiz_filter(output, low, high, lowpass_width);
+ low += lowpass_width;
+ high += lowpass_width;
+ output += lowpass_width*2;
+ }
+
+ output = l_h[plane][5];
+ for( int i = 0; i < lowpass_height*2; i++ )
+ {
+ for( int j = 0; j < lowpass_width*2; j++ )
+ {
+ output[j] <<= 2;
+ }
+ output += lowpass_width*2;
+ }
+
+ /* level 3 */
+ lowpass_height = s->plane[plane].band[2][1].height;
+ lowpass_width = s->plane[plane].band[2][1].width;
+ highpass_stride = s->plane[plane].band[2][1].stride;
+
+ printf("\n level 3 plane %i %i %i %i \n", plane, lowpass_height,
lowpass_width, highpass_stride);
+
+ low = l_h[plane][5];
+ high = subband[plane][8];
+ output = l_h[plane][6];
+ for( int i = 0; i < lowpass_width; i++ )
+ {
+ vert_filter(output, lowpass_width, low, lowpass_width, high,
highpass_stride, lowpass_height);
+ low++;
+ high++;
+ output++;
+ }
+
+ low = subband[plane][7];
+ high = subband[plane][9];
+ output = l_h[plane][7];
+ for( int i = 0; i < lowpass_width; i++ )
+ {
+ vert_filter(output, lowpass_width, low, highpass_stride, high,
highpass_stride, lowpass_height);
+ low++;
+ high++;
+ output++;
+ }
+
+ int act_plane = plane == 1 ? 2 : plane == 2 ? 1 : 0;
+
+ int16_t *dst = (int16_t *)pic->data[act_plane];
+ low = l_h[plane][6];
+ high = l_h[plane][7];
+ for( int i = 0; i < lowpass_height*2; i++ )
+ {
+ horiz_filter(dst, low, high, lowpass_width);
+ low += lowpass_width;
+ high += lowpass_width;
+ dst += pic->linesize[act_plane] / 2;
+ }
+ }
+
+ printf("\n frame %i bytes \n", avpkt->size);
+
+ av_freep(&ll3);
+ av_freep(&lh3);
+ av_freep(&hl3);
+ av_freep(&hh3);
+ av_freep(&l3);
+ av_freep(&h3);
+ av_freep(&ll2);
+ av_freep(&lh2);
+ av_freep(&hl2);
+ av_freep(&hh2);
+ av_freep(&l2);
+ av_freep(&h2);
+ av_freep(&ll1);
+ av_freep(&lh1);
+ av_freep(&hl1);
+ av_freep(&hh1);
+ av_freep(&l1);
+ av_freep(&h1);
+
+ av_freep(&ll3_u);
+ av_freep(&lh3_u);
+ av_freep(&hl3_u);
+ av_freep(&hh3_u);
+ av_freep(&l3_u);
+ av_freep(&h3_u);
+ av_freep(&ll2_u);
+ av_freep(&lh2_u);
+ av_freep(&hl2_u);
+ av_freep(&hh2_u);
+ av_freep(&l2_u);
+ av_freep(&h2_u);
+ av_freep(&ll1_u);
+ av_freep(&lh1_u);
+ av_freep(&hl1_u);
+ av_freep(&hh1_u);
+ av_freep(&l1_u);
+ av_freep(&h1_u);
+
+ av_freep(&ll3_v);
+ av_freep(&lh3_v);
+ av_freep(&hl3_v);
+ av_freep(&hh3_v);
+ av_freep(&l3_v);
+ av_freep(&h3_v);
+ av_freep(&ll2_v);
+ av_freep(&lh2_v);
+ av_freep(&hl2_v);
+ av_freep(&hh2_v);
+ av_freep(&l2_v);
+ av_freep(&h2_v);
+ av_freep(&ll1_v);
+ av_freep(&lh1_v);
+ av_freep(&hl1_v);
+ av_freep(&hh1_v);
+ av_freep(&l1_v);
+ av_freep(&h1_v);
+
+ *got_frame = 1;
+ return avpkt->size;
+}
+
+static av_cold int cfhd_close_decoder(AVCodecContext *avctx)
+{
+ CFHDContext *s = avctx->priv_data;
+
+ ff_free_vlc(&s->vlc_9);
+ ff_free_vlc(&s->vlc_18);
+
+ return 0;
+}
+
+AVCodec ff_cfhd_decoder = {
+ .name = "cfhdvideo",
+ .long_name = NULL_IF_CONFIG_SMALL("cfhd video"),
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_CFHD,
+ .priv_data_size = sizeof(CFHDContext),
+ .init = cfhd_init_decoder,
+ .close = cfhd_close_decoder,
+ .decode = cfhd_decode,
+};
diff --git a/libavcodec/cfhd.h b/libavcodec/cfhd.h
new file mode 100644
index 0000000..1a5830e
--- /dev/null
+++ b/libavcodec/cfhd.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015 Kieran Kunhya
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "get_bits.h"
+
+#define VLC_BITS 9
+#define NB_VLC_TABLE_9 (71+3)
+#define NB_VLC_TABLE_18 (263+1)
+
+typedef struct CFHD_RL_VLC_ELEM {
+ int16_t level;
+ int8_t len;
+ uint16_t run;
+} CFHD_RL_VLC_ELEM;
+
+#define DWT_LEVELS 3
+
+#define CALC_PADDING(size, depth) \
+ (((size + (1 << depth) - 1) >> depth) << depth)
+
+typedef struct SubBand {
+ int level;
+ int orientation;
+ int stride;
+ int width;
+ int height;
+ int pshift;
+ int quant;
+ uint8_t *ibuf;
+} SubBand;
+
+typedef struct Plane {
+ int width;
+ int height;
+ ptrdiff_t stride;
+
+ int idwt_width;
+ int idwt_height;
+ int idwt_stride;
+ uint8_t *idwt_buf;
+ uint8_t *idwt_buf_base;
+ uint8_t *idwt_tmp;
+
+ SubBand band[DWT_LEVELS][4];
+} Plane;
+
+typedef struct {
+ 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 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);
diff --git a/libavcodec/cfhddata.c b/libavcodec/cfhddata.c
new file mode 100644
index 0000000..2529894
--- /dev/null
+++ b/libavcodec/cfhddata.c
@@ -0,0 +1,466 @@
+/*
+ * Copyright (c) 2015 Kieran Kunhya
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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.
+ *
+ * FFmpeg 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 FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "internal.h"
+#include "get_bits.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
+
+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,
+};
+
+#define NB_VLC_TABLE_17 263
+
+static const uint32_t table_17_vlc_bits[NB_VLC_TABLE_17] = {
+ 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,
+};
+
+static const uint8_t table_17_vlc_len[NB_VLC_TABLE_17] = {
+ 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,
+};
+
+static const uint16_t table_17_vlc_run[NB_VLC_TABLE_17] = {
+ 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,
+};
+
+static const uint16_t table_17_vlc_level[NB_VLC_TABLE_17] = {
+ 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,
+};
+
+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;
+ 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];
+ }
+ }
+
+ init_vlc(&s->vlc_9, VLC_BITS, j, new_cfhd_vlc_len,
+ 1, 1, new_cfhd_vlc_bits, 4, 4, 0);
+ 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];
+ }
+ }
+
+ init_vlc(&s->vlc_18, VLC_BITS, j, new_cfhd_vlc_len,
+ 1, 1, new_cfhd_vlc_bits, 4, 4, 0);
+ assert(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 0;
+}
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 9cad3e6..d0d2ebb 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -1512,6 +1512,12 @@ static const AVCodecDescriptor codec_descriptors[] = {
.props = AV_CODEC_PROP_LOSSLESS,
.mime_types= MT("image/png"),
},
+ {
+ .id = AV_CODEC_ID_CFHD,
+ .type = AVMEDIA_TYPE_VIDEO,
+ .name = "cfhd",
+ .long_name = NULL_IF_CONFIG_SMALL("Cineform HD"),
+ },
/* various PCM "codecs" */
{
diff --git a/libavformat/riff.c b/libavformat/riff.c
index f297dd4..faf0f86 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -377,6 +377,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 }
};
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
