#include "blockdsp.h"
#include "get_bits.h"
#include "dnxhddata.h"
-#include "dsputil.h"
+#include "idctdsp.h"
#include "internal.h"
+#include "thread.h"
typedef struct DNXHDContext {
AVCodecContext *avctx;
int cur_field; ///< current interlaced field
VLC ac_vlc, dc_vlc, run_vlc;
int last_dc[3];
- DSPContext dsp;
+ IDCTDSPContext idsp;
DECLARE_ALIGNED(16, int16_t, blocks)[12][64];
ScanTable scantable;
const CIDEntry *cid_table;
int bit_depth; // 8, 10 or 0 if not initialized at all.
int is_444;
+ int mbaff;
void (*decode_dct_block)(struct DNXHDContext *ctx, int16_t *block,
int n, int qscale);
} DNXHDContext;
return AVERROR(ENOSYS);
}
ctx->cid_table = &ff_dnxhd_cid_table[index];
+ av_log(ctx->avctx, AV_LOG_VERBOSE, "Profile cid %d.\n", cid);
ff_free_vlc(&ctx->ac_vlc);
ff_free_vlc(&ctx->dc_vlc);
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_init_scantable(ctx->idsp.idct_permutation, &ctx->scantable,
ff_zigzag_direct);
ctx->cid = cid;
}
static const uint8_t header_prefix[] = { 0x00, 0x00, 0x02, 0x80, 0x01 };
static const uint8_t header_prefix444[] = { 0x00, 0x00, 0x02, 0x80, 0x02 };
int i, cid, ret;
+ int old_bit_depth = ctx->bit_depth;
- if (buf_size < 0x280)
+ if (buf_size < 0x280) {
+ av_log(ctx->avctx, AV_LOG_ERROR, "buffer too small (%d < 640).\n",
+ buf_size);
return AVERROR_INVALIDDATA;
+ }
if (memcmp(buf, header_prefix, 5) && memcmp(buf, header_prefix444, 5)) {
- av_log(ctx->avctx, AV_LOG_ERROR, "error in header\n");
+ av_log(ctx->avctx, AV_LOG_ERROR,
+ "unknown header 0x%02"PRIX8" 0x%02"PRIX8" 0x%02"PRIX8" 0x%02"PRIX8" 0x%02"PRIX8"\n",
+ buf[0], buf[1], buf[2], buf[3], buf[4]);
return AVERROR_INVALIDDATA;
}
if (buf[5] & 2) { /* interlaced */
frame->interlaced_frame = 1;
frame->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);
+ "interlaced %"PRId8", cur field %d\n", buf[5] & 3, ctx->cur_field);
}
+ ctx->mbaff = buf[0x6] & 32;
ctx->height = AV_RB16(buf + 0x18);
ctx->width = AV_RB16(buf + 0x1a);
- av_dlog(ctx->avctx, "width %d, height %d\n", ctx->width, ctx->height);
+ ff_dlog(ctx->avctx, "width %u, height %u\n", ctx->width, ctx->height);
+
+ if (buf[0x21] == 0x58) { /* 10 bit */
+ ctx->bit_depth = ctx->avctx->bits_per_raw_sample = 10;
- ctx->is_444 = 0;
- if (buf[0x4] == 0x2) {
- ctx->avctx->pix_fmt = AV_PIX_FMT_YUV444P10;
- ctx->avctx->bits_per_raw_sample = 10;
- if (ctx->bit_depth != 10) {
- ff_blockdsp_init(&ctx->bdsp, ctx->avctx);
- ff_dsputil_init(&ctx->dsp, ctx->avctx);
- ctx->bit_depth = 10;
+ if (buf[0x4] == 0x2) {
ctx->decode_dct_block = dnxhd_decode_dct_block_10_444;
- }
- ctx->is_444 = 1;
- } else if (buf[0x21] & 0x40) {
- ctx->avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
- ctx->avctx->bits_per_raw_sample = 10;
- if (ctx->bit_depth != 10) {
- ff_blockdsp_init(&ctx->bdsp, ctx->avctx);
- ff_dsputil_init(&ctx->dsp, ctx->avctx);
- ctx->bit_depth = 10;
+ ctx->avctx->pix_fmt = AV_PIX_FMT_YUV444P10;
+ ctx->is_444 = 1;
+ } else {
ctx->decode_dct_block = dnxhd_decode_dct_block_10;
+ ctx->avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
}
- } else {
+ } else if (buf[0x21] == 0x38) { /* 8 bit */
+ ctx->bit_depth = ctx->avctx->bits_per_raw_sample = 8;
+
ctx->avctx->pix_fmt = AV_PIX_FMT_YUV422P;
- ctx->avctx->bits_per_raw_sample = 8;
- if (ctx->bit_depth != 8) {
- ff_blockdsp_init(&ctx->bdsp, ctx->avctx);
- ff_dsputil_init(&ctx->dsp, ctx->avctx);
- ctx->bit_depth = 8;
- ctx->decode_dct_block = dnxhd_decode_dct_block_8;
- }
+ ctx->decode_dct_block = dnxhd_decode_dct_block_8;
+ } else {
+ av_log(ctx->avctx, AV_LOG_ERROR, "invalid bit depth value (%"PRId8").\n",
+ buf[0x21]);
+ return AVERROR_INVALIDDATA;
+ }
+ if (ctx->bit_depth != old_bit_depth) {
+ ff_blockdsp_init(&ctx->bdsp, ctx->avctx);
+ ff_idctdsp_init(&ctx->idsp, ctx->avctx);
}
cid = AV_RB32(buf + 0x28);
- av_dlog(ctx->avctx, "compression id %d\n", cid);
+ ff_dlog(ctx->avctx, "compression id %d\n", cid);
if ((ret = dnxhd_init_vlc(ctx, cid)) < 0)
return ret;
+ if (ctx->mbaff && ctx->cid_table->cid != 1260)
+ av_log(ctx->avctx, AV_LOG_WARNING,
+ "Adaptive MB interlace flag in an unsupported profile.\n");
+
+ // make sure profile size constraints are respected
+ // DNx100 allows 1920->1440 and 1280->960 subsampling
+ if (ctx->width != ctx->cid_table->width) {
+ av_reduce(&ctx->avctx->sample_aspect_ratio.num,
+ &ctx->avctx->sample_aspect_ratio.den,
+ ctx->width, ctx->cid_table->width, 255);
+ ctx->width = ctx->cid_table->width;
+ }
if (buf_size < ctx->cid_table->coding_unit_size) {
- av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size\n");
+ av_log(ctx->avctx, AV_LOG_ERROR, "incorrect frame size (%d < %u).\n",
+ buf_size, ctx->cid_table->coding_unit_size);
return AVERROR_INVALIDDATA;
}
ctx->mb_width = ctx->width >> 4;
ctx->mb_height = buf[0x16d];
- av_dlog(ctx->avctx,
- "mb width %d, mb height %d\n", ctx->mb_width, ctx->mb_height);
+ ff_dlog(ctx->avctx,
+ "mb width %u, mb height %u\n", ctx->mb_width, ctx->mb_height);
if ((ctx->height + 15) >> 4 == ctx->mb_height && frame->interlaced_frame)
ctx->height <<= 1;
if (ctx->mb_height > 68 ||
(ctx->mb_height << frame->interlaced_frame) > (ctx->height + 15) >> 4) {
av_log(ctx->avctx, AV_LOG_ERROR,
- "mb height too big: %d\n", ctx->mb_height);
+ "mb height too big: %u\n", ctx->mb_height);
return AVERROR_INVALIDDATA;
}
for (i = 0; i < ctx->mb_height; i++) {
ctx->mb_scan_index[i] = AV_RB32(buf + 0x170 + (i << 2));
- av_dlog(ctx->avctx, "mb scan index %d\n", ctx->mb_scan_index[i]);
+ ff_dlog(ctx->avctx, "mb scan index %"PRIu32"\n", ctx->mb_scan_index[i]);
if (buf_size < ctx->mb_scan_index[i] + 0x280) {
- av_log(ctx->avctx, AV_LOG_ERROR, "invalid mb scan index\n");
+ av_log(ctx->avctx, AV_LOG_ERROR,
+ "invalid mb scan index (%d < %"PRIu32").\n",
+ buf_size, ctx->mb_scan_index[i] + 0x280);
return AVERROR_INVALIDDATA;
}
}
uint8_t *dest_y, *dest_u, *dest_v;
int dct_y_offset, dct_x_offset;
int qscale, i;
+ int interlaced_mb = 0;
- qscale = get_bits(&ctx->gb, 11);
+ if (ctx->mbaff) {
+ interlaced_mb = get_bits1(&ctx->gb);
+ qscale = get_bits(&ctx->gb, 10);
+ } else {
+ qscale = get_bits(&ctx->gb, 11);
+ }
skip_bits1(&ctx->gb);
for (i = 0; i < 8; i++) {
dest_u += frame->linesize[1];
dest_v += frame->linesize[2];
}
+ if (interlaced_mb) {
+ dct_linesize_luma <<= 1;
+ dct_linesize_chroma <<= 1;
+ }
- dct_y_offset = dct_linesize_luma << 3;
+ dct_y_offset = interlaced_mb ? frame->linesize[0] : (dct_linesize_luma << 3);
dct_x_offset = 8 << shift1;
if (!ctx->is_444) {
- ctx->dsp.idct_put(dest_y, dct_linesize_luma, ctx->blocks[0]);
- ctx->dsp.idct_put(dest_y + dct_x_offset, dct_linesize_luma, ctx->blocks[1]);
- ctx->dsp.idct_put(dest_y + dct_y_offset, dct_linesize_luma, ctx->blocks[4]);
- ctx->dsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[5]);
-
- if (!(ctx->avctx->flags & CODEC_FLAG_GRAY)) {
- dct_y_offset = dct_linesize_chroma << 3;
- ctx->dsp.idct_put(dest_u, dct_linesize_chroma, ctx->blocks[2]);
- ctx->dsp.idct_put(dest_v, dct_linesize_chroma, ctx->blocks[3]);
- ctx->dsp.idct_put(dest_u + dct_y_offset, dct_linesize_chroma, ctx->blocks[6]);
- ctx->dsp.idct_put(dest_v + dct_y_offset, dct_linesize_chroma, ctx->blocks[7]);
+ ctx->idsp.idct_put(dest_y, dct_linesize_luma, ctx->blocks[0]);
+ ctx->idsp.idct_put(dest_y + dct_x_offset, dct_linesize_luma, ctx->blocks[1]);
+ ctx->idsp.idct_put(dest_y + dct_y_offset, dct_linesize_luma, ctx->blocks[4]);
+ ctx->idsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[5]);
+
+ if (!(ctx->avctx->flags & AV_CODEC_FLAG_GRAY)) {
+ dct_y_offset = interlaced_mb ? frame->linesize[1] : (dct_linesize_chroma << 3);
+ ctx->idsp.idct_put(dest_u, dct_linesize_chroma, ctx->blocks[2]);
+ ctx->idsp.idct_put(dest_v, dct_linesize_chroma, ctx->blocks[3]);
+ ctx->idsp.idct_put(dest_u + dct_y_offset, dct_linesize_chroma, ctx->blocks[6]);
+ ctx->idsp.idct_put(dest_v + dct_y_offset, dct_linesize_chroma, ctx->blocks[7]);
}
} else {
- ctx->dsp.idct_put(dest_y, dct_linesize_luma, ctx->blocks[0]);
- ctx->dsp.idct_put(dest_y + dct_x_offset, dct_linesize_luma, ctx->blocks[1]);
- ctx->dsp.idct_put(dest_y + dct_y_offset, dct_linesize_luma, ctx->blocks[6]);
- ctx->dsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[7]);
-
- if (!(ctx->avctx->flags & CODEC_FLAG_GRAY)) {
- dct_y_offset = dct_linesize_chroma << 3;
- ctx->dsp.idct_put(dest_u, dct_linesize_chroma, ctx->blocks[2]);
- ctx->dsp.idct_put(dest_u + dct_x_offset, dct_linesize_chroma, ctx->blocks[3]);
- ctx->dsp.idct_put(dest_u + dct_y_offset, dct_linesize_chroma, ctx->blocks[8]);
- ctx->dsp.idct_put(dest_u + dct_y_offset + dct_x_offset, dct_linesize_chroma, ctx->blocks[9]);
- ctx->dsp.idct_put(dest_v, dct_linesize_chroma, ctx->blocks[4]);
- ctx->dsp.idct_put(dest_v + dct_x_offset, dct_linesize_chroma, ctx->blocks[5]);
- ctx->dsp.idct_put(dest_v + dct_y_offset, dct_linesize_chroma, ctx->blocks[10]);
- ctx->dsp.idct_put(dest_v + dct_y_offset + dct_x_offset, dct_linesize_chroma, ctx->blocks[11]);
+ ctx->idsp.idct_put(dest_y, dct_linesize_luma, ctx->blocks[0]);
+ ctx->idsp.idct_put(dest_y + dct_x_offset, dct_linesize_luma, ctx->blocks[1]);
+ ctx->idsp.idct_put(dest_y + dct_y_offset, dct_linesize_luma, ctx->blocks[6]);
+ ctx->idsp.idct_put(dest_y + dct_y_offset + dct_x_offset, dct_linesize_luma, ctx->blocks[7]);
+
+ if (!(ctx->avctx->flags & AV_CODEC_FLAG_GRAY)) {
+ dct_y_offset = interlaced_mb ? frame->linesize[1] : (dct_linesize_chroma << 3);
+ ctx->idsp.idct_put(dest_u, dct_linesize_chroma, ctx->blocks[2]);
+ ctx->idsp.idct_put(dest_u + dct_x_offset, dct_linesize_chroma, ctx->blocks[3]);
+ ctx->idsp.idct_put(dest_u + dct_y_offset, dct_linesize_chroma, ctx->blocks[8]);
+ ctx->idsp.idct_put(dest_u + dct_y_offset + dct_x_offset, dct_linesize_chroma, ctx->blocks[9]);
+ ctx->idsp.idct_put(dest_v, dct_linesize_chroma, ctx->blocks[4]);
+ ctx->idsp.idct_put(dest_v + dct_x_offset, dct_linesize_chroma, ctx->blocks[5]);
+ ctx->idsp.idct_put(dest_v + dct_y_offset, dct_linesize_chroma, ctx->blocks[10]);
+ ctx->idsp.idct_put(dest_v + dct_y_offset + dct_x_offset, dct_linesize_chroma, ctx->blocks[11]);
}
}
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
DNXHDContext *ctx = avctx->priv_data;
- AVFrame *picture = data;
+ ThreadFrame tf;
int first_field = 1;
int ret;
- av_dlog(avctx, "frame size %d\n", buf_size);
+ tf.f = data;
+
+ ff_dlog(avctx, "frame size %d\n", buf_size);
decode_coding_unit:
- if ((ret = dnxhd_decode_header(ctx, picture, buf, buf_size, first_field)) < 0)
+ if ((ret = dnxhd_decode_header(ctx, tf.f, buf, buf_size, first_field)) < 0)
return ret;
if ((avctx->width || avctx->height) &&
(ctx->width != avctx->width || ctx->height != avctx->height)) {
- av_log(avctx, AV_LOG_WARNING, "frame size changed: %dx%d -> %dx%d\n",
+ av_log(avctx, AV_LOG_WARNING, "frame size changed: %dx%d -> %ux%u\n",
avctx->width, avctx->height, ctx->width, ctx->height);
first_field = 1;
}
return ret;
if (first_field) {
- if ((ret = ff_get_buffer(avctx, picture, 0)) < 0) {
+ if ((ret = ff_thread_get_buffer(avctx, &tf, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
- picture->pict_type = AV_PICTURE_TYPE_I;
- picture->key_frame = 1;
+ tf.f->pict_type = AV_PICTURE_TYPE_I;
+ tf.f->key_frame = 1;
}
- dnxhd_decode_macroblocks(ctx, picture, buf + 0x280, buf_size - 0x280);
+ dnxhd_decode_macroblocks(ctx, tf.f, buf + 0x280, buf_size - 0x280);
- if (first_field && picture->interlaced_frame) {
+ if (first_field && tf.f->interlaced_frame) {
buf += ctx->cid_table->coding_unit_size;
buf_size -= ctx->cid_table->coding_unit_size;
first_field = 0;
.init = dnxhd_decode_init,
.close = dnxhd_decode_close,
.decode = dnxhd_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
};
projects / ffmpeg / blobdiff