#include "thread.h"
typedef struct RowContext {
- DECLARE_ALIGNED(16, int16_t, blocks)[12][64];
+ DECLARE_ALIGNED(32, int16_t, blocks)[12][64];
int luma_scale[64];
int chroma_scale[64];
GetBitContext gb;
av_log(ctx->avctx, AV_LOG_WARNING,
"Adaptive MB interlace flag in an unsupported profile.\n");
- ctx->act = buf[0x2C] & 7;
+ switch ((buf[0x2C] >> 1) & 3) {
+ case 0: frame->colorspace = AVCOL_SPC_BT709; break;
+ case 1: frame->colorspace = AVCOL_SPC_BT2020_NCL; break;
+ case 2: frame->colorspace = AVCOL_SPC_BT2020_CL; break;
+ case 3: frame->colorspace = AVCOL_SPC_UNSPECIFIED; break;
+ }
+
+ ctx->act = buf[0x2C] & 1;
if (ctx->act && ctx->cid_table->cid != 1256 && ctx->cid_table->cid != 1270)
av_log(ctx->avctx, AV_LOG_WARNING,
"Adaptive color transform in an unsupported profile.\n");
const DNXHDContext *ctx = avctx->priv_data;
uint32_t offset = ctx->mb_scan_index[rownb];
RowContext *row = ctx->rows + threadnb;
- int x;
+ int x, ret;
row->last_dc[0] =
row->last_dc[1] =
row->last_dc[2] = 1 << (ctx->bit_depth + 2); // for levels +2^(bitdepth-1)
- init_get_bits(&row->gb, ctx->buf + offset, (ctx->buf_size - offset) << 3);
+ ret = init_get_bits8(&row->gb, ctx->buf + offset, ctx->buf_size - offset);
+ if (ret < 0) {
+ row->errors++;
+ return ret;
+ }
for (x = 0; x < ctx->mb_width; x++) {
//START_TIMER;
int ret = dnxhd_decode_macroblock(ctx, row, data, x, rownb);