curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-07 11:51:49 +09:00
Code Issues Packages Projects Releases Wiki Activity

tav: more dt decoder fix

Browse Source
This commit is contained in:
minjaesong
2025-12-02 19:35:19 +09:00
parent bc5779d4f5
commit d3cc05789f
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
video_encoder/decoder_tav_dt.c
View File

@@ -695,6 +695,13 @@ int main(int argc, char *argv[]) {
uint16_t quant_co = QUALITY_CO[decoder.quality_index]; uint16_t quant_co = QUALITY_CO[decoder.quality_index];
uint16_t quant_cg = QUALITY_CG[decoder.quality_index]; uint16_t quant_cg = QUALITY_CG[decoder.quality_index];
if (decoder.verbose) {
printf("=== Quantiser Mapping ===\n");
printf(" Quality index: %d\n", decoder.quality_index);
printf(" Quantiser indices: Y=%d Co=%d Cg=%d\n", quant_y, quant_co, quant_cg);
printf("=========================\n\n");
}
// Initialize video decoder with TAV-DT fixed parameters // Initialize video decoder with TAV-DT fixed parameters
tav_video_params_t video_params = { tav_video_params_t video_params = {
.width = decoder.width, .width = decoder.width,

33
video_encoder/tav_video_decoder.c
View File

@@ -1560,10 +1560,10 @@ int tav_video_decode_gop(tav_video_context_t *ctx,
dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y], dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y],
gop_coeffs[t][0], gop_y[t], final_width, final_height, gop_coeffs[t][0], gop_y[t], final_width, final_height,
ctx->params.decomp_levels, base_q_y, 0); ctx->params.decomp_levels, base_q_y, 0);
dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_co], dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y],
gop_coeffs[t][1], gop_co[t], final_width, final_height, gop_coeffs[t][1], gop_co[t], final_width, final_height,
ctx->params.decomp_levels, base_q_co, 1); ctx->params.decomp_levels, base_q_co, 1);
dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_cg], dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y],
gop_coeffs[t][2], gop_cg[t], final_width, final_height, gop_coeffs[t][2], gop_cg[t], final_width, final_height,
ctx->params.decomp_levels, base_q_cg, 1); ctx->params.decomp_levels, base_q_cg, 1);
} else { } else {
@@ -1575,13 +1575,10 @@ int tav_video_decode_gop(tav_video_context_t *ctx,
} }
} }
// Apply grain synthesis // Apply grain synthesis to Y channel ONLY (using ORIGINAL dimensions - grain must match encoder's frame size)
apply_grain_synthesis(gop_y[t], final_width, final_height, ctx->params.decomp_levels, t, // Note: Grain synthesis is NOT applied to chroma channels
apply_grain_synthesis(gop_y[t], width, height, ctx->params.decomp_levels, t,
QLUT[ctx->params.quantiser_y], ctx->params.encoder_preset); QLUT[ctx->params.quantiser_y], ctx->params.encoder_preset);
apply_grain_synthesis(gop_co[t], final_width, final_height, ctx->params.decomp_levels, t,
QLUT[ctx->params.quantiser_co], ctx->params.encoder_preset);
apply_grain_synthesis(gop_cg[t], final_width, final_height, ctx->params.decomp_levels, t,
QLUT[ctx->params.quantiser_cg], ctx->params.encoder_preset);
} }
// Free quantised coefficients // Free quantised coefficients
@@ -1680,10 +1677,10 @@ int tav_video_decode_iframe(tav_video_context_t *ctx,
dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y], dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y],
coeffs_y, ctx->dwt_buffer_y, width, height, coeffs_y, ctx->dwt_buffer_y, width, height,
ctx->params.decomp_levels, base_q_y, 0); ctx->params.decomp_levels, base_q_y, 0);
dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_co], dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y],
coeffs_co, ctx->dwt_buffer_co, width, height, coeffs_co, ctx->dwt_buffer_co, width, height,
ctx->params.decomp_levels, base_q_co, 1); ctx->params.decomp_levels, base_q_co, 1);
dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_cg], dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y],
coeffs_cg, ctx->dwt_buffer_cg, width, height, coeffs_cg, ctx->dwt_buffer_cg, width, height,
ctx->params.decomp_levels, base_q_cg, 1); ctx->params.decomp_levels, base_q_cg, 1);
} else { } else {
@@ -1698,13 +1695,9 @@ int tav_video_decode_iframe(tav_video_context_t *ctx,
free(coeffs_co); free(coeffs_co);
free(coeffs_cg); free(coeffs_cg);
// Apply grain synthesis // Apply grain synthesis to Y channel only (not applied to chroma)
apply_grain_synthesis(ctx->dwt_buffer_y, width, height, ctx->params.decomp_levels, 0, apply_grain_synthesis(ctx->dwt_buffer_y, width, height, ctx->params.decomp_levels, 0,
QLUT[ctx->params.quantiser_y], ctx->params.encoder_preset); QLUT[ctx->params.quantiser_y], ctx->params.encoder_preset);
apply_grain_synthesis(ctx->dwt_buffer_co, width, height, ctx->params.decomp_levels, 0,
QLUT[ctx->params.quantiser_co], ctx->params.encoder_preset);
apply_grain_synthesis(ctx->dwt_buffer_cg, width, height, ctx->params.decomp_levels, 0,
QLUT[ctx->params.quantiser_cg], ctx->params.encoder_preset);
// Apply inverse DWT // Apply inverse DWT
apply_inverse_dwt_multilevel(ctx->dwt_buffer_y, width, height, ctx->params.decomp_levels, ctx->params.wavelet_filter); apply_inverse_dwt_multilevel(ctx->dwt_buffer_y, width, height, ctx->params.decomp_levels, ctx->params.wavelet_filter);
@@ -1786,10 +1779,10 @@ int tav_video_decode_pframe(tav_video_context_t *ctx,
dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y], dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y],
coeffs_y, ctx->dwt_buffer_y, width, height, coeffs_y, ctx->dwt_buffer_y, width, height,
ctx->params.decomp_levels, base_q_y, 0); ctx->params.decomp_levels, base_q_y, 0);
dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_co], dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y],
coeffs_co, ctx->dwt_buffer_co, width, height, coeffs_co, ctx->dwt_buffer_co, width, height,
ctx->params.decomp_levels, base_q_co, 1); ctx->params.decomp_levels, base_q_co, 1);
dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_cg], dequantise_dwt_subbands_perceptual(0, QLUT[ctx->params.quantiser_y],
coeffs_cg, ctx->dwt_buffer_cg, width, height, coeffs_cg, ctx->dwt_buffer_cg, width, height,
ctx->params.decomp_levels, base_q_cg, 1); ctx->params.decomp_levels, base_q_cg, 1);
} else { } else {
@@ -1804,13 +1797,9 @@ int tav_video_decode_pframe(tav_video_context_t *ctx,
free(coeffs_co); free(coeffs_co);
free(coeffs_cg); free(coeffs_cg);
// Apply grain synthesis // Apply grain synthesis to Y channel only (not applied to chroma)
apply_grain_synthesis(ctx->dwt_buffer_y, width, height, ctx->params.decomp_levels, 0, apply_grain_synthesis(ctx->dwt_buffer_y, width, height, ctx->params.decomp_levels, 0,
QLUT[ctx->params.quantiser_y], ctx->params.encoder_preset); QLUT[ctx->params.quantiser_y], ctx->params.encoder_preset);
apply_grain_synthesis(ctx->dwt_buffer_co, width, height, ctx->params.decomp_levels, 0,
QLUT[ctx->params.quantiser_co], ctx->params.encoder_preset);
apply_grain_synthesis(ctx->dwt_buffer_cg, width, height, ctx->params.decomp_levels, 0,
QLUT[ctx->params.quantiser_cg], ctx->params.encoder_preset);
// Apply inverse DWT // Apply inverse DWT
apply_inverse_dwt_multilevel(ctx->dwt_buffer_y, width, height, ctx->params.decomp_levels, ctx->params.wavelet_filter); apply_inverse_dwt_multilevel(ctx->dwt_buffer_y, width, height, ctx->params.decomp_levels, ctx->params.wavelet_filter);