X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdnxhddec.c;h=67dd7fc60dc3dc9f55bafea3ba3b03ba37f42626;hb=dc7e07ac1f015117a3abaa9c5f3a594cc7fd0b7a;hp=3452d49629904641aa1d4aa5c5d4f2217a9e958b;hpb=42d1ffa3a27d5f8bb162c6bbc99bf8631883ba8b;p=ffmpeg diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 3452d496299..67dd7fc60dc 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -1,6 +1,6 @@ /* * VC3/DNxHD decoder. - * Copyright (c) 2007 SmartJog S.A., Baptiste Coudurier . + * Copyright (c) 2007 SmartJog S.A., Baptiste Coudurier * * This file is part of FFmpeg. * @@ -22,11 +22,11 @@ //#define TRACE //#define DEBUG +#include "libavcore/imgutils.h" #include "avcodec.h" -#include "bitstream.h" +#include "get_bits.h" #include "dnxhddata.h" #include "dsputil.h" -#include "mpegvideo.h" typedef struct { AVCodecContext *avctx; @@ -40,15 +40,15 @@ typedef struct { VLC ac_vlc, dc_vlc, run_vlc; int last_dc[3]; DSPContext dsp; - DECLARE_ALIGNED_16(DCTELEM, blocks[8][64]); - DECLARE_ALIGNED_8(ScanTable, scantable); + DECLARE_ALIGNED(16, DCTELEM, blocks)[8][64]; + ScanTable scantable; const CIDEntry *cid_table; } DNXHDContext; #define DNXHD_VLC_BITS 9 -#define DNXHD_DC_VLC_BITS 6 +#define DNXHD_DC_VLC_BITS 7 -static int dnxhd_decode_init(AVCodecContext *avctx) +static av_cold int dnxhd_decode_init(AVCodecContext *avctx) { DNXHDContext *ctx = avctx->priv_data; @@ -56,6 +56,7 @@ static int dnxhd_decode_init(AVCodecContext *avctx) dsputil_init(&ctx->dsp, avctx); avctx->coded_frame = &ctx->picture; ctx->picture.type = FF_I_TYPE; + ctx->picture.key_frame = 1; return 0; } @@ -72,7 +73,7 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, int cid) init_vlc(&ctx->ac_vlc, DNXHD_VLC_BITS, 257, ctx->cid_table->ac_bits, 1, 1, ctx->cid_table->ac_codes, 2, 2, 0); - init_vlc(&ctx->dc_vlc, DNXHD_DC_VLC_BITS, 12, + 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, @@ -84,7 +85,7 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, int cid) return 0; } -static int dnxhd_decode_header(DNXHDContext *ctx, uint8_t *buf, int buf_size, int first_field) +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; @@ -99,7 +100,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, uint8_t *buf, int buf_size, in if (buf[5] & 2) { /* interlaced */ ctx->cur_field = buf[5] & 1; ctx->picture.interlaced_frame = 1; - ctx->picture.top_field_first = first_field && ctx->cur_field == 1; + 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); } @@ -127,12 +128,17 @@ static int dnxhd_decode_header(DNXHDContext *ctx, uint8_t *buf, int buf_size, in ctx->mb_width = ctx->width>>4; ctx->mb_height = buf[0x16d]; - if (ctx->mb_height > 68) { - av_log(ctx->avctx, AV_LOG_ERROR, "mb height too big\n"); + dprintf(ctx->avctx, "mb width %d, mb height %d\n", ctx->mb_width, ctx->mb_height); + + if ((ctx->height+15)>>4 == ctx->mb_height && ctx->picture.interlaced_frame) + ctx->height <<= 1; + + if (ctx->mb_height > 68 || + (ctx->mb_height<picture.interlaced_frame) > (ctx->height+15)>>4) { + av_log(ctx->avctx, AV_LOG_ERROR, "mb height too big: %d\n", ctx->mb_height); return -1; } - dprintf(ctx->avctx, "mb width %d, mb height %d\n", ctx->mb_width, ctx->mb_height); for (i = 0; i < ctx->mb_height; i++) { ctx->mb_scan_index[i] = AV_RB32(buf + 0x170 + (i<<2)); dprintf(ctx->avctx, "mb scan index %d\n", ctx->mb_scan_index[i]); @@ -161,10 +167,10 @@ static void dnxhd_decode_dct_block(DNXHDContext *ctx, DCTELEM *block, int n, int if (n&2) { component = 1 + (n&1); - weigth_matrix = ctx->cid_table->chroma_weigth; + weigth_matrix = ctx->cid_table->chroma_weight; } else { component = 0; - weigth_matrix = ctx->cid_table->luma_weigth; + weigth_matrix = ctx->cid_table->luma_weight; } ctx->last_dc[component] += dnxhd_decode_dc(ctx); @@ -189,22 +195,26 @@ static void dnxhd_decode_dct_block(DNXHDContext *ctx, DCTELEM *block, int n, int 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; } } @@ -216,14 +226,12 @@ static int dnxhd_decode_macroblock(DNXHDContext *ctx, int x, int y) int dct_offset; int qscale, i; - ctx->dsp.clear_blocks(ctx->blocks[0]); - ctx->dsp.clear_blocks(ctx->blocks[2]); // FIXME change clear blocks to take block amount - qscale = get_bits(&ctx->gb, 11); skip_bits1(&ctx->gb); //av_log(ctx->avctx, AV_LOG_DEBUG, "qscale %d\n", qscale); for (i = 0; i < 8; i++) { + ctx->dsp.clear_block(ctx->blocks[i]); dnxhd_decode_dct_block(ctx, ctx->blocks[i], i, qscale); } @@ -259,13 +267,13 @@ static int dnxhd_decode_macroblock(DNXHDContext *ctx, int x, int y) 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; @@ -277,8 +285,10 @@ static int dnxhd_decode_macroblocks(DNXHDContext *ctx, uint8_t *buf, int buf_siz } static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *data_size, - uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; DNXHDContext *ctx = avctx->priv_data; AVFrame *picture = data; int first_field = 1; @@ -289,8 +299,15 @@ static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *data_size, if (dnxhd_decode_header(ctx, buf, buf_size, first_field) < 0) return -1; + 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", + avctx->width, avctx->height, ctx->width, ctx->height); + first_field = 1; + } + avctx->pix_fmt = PIX_FMT_YUV422P; - if (avcodec_check_dimensions(avctx, ctx->width, ctx->height)) + if (av_image_check_size(ctx->width, ctx->height, 0, avctx)) return -1; avcodec_set_dimensions(avctx, ctx->width, ctx->height); @@ -317,7 +334,7 @@ static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *data_size, return buf_size; } -static int dnxhd_decode_close(AVCodecContext *avctx) +static av_cold int dnxhd_decode_close(AVCodecContext *avctx) { DNXHDContext *ctx = avctx->priv_data; @@ -331,7 +348,7 @@ static int dnxhd_decode_close(AVCodecContext *avctx) AVCodec dnxhd_decoder = { "dnxhd", - CODEC_TYPE_VIDEO, + AVMEDIA_TYPE_VIDEO, CODEC_ID_DNXHD, sizeof(DNXHDContext), dnxhd_decode_init, @@ -339,4 +356,5 @@ AVCodec dnxhd_decoder = { dnxhd_decode_close, dnxhd_decode_frame, CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), };