virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mpegvideo_enc: use 64bit multiplication in dct_quantize_trellis_c and dct_quantize_c

Browse Source 
Fixes corruption with:

ffmpeg -t 1 -filter_complex "sine=f=21,showwaves=scale=cbrt:mode=line:colors=white:draw=full" -c:v mpeg2video -non_linear_quant 1 -qmin 1 -qmax 1 -cpuflags 0 out.mpg

or

ffmpeg -t 1 -filter_complex "sine=f=21,showwaves=scale=cbrt:mode=line:colors=white:draw=full" -c:v mpeg2video -non_linear_quant 1 -qmin 1 -qmax 1 -trellis 1 out.mpg

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2025-01-06 23:08:32 +01:00
parent ed26812337
commit ec4d3dc5b9
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/mpegvideo_enc.c
View File

@@ -3998,9 +3998,9 @@ static int dct_quantize_trellis_c(MpegEncContext *s,
for(i=63; i>=start_i; i--) { for(i=63; i>=start_i; i--) {
const int j = scantable[i]; const int j = scantable[i];
int level = block[j] * qmat[j]; int64_t level = (int64_t)block[j] * qmat[j];
if(((unsigned)(level+threshold1))>threshold2){ if(((uint64_t)(level+threshold1))>threshold2){
last_non_zero = i; last_non_zero = i;
break; break;
} }
@@ -4008,11 +4008,11 @@ static int dct_quantize_trellis_c(MpegEncContext *s,
for(i=start_i; i<=last_non_zero; i++) { for(i=start_i; i<=last_non_zero; i++) {
const int j = scantable[i]; const int j = scantable[i];
int level = block[j] * qmat[j]; int64_t level = (int64_t)block[j] * qmat[j];
// if( bias+level >= (1<<(QMAT_SHIFT - 3)) // if( bias+level >= (1<<(QMAT_SHIFT - 3))
// || bias-level >= (1<<(QMAT_SHIFT - 3))){ // || bias-level >= (1<<(QMAT_SHIFT - 3))){
if(((unsigned)(level+threshold1))>threshold2){ if(((uint64_t)(level+threshold1))>threshold2){
if(level>0){ if(level>0){
level= (bias + level)>>QMAT_SHIFT; level= (bias + level)>>QMAT_SHIFT;
coeff[0][i]= level; coeff[0][i]= level;
@@ -4601,7 +4601,7 @@ static int dct_quantize_c(MpegEncContext *s,
int16_t *block, int n, int16_t *block, int n,
int qscale, int *overflow) int qscale, int *overflow)
{ {
int i, j, level, last_non_zero, q, start_i; int i, last_non_zero, q, start_i;
const int *qmat; const int *qmat;
const uint8_t *scantable; const uint8_t *scantable;
int bias; int bias;
@@ -4641,10 +4641,10 @@ static int dct_quantize_c(MpegEncContext *s,
threshold1= (1<<QMAT_SHIFT) - bias - 1; threshold1= (1<<QMAT_SHIFT) - bias - 1;
threshold2= (threshold1<<1); threshold2= (threshold1<<1);
for(i=63;i>=start_i;i--) { for(i=63;i>=start_i;i--) {
j = scantable[i]; const int j = scantable[i];
level = block[j] * qmat[j]; int64_t level = (int64_t)block[j] * qmat[j];
if(((unsigned)(level+threshold1))>threshold2){ if(((uint64_t)(level+threshold1))>threshold2){
last_non_zero = i; last_non_zero = i;
break; break;
}else{ }else{
@@ -4652,12 +4652,12 @@ static int dct_quantize_c(MpegEncContext *s,
} }
} }
for(i=start_i; i<=last_non_zero; i++) { for(i=start_i; i<=last_non_zero; i++) {
j = scantable[i]; const int j = scantable[i];
level = block[j] * qmat[j]; int64_t level = (int64_t)block[j] * qmat[j];
// if( bias+level >= (1<<QMAT_SHIFT) // if( bias+level >= (1<<QMAT_SHIFT)
// || bias-level >= (1<<QMAT_SHIFT)){ // || bias-level >= (1<<QMAT_SHIFT)){
if(((unsigned)(level+threshold1))>threshold2){ if(((uint64_t)(level+threshold1))>threshold2){
if(level>0){ if(level>0){
level= (bias + level)>>QMAT_SHIFT; level= (bias + level)>>QMAT_SHIFT;
block[j]= level; block[j]= level;