{ "ibias", "intra quant bias",
offsetof(DNXHDEncContext, intra_quant_bias), AV_OPT_TYPE_INT,
{ .i64 = 0 }, INT_MIN, INT_MAX, VE },
+ { "profile", NULL, offsetof(DNXHDEncContext, profile), AV_OPT_TYPE_INT,
+ { .i64 = FF_PROFILE_DNXHD },
+ FF_PROFILE_DNXHD, FF_PROFILE_DNXHR_444, VE, "profile" },
+ { "dnxhd", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_DNXHD },
+ 0, 0, VE, "profile" },
+ { "dnxhr_444", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_DNXHR_444 },
+ 0, 0, VE, "profile" },
+ { "dnxhr_hqx", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_DNXHR_HQX },
+ 0, 0, VE, "profile" },
+ { "dnxhr_hq", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_DNXHR_HQ },
+ 0, 0, VE, "profile" },
+ { "dnxhr_sq", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_DNXHR_SQ },
+ 0, 0, VE, "profile" },
+ { "dnxhr_lb", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_DNXHR_LB },
+ 0, 0, VE, "profile" },
{ NULL }
};
{
FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->mb_rc, (ctx->m.avctx->qmax + 1),
ctx->m.mb_num * sizeof(RCEntry), fail);
- if (ctx->m.avctx->mb_decision != FF_MB_DECISION_RD)
+ if (ctx->m.avctx->mb_decision != FF_MB_DECISION_RD) {
FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->mb_cmp,
ctx->m.mb_num, sizeof(RCCMPEntry), fail);
- ctx->frame_bits = (ctx->cid_table->coding_unit_size -
- 640 - 4 - ctx->min_padding) * 8;
+ FF_ALLOCZ_ARRAY_OR_GOTO(ctx->m.avctx, ctx->mb_cmp_tmp,
+ ctx->m.mb_num, sizeof(RCCMPEntry), fail);
+ }
+ ctx->frame_bits = (ctx->coding_unit_size -
+ ctx->data_offset - 4 - ctx->min_padding) * 8;
ctx->qscale = 1;
ctx->lambda = 2 << LAMBDA_FRAC_BITS; // qscale 2
return 0;
return AVERROR(ENOMEM);
}
+static int dnxhd_get_hr_frame_size(const CIDEntry* profile, int mb_num)
+{
+ int result = mb_num * profile->packet_scale.num / profile->packet_scale.den;
+ result = (result + 2048) / 4096 * 4096;
+ return FFMAX(result, 8192);
+}
static av_cold int dnxhd_encode_init(AVCodecContext *avctx)
{
DNXHDEncContext *ctx = avctx->priv_data;
return AVERROR(EINVAL);
}
+ if (ctx->profile == FF_PROFILE_DNXHR_444 ||
+ ctx->profile == FF_PROFILE_DNXHR_HQX) {
+ avpriv_report_missing_feature(avctx,
+ "dnxhr_444 or dnxhr_hqx profile");
+ return AVERROR_PATCHWELCOME;
+ }
+
+ avctx->profile = ctx->profile;
ctx->cid = ff_dnxhd_find_cid(avctx, bit_depth);
if (!ctx->cid) {
av_log(avctx, AV_LOG_ERROR,
}
av_log(avctx, AV_LOG_DEBUG, "cid %d\n", ctx->cid);
+ if (ctx->cid >= 1270 && ctx->cid <= 1274)
+ avctx->codec_tag = MKTAG('A','V','d','h');
+
+ if (avctx->width < 256 || avctx->height < 120) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Input dimensions too small, input must be at least 256x120\n");
+ return AVERROR(EINVAL);
+ }
+
index = ff_dnxhd_get_cid_table(ctx->cid);
av_assert0(index >= 0);
ff_pixblockdsp_init(&ctx->m.pdsp, avctx);
ff_dct_encode_init(&ctx->m);
+ if (ctx->profile != FF_PROFILE_DNXHD)
+ ff_videodsp_init(&ctx->m.vdsp, bit_depth);
+
if (!ctx->m.dct_quantize)
ctx->m.dct_quantize = ff_dct_quantize_c;
ctx->m.mb_num = ctx->m.mb_height * ctx->m.mb_width;
+ if (ctx->cid_table->frame_size == DNXHD_VARIABLE) {
+ ctx->frame_size = dnxhd_get_hr_frame_size(ctx->cid_table,
+ ctx->m.mb_num);
+ ctx->coding_unit_size = ctx->frame_size;
+ } else {
+ ctx->frame_size = ctx->cid_table->frame_size;
+ ctx->coding_unit_size = ctx->cid_table->coding_unit_size;
+ }
+
+ if (ctx->m.mb_height > 68)
+ ctx->data_offset = 0x170 + (ctx->m.mb_height << 2);
+ else
+ ctx->data_offset = 0x280;
+
#if FF_API_QUANT_BIAS
FF_DISABLE_DEPRECATION_WARNINGS
if (avctx->intra_quant_bias != FF_DEFAULT_QUANT_BIAS)
static int dnxhd_write_header(AVCodecContext *avctx, uint8_t *buf)
{
DNXHDEncContext *ctx = avctx->priv_data;
- static const uint8_t header_prefix[5] = { 0x00, 0x00, 0x02, 0x80, 0x01 };
- memset(buf, 0, 640);
+ memset(buf, 0, ctx->data_offset);
+
+ // * write prefix */
+ AV_WB16(buf + 0x02, ctx->data_offset);
+ if (ctx->cid >= 1270 && ctx->cid <= 1274)
+ buf[4] = 0x03;
+ else
+ buf[4] = 0x01;
- memcpy(buf, header_prefix, 5);
buf[5] = ctx->interlaced ? ctx->cur_field + 2 : 0x01;
buf[6] = 0x80; // crc flag off
buf[7] = 0xa0; // reserved
{
const int bs = ctx->block_width_l2;
const int bw = 1 << bs;
+ int dct_y_offset = ctx->dct_y_offset;
+ int dct_uv_offset = ctx->dct_uv_offset;
+ int linesize = ctx->m.linesize;
+ int uvlinesize = ctx->m.uvlinesize;
const uint8_t *ptr_y = ctx->thread[0]->src[0] +
((mb_y << 4) * ctx->m.linesize) + (mb_x << bs + 1);
const uint8_t *ptr_u = ctx->thread[0]->src[1] +
const uint8_t *ptr_v = ctx->thread[0]->src[2] +
((mb_y << 4) * ctx->m.uvlinesize) + (mb_x << bs);
PixblockDSPContext *pdsp = &ctx->m.pdsp;
+ VideoDSPContext *vdsp = &ctx->m.vdsp;
+
+ if (vdsp->emulated_edge_mc && ((mb_x << 4) + 16 > ctx->m.avctx->width ||
+ (mb_y << 4) + 16 > ctx->m.avctx->height)) {
+ int y_w = ctx->m.avctx->width - (mb_x << 4);
+ int y_h = ctx->m.avctx->height - (mb_y << 4);
+ int uv_w = (y_w + 1) / 2;
+ int uv_h = y_h;
+ linesize = 16;
+ uvlinesize = 8;
+
+ vdsp->emulated_edge_mc(&ctx->edge_buf_y[0], ptr_y,
+ linesize, ctx->m.linesize,
+ linesize, 16,
+ 0, 0, y_w, y_h);
+ vdsp->emulated_edge_mc(&ctx->edge_buf_uv[0][0], ptr_u,
+ uvlinesize, ctx->m.uvlinesize,
+ uvlinesize, 16,
+ 0, 0, uv_w, uv_h);
+ vdsp->emulated_edge_mc(&ctx->edge_buf_uv[1][0], ptr_v,
+ uvlinesize, ctx->m.uvlinesize,
+ uvlinesize, 16,
+ 0, 0, uv_w, uv_h);
+
+ dct_y_offset = bw * linesize;
+ dct_uv_offset = bw * uvlinesize;
+ ptr_y = &ctx->edge_buf_y[0];
+ ptr_u = &ctx->edge_buf_uv[0][0];
+ ptr_v = &ctx->edge_buf_uv[1][0];
+ }
- pdsp->get_pixels(ctx->blocks[0], ptr_y, ctx->m.linesize);
- pdsp->get_pixels(ctx->blocks[1], ptr_y + bw, ctx->m.linesize);
- pdsp->get_pixels(ctx->blocks[2], ptr_u, ctx->m.uvlinesize);
- pdsp->get_pixels(ctx->blocks[3], ptr_v, ctx->m.uvlinesize);
+ pdsp->get_pixels(ctx->blocks[0], ptr_y, linesize);
+ pdsp->get_pixels(ctx->blocks[1], ptr_y + bw, linesize);
+ pdsp->get_pixels(ctx->blocks[2], ptr_u, uvlinesize);
+ pdsp->get_pixels(ctx->blocks[3], ptr_v, uvlinesize);
if (mb_y + 1 == ctx->m.mb_height && ctx->m.avctx->height == 1080) {
if (ctx->interlaced) {
ctx->get_pixels_8x4_sym(ctx->blocks[4],
- ptr_y + ctx->dct_y_offset,
- ctx->m.linesize);
+ ptr_y + dct_y_offset,
+ linesize);
ctx->get_pixels_8x4_sym(ctx->blocks[5],
- ptr_y + ctx->dct_y_offset + bw,
- ctx->m.linesize);
+ ptr_y + dct_y_offset + bw,
+ linesize);
ctx->get_pixels_8x4_sym(ctx->blocks[6],
- ptr_u + ctx->dct_uv_offset,
- ctx->m.uvlinesize);
+ ptr_u + dct_uv_offset,
+ uvlinesize);
ctx->get_pixels_8x4_sym(ctx->blocks[7],
- ptr_v + ctx->dct_uv_offset,
- ctx->m.uvlinesize);
+ ptr_v + dct_uv_offset,
+ uvlinesize);
} else {
ctx->bdsp.clear_block(ctx->blocks[4]);
ctx->bdsp.clear_block(ctx->blocks[5]);
}
} else {
pdsp->get_pixels(ctx->blocks[4],
- ptr_y + ctx->dct_y_offset, ctx->m.linesize);
+ ptr_y + dct_y_offset, linesize);
pdsp->get_pixels(ctx->blocks[5],
- ptr_y + ctx->dct_y_offset + bw, ctx->m.linesize);
+ ptr_y + dct_y_offset + bw, linesize);
pdsp->get_pixels(ctx->blocks[6],
- ptr_u + ctx->dct_uv_offset, ctx->m.uvlinesize);
+ ptr_u + dct_uv_offset, uvlinesize);
pdsp->get_pixels(ctx->blocks[7],
- ptr_v + ctx->dct_uv_offset, ctx->m.uvlinesize);
+ ptr_v + dct_uv_offset, uvlinesize);
}
}
DNXHDEncContext *ctx = avctx->priv_data;
int mb_y = jobnr, mb_x;
ctx = ctx->thread[threadnr];
- init_put_bits(&ctx->m.pb, (uint8_t *)arg + 640 + ctx->slice_offs[jobnr],
+ init_put_bits(&ctx->m.pb, (uint8_t *)arg + ctx->data_offset + ctx->slice_offs[jobnr],
ctx->slice_size[jobnr]);
ctx->m.last_dc[0] =
int sum;
int varc;
- if (!partial_last_row && mb_x * 16 <= avctx->width - 16) {
+ if (!partial_last_row && mb_x * 16 <= avctx->width - 16 && (avctx->width % 16) == 0) {
sum = ctx->m.mpvencdsp.pix_sum(pix, ctx->m.linesize);
varc = ctx->m.mpvencdsp.pix_norm1(pix, ctx->m.linesize);
} else {
}
}
-static void radix_sort(RCCMPEntry *data, int size)
+static void radix_sort(RCCMPEntry *data, RCCMPEntry *tmp, int size)
{
int buckets[RADIX_PASSES][NBUCKETS];
- RCCMPEntry *tmp = av_malloc_array(size, sizeof(*tmp));
radix_count(data, size, buckets);
radix_sort_pass(tmp, data, size, buckets[0], 0);
radix_sort_pass(data, tmp, size, buckets[1], 1);
radix_sort_pass(tmp, data, size, buckets[2], 2);
radix_sort_pass(data, tmp, size, buckets[3], 3);
}
- av_free(tmp);
}
static int dnxhd_encode_fast(AVCodecContext *avctx, DNXHDEncContext *ctx)
if (RC_VARIANCE)
avctx->execute2(avctx, dnxhd_mb_var_thread,
NULL, NULL, ctx->m.mb_height);
- radix_sort(ctx->mb_cmp, ctx->m.mb_num);
+ radix_sort(ctx->mb_cmp, ctx->mb_cmp_tmp, ctx->m.mb_num);
for (x = 0; x < ctx->m.mb_num && max_bits > ctx->frame_bits; x++) {
int mb = ctx->mb_cmp[x].mb;
int rc = (ctx->qscale * ctx->m.mb_num ) + mb;
int offset, i, ret;
uint8_t *buf;
- if ((ret = ff_alloc_packet2(avctx, pkt, ctx->cid_table->frame_size, 0)) < 0)
+ if ((ret = ff_alloc_packet2(avctx, pkt, ctx->frame_size, 0)) < 0)
return ret;
buf = pkt->data;
avctx->execute2(avctx, dnxhd_encode_thread, buf, NULL, ctx->m.mb_height);
- av_assert1(640 + offset + 4 <= ctx->cid_table->coding_unit_size);
- memset(buf + 640 + offset, 0,
- ctx->cid_table->coding_unit_size - 4 - offset - 640);
+ av_assert1(ctx->data_offset + offset + 4 <= ctx->coding_unit_size);
+ memset(buf + ctx->data_offset + offset, 0,
+ ctx->coding_unit_size - 4 - offset - ctx->data_offset);
- AV_WB32(buf + ctx->cid_table->coding_unit_size - 4, 0x600DC0DE); // EOF
+ AV_WB32(buf + ctx->coding_unit_size - 4, 0x600DC0DE); // EOF
if (ctx->interlaced && first_field) {
first_field = 0;
ctx->cur_field ^= 1;
- buf += ctx->cid_table->coding_unit_size;
+ buf += ctx->coding_unit_size;
goto encode_coding_unit;
}
av_freep(&ctx->mb_qscale);
av_freep(&ctx->mb_rc);
av_freep(&ctx->mb_cmp);
+ av_freep(&ctx->mb_cmp_tmp);
av_freep(&ctx->slice_size);
av_freep(&ctx->slice_offs);
projects / ffmpeg / blobdiff