#include "bitstream.h"
#include "dnxhddata.h"
#include "dsputil.h"
-#include "mpegvideo.h"
-
-typedef struct {
- int cid;
- unsigned int width, height;
- int interlaced;
- unsigned int frame_size;
- unsigned int coding_unit_size;
- int index_bits;
- int bit_depth;
- const uint8_t *luma_weigth, *chroma_weigth;
- const uint8_t *dc_codes, *dc_bits;
- const uint16_t *ac_codes;
- const uint8_t *ac_bits, *ac_level;
- const uint8_t *ac_run_flag, *ac_index_flag;
- const uint16_t *run_codes;
- const uint8_t *run_bits, *run;
-} CIDEntry;
typedef struct {
AVCodecContext *avctx;
unsigned int mb_width, mb_height;
uint32_t mb_scan_index[68]; /* max for 1080p */
int cur_field; ///< current interlaced field
- int index_bits; ///< length of index value
VLC ac_vlc, dc_vlc, run_vlc;
- const uint8_t *ac_level, *run;
- const uint8_t *ac_run_flag, *ac_index_flag;
- const uint8_t *luma_weigth, *chroma_weigth;
int last_dc[3];
DSPContext dsp;
DECLARE_ALIGNED_16(DCTELEM, blocks[8][64]);
const CIDEntry *cid_table;
} DNXHDContext;
-static const CIDEntry cid_table[] = {
- { 1238, 1920, 1080, 0, 917504, 917504, 4, 8,
- dnxhd_1238_luma_weigth, dnxhd_1238_chroma_weigth,
- dnxhd_1238_dc_codes, dnxhd_1238_dc_bits,
- dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level,
- dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag,
- dnxhd_1238_run_codes, dnxhd_1238_run_bits, dnxhd_1238_run },
-/* { 1243, 1920, 1080, 1, 917504, 458752, 4, 8, */
-/* dnxhd_1243_luma_weigth, dnxhd_1243_chroma_weigth, */
-/* dnxhd_1238_dc_codes, dnxhd_1238_dc_bits, */
-/* dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level, */
-/* dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag, */
-/* dnxhd_1238_run_codes, dnxhd_1238_run_bits, dnxhd_1238_run }, */
-};
-
-static int dnxhd_get_cid_table(int cid)
-{
- int i;
- for (i = 0; i < sizeof(cid_table)/sizeof(CIDEntry); i++)
- if (cid_table[i].cid == cid)
- return i;
- return -1;
-}
-
#define DNXHD_VLC_BITS 9
-#define DNXHD_DC_VLC_BITS 6
+#define DNXHD_DC_VLC_BITS 7
static int dnxhd_decode_init(AVCodecContext *avctx)
{
if (!ctx->cid_table) {
int index;
- if ((index = dnxhd_get_cid_table(cid)) < 0) {
+ if ((index = ff_dnxhd_get_cid_table(cid)) < 0) {
av_log(ctx->avctx, AV_LOG_ERROR, "unsupported cid %d\n", cid);
return -1;
}
- ctx->cid_table = &cid_table[index];
+ ctx->cid_table = &ff_dnxhd_cid_table[index];
init_vlc(&ctx->ac_vlc, DNXHD_VLC_BITS, 257,
- cid_table->ac_bits, 1, 1,
- cid_table->ac_codes, 2, 2, 0);
- init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, 12,
- cid_table->dc_bits, 1, 1,
- cid_table->dc_codes, 1, 1, 0);
+ ctx->cid_table->ac_bits, 1, 1,
+ ctx->cid_table->ac_codes, 2, 2, 0);
+ init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, ctx->cid_table->bit_depth+4,
+ ctx->cid_table->dc_bits, 1, 1,
+ ctx->cid_table->dc_codes, 1, 1, 0);
init_vlc(&ctx->run_vlc, DNXHD_VLC_BITS, 62,
- cid_table->run_bits, 1, 1,
- cid_table->run_codes, 2, 2, 0);
-
- ctx->run = cid_table->run;
- ctx->ac_level = cid_table->ac_level;
- ctx->ac_run_flag = cid_table->ac_run_flag;
- ctx->ac_index_flag = cid_table->ac_index_flag;
- ctx->luma_weigth = cid_table->luma_weigth;
- ctx->chroma_weigth = cid_table->chroma_weigth;
-
- ctx->index_bits = cid_table->index_bits;
+ ctx->cid_table->run_bits, 1, 1,
+ ctx->cid_table->run_codes, 2, 2, 0);
ff_init_scantable(ctx->dsp.idct_permutation, &ctx->scantable, ff_zigzag_direct);
}
return 0;
}
-static int dnxhd_decode_header(DNXHDContext *ctx, uint8_t *buf, int buf_size)
+static int dnxhd_decode_header(DNXHDContext *ctx, const uint8_t *buf, int buf_size, int first_field)
{
static const uint8_t header_prefix[] = { 0x00, 0x00, 0x02, 0x80, 0x01 };
int i;
av_log(ctx->avctx, AV_LOG_ERROR, "error in header\n");
return -1;
}
- if (buf[5] & 2) {/* interlaced FIXME top or bottom */
+ if (buf[5] & 2) { /* interlaced */
+ ctx->cur_field = buf[5] & 1;
ctx->picture.interlaced_frame = 1;
- av_log(ctx->avctx, AV_LOG_DEBUG, "interlaced %d\n", buf[5] & 3);
+ ctx->picture.top_field_first = first_field ^ ctx->cur_field;
+ av_log(ctx->avctx, AV_LOG_DEBUG, "interlaced %d, cur field %d\n", buf[5] & 3, ctx->cur_field);
}
ctx->height = AV_RB16(buf + 0x18);
dprintf(ctx->avctx, "width %d, heigth %d\n", ctx->width, ctx->height);
- if (buf[0x21] & 0x80) {
+ if (buf[0x21] & 0x40) {
av_log(ctx->avctx, AV_LOG_ERROR, "10 bit per component\n");
return -1;
}
if (n&2) {
component = 1 + (n&1);
- weigth_matrix = ctx->chroma_weigth;
+ weigth_matrix = ctx->cid_table->chroma_weight;
} else {
component = 0;
- weigth_matrix = ctx->luma_weigth;
+ weigth_matrix = ctx->cid_table->luma_weight;
}
ctx->last_dc[component] += dnxhd_decode_dc(ctx);
for (i = 1; ; i++) {
index = get_vlc2(&ctx->gb, ctx->ac_vlc.table, DNXHD_VLC_BITS, 2);
//av_log(ctx->avctx, AV_LOG_DEBUG, "index %d\n", index);
- level = ctx->ac_level[index];
+ level = ctx->cid_table->ac_level[index];
if (!level) { /* EOB */
//av_log(ctx->avctx, AV_LOG_DEBUG, "EOB\n");
return;
}
sign = get_sbits(&ctx->gb, 1);
- if (ctx->ac_index_flag[index]) {
- level += get_bits(&ctx->gb, ctx->index_bits)<<6;
+ if (ctx->cid_table->ac_index_flag[index]) {
+ level += get_bits(&ctx->gb, ctx->cid_table->index_bits)<<6;
}
- if (ctx->ac_run_flag[index]) {
+ if (ctx->cid_table->ac_run_flag[index]) {
index2 = get_vlc2(&ctx->gb, ctx->run_vlc.table, DNXHD_VLC_BITS, 2);
- i += ctx->run[index2];
+ i += ctx->cid_table->run[index2];
}
- j = ctx->scantable.permutated[i];
- //av_log(ctx->avctx, AV_LOG_DEBUG, "j %d\n", j);
- //av_log(ctx->avctx, AV_LOG_DEBUG, "level %d, weigth %d\n", level, weigth_matrix[i]);
- level = (2*level+1) * qscale * weigth_matrix[i];
- if (weigth_matrix[i] != 32) // FIXME 10bit
- level += 32;
- level >>= 6;
- level = (level^sign) - sign;
-
if (i > 63) {
av_log(ctx->avctx, AV_LOG_ERROR, "ac tex damaged %d, %d\n", n, i);
return;
}
+ j = ctx->scantable.permutated[i];
+ //av_log(ctx->avctx, AV_LOG_DEBUG, "j %d\n", j);
+ //av_log(ctx->avctx, AV_LOG_DEBUG, "level %d, weigth %d\n", level, weigth_matrix[i]);
+ level = (2*level+1) * qscale * weigth_matrix[i];
+ if (ctx->cid_table->bit_depth == 10) {
+ if (weigth_matrix[i] != 8)
+ level += 8;
+ level >>= 4;
+ } else {
+ if (weigth_matrix[i] != 32)
+ level += 32;
+ level >>= 6;
+ }
//av_log(NULL, AV_LOG_DEBUG, "i %d, j %d, end level %d\n", i, j, level);
- block[j] = level;
+ block[j] = (level^sign) - sign;
}
}
for (i = 0; i < 8; i++) {
dnxhd_decode_dct_block(ctx, ctx->blocks[i], i, qscale);
}
+
+ if (ctx->picture.interlaced_frame) {
+ dct_linesize_luma <<= 1;
+ dct_linesize_chroma <<= 1;
+ }
+
dest_y = ctx->picture.data[0] + ((y * dct_linesize_luma) << 4) + (x << 4);
dest_u = ctx->picture.data[1] + ((y * dct_linesize_chroma) << 4) + (x << 3);
dest_v = ctx->picture.data[2] + ((y * dct_linesize_chroma) << 4) + (x << 3);
+ if (ctx->cur_field) {
+ dest_y += ctx->picture.linesize[0];
+ dest_u += ctx->picture.linesize[1];
+ dest_v += ctx->picture.linesize[2];
+ }
+
dct_offset = dct_linesize_luma << 3;
ctx->dsp.idct_put(dest_y, dct_linesize_luma, ctx->blocks[0]);
ctx->dsp.idct_put(dest_y + 8, dct_linesize_luma, ctx->blocks[1]);
return 0;
}
-static int dnxhd_decode_macroblocks(DNXHDContext *ctx, uint8_t *buf, int buf_size)
+static int dnxhd_decode_macroblocks(DNXHDContext *ctx, const uint8_t *buf, int buf_size)
{
int x, y;
for (y = 0; y < ctx->mb_height; y++) {
ctx->last_dc[0] =
ctx->last_dc[1] =
- ctx->last_dc[2] = 1024; // 1024 for levels +128
+ ctx->last_dc[2] = 1<<(ctx->cid_table->bit_depth+2); // for levels +2^(bitdepth-1)
init_get_bits(&ctx->gb, buf + ctx->mb_scan_index[y], (buf_size - ctx->mb_scan_index[y]) << 3);
for (x = 0; x < ctx->mb_width; x++) {
//START_TIMER;
}
static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ const uint8_t *buf, int buf_size)
{
DNXHDContext *ctx = avctx->priv_data;
AVFrame *picture = data;
+ int first_field = 1;
dprintf(avctx, "frame size %d\n", buf_size);
- if (dnxhd_decode_header(ctx, buf, buf_size) < 0)
+ decode_coding_unit:
+ if (dnxhd_decode_header(ctx, buf, buf_size, first_field) < 0)
return -1;
avctx->pix_fmt = PIX_FMT_YUV422P;
return -1;
avcodec_set_dimensions(avctx, ctx->width, ctx->height);
- if (ctx->picture.data[0])
- avctx->release_buffer(avctx, &ctx->picture);
- if (avctx->get_buffer(avctx, &ctx->picture) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
+ if (first_field) {
+ if (ctx->picture.data[0])
+ avctx->release_buffer(avctx, &ctx->picture);
+ if (avctx->get_buffer(avctx, &ctx->picture) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return -1;
+ }
}
dnxhd_decode_macroblocks(ctx, buf + 0x280, buf_size - 0x280);
+ if (first_field && ctx->picture.interlaced_frame) {
+ buf += ctx->cid_table->coding_unit_size;
+ buf_size -= ctx->cid_table->coding_unit_size;
+ first_field = 0;
+ goto decode_coding_unit;
+ }
+
*picture = ctx->picture;
*data_size = sizeof(AVPicture);
return buf_size;
{
DNXHDContext *ctx = avctx->priv_data;
- if(ctx->picture.data[0])
+ if (ctx->picture.data[0])
avctx->release_buffer(avctx, &ctx->picture);
free_vlc(&ctx->ac_vlc);
free_vlc(&ctx->dc_vlc);