github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-30 22:00:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

ffv1enc_vulkan: remove dead code

Browse Source
This commit is contained in:
Lynne
2026-02-08 09:15:42 +01:00
parent 6971ba9075
commit 06eb98bc97
2 changed files with 22 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
libavcodec/ffv1enc_vulkan.c
View File

@@ -1035,65 +1035,32 @@ static av_cold int vulkan_encode_ffv1_init(AVCodecContext *avctx)
if (f->version == 4 && f->micro_version > 4)
f->micro_version = 3;
//if (fv->ctx.ac == AC_GOLOMB_RICE) {
if (0) {
int w_a = FFALIGN(avctx->width, LG_ALIGN_W);
int h_a = FFALIGN(avctx->height, LG_ALIGN_H);
int w_sl, h_sl;
f->num_h_slices = fv->num_h_slices;
f->num_v_slices = fv->num_v_slices;
/* Pixels per line an invocation handles */
int ppi = 0;
/* Chunk size */
int chunks = 0;
do {
if (ppi < 2)
ppi++;
chunks++;
w_sl = w_a / (LG_ALIGN_W*ppi);
h_sl = h_a / (LG_ALIGN_H*chunks);
} while (w_sl > MAX_SLICES / h_sl);
av_log(avctx, AV_LOG_VERBOSE, "Slice config: %ix%i, %i total\n",
LG_ALIGN_W*ppi, LG_ALIGN_H*chunks, w_sl*h_sl);
av_log(avctx, AV_LOG_VERBOSE, "Horizontal slices: %i (%i pixels per invoc)\n",
w_sl, ppi);
av_log(avctx, AV_LOG_VERBOSE, "Vertical slices: %i (%i chunks)\n",
h_sl, chunks);
f->num_h_slices = w_sl;
f->num_v_slices = h_sl;
fv->ppi = ppi;
fv->chunks = chunks;
} else {
f->num_h_slices = fv->num_h_slices;
f->num_v_slices = fv->num_v_slices;
if (f->num_h_slices <= 0 && f->num_v_slices <= 0) {
if (avctx->slices) {
err = ff_ffv1_encode_determine_slices(avctx);
if (err < 0)
return err;
} else {
f->num_h_slices = 32;
f->num_v_slices = 32;
}
} else if (f->num_h_slices && f->num_v_slices <= 0) {
f->num_v_slices = MAX_SLICES / f->num_h_slices;
} else if (f->num_v_slices && f->num_h_slices <= 0) {
f->num_h_slices = MAX_SLICES / f->num_v_slices;
if (f->num_h_slices <= 0 && f->num_v_slices <= 0) {
if (avctx->slices) {
err = ff_ffv1_encode_determine_slices(avctx);
if (err < 0)
return err;
} else {
f->num_h_slices = 32;
f->num_v_slices = 32;
}
} else if (f->num_h_slices && f->num_v_slices <= 0) {
f->num_v_slices = MAX_SLICES / f->num_h_slices;
} else if (f->num_v_slices && f->num_h_slices <= 0) {
f->num_h_slices = MAX_SLICES / f->num_v_slices;
}
f->num_h_slices = FFMIN(f->num_h_slices, avctx->width);
f->num_v_slices = FFMIN(f->num_v_slices, avctx->height);
f->num_h_slices = FFMIN(f->num_h_slices, avctx->width);
f->num_v_slices = FFMIN(f->num_v_slices, avctx->height);
if (f->num_h_slices * f->num_v_slices > MAX_SLICES) {
av_log(avctx, AV_LOG_ERROR, "Too many slices (%i), maximum supported "
"by the standard is %i\n",
f->num_h_slices * f->num_v_slices, MAX_SLICES);
return AVERROR_PATCHWELCOME;
}
if (f->num_h_slices * f->num_v_slices > MAX_SLICES) {
av_log(avctx, AV_LOG_ERROR, "Too many slices (%i), maximum supported "
"by the standard is %i\n",
f->num_h_slices * f->num_v_slices, MAX_SLICES);
return AVERROR_PATCHWELCOME;
}
f->max_slice_count = f->num_h_slices * f->num_v_slices;

23
libavcodec/vulkan/ffv1_common.glsl
View File

@@ -126,29 +126,6 @@ int predict(int L, ivec2 top)
return mid_pred(L, L + top[1] - top[0], top[1]);
}
/* { -2, -1 }, { -1, 0, 1 }, 0 */
int get_context(VTYPE2 cur_l, VTYPE3 top_l, TYPE top2, uint8_t quant_table_idx)
{
const int LT = top_l[0]; /* -1 */
const int T = top_l[1]; /* 0 */
const int RT = top_l[2]; /* 1 */
const int L = cur_l[1]; /* -1 */
int base = quant_table[quant_table_idx][0][(L - LT) & MAX_QUANT_TABLE_MASK] +
quant_table[quant_table_idx][1][(LT - T) & MAX_QUANT_TABLE_MASK] +
quant_table[quant_table_idx][2][(T - RT) & MAX_QUANT_TABLE_MASK];
if ((quant_table[quant_table_idx][3][127] == 0) &&
(quant_table[quant_table_idx][4][127] == 0))
return base;
const int TT = top2; /* -2 */
const int LL = cur_l[0]; /* -2 */
return base +
quant_table[quant_table_idx][3][(LL - L) & MAX_QUANT_TABLE_MASK] +
quant_table[quant_table_idx][4][(TT - T) & MAX_QUANT_TABLE_MASK];
}
const uint32_t log2_run[41] = {
0, 0, 0, 0, 1, 1, 1, 1,
2, 2, 2, 2, 3, 3, 3, 3,