highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpegvideodec: minor simplifications.

Browse Source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-02-10 19:53:41 +01:00
parent af46ca7356
commit 5338566eaf
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/mpegvideo.c
View File

@ -2648,10 +2648,7 @@ static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
nCoeffs= s->block_last_index[n]; nCoeffs= s->block_last_index[n];
if (n < 4) block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
block[0] = block[0] * s->y_dc_scale;
else
block[0] = block[0] * s->c_dc_scale;
/* XXX: only mpeg1 */ /* XXX: only mpeg1 */
quant_matrix = s->intra_matrix; quant_matrix = s->intra_matrix;
for(i=1;i<=nCoeffs;i++) { for(i=1;i<=nCoeffs;i++) {
@ -2710,10 +2707,7 @@ static void dct_unquantize_mpeg2_intra_c(MpegEncContext *s,
if(s->alternate_scan) nCoeffs= 63; if(s->alternate_scan) nCoeffs= 63;
else nCoeffs= s->block_last_index[n]; else nCoeffs= s->block_last_index[n];
if (n < 4) block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
block[0] = block[0] * s->y_dc_scale;
else
block[0] = block[0] * s->c_dc_scale;
quant_matrix = s->intra_matrix; quant_matrix = s->intra_matrix;
for(i=1;i<=nCoeffs;i++) { for(i=1;i<=nCoeffs;i++) {
int j= s->intra_scantable.permutated[i]; int j= s->intra_scantable.permutated[i];
@ -2741,10 +2735,7 @@ static void dct_unquantize_mpeg2_intra_bitexact(MpegEncContext *s,
if(s->alternate_scan) nCoeffs= 63; if(s->alternate_scan) nCoeffs= 63;
else nCoeffs= s->block_last_index[n]; else nCoeffs= s->block_last_index[n];
if (n < 4) block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
block[0] = block[0] * s->y_dc_scale;
else
block[0] = block[0] * s->c_dc_scale;
quant_matrix = s->intra_matrix; quant_matrix = s->intra_matrix;
for(i=1;i<=nCoeffs;i++) { for(i=1;i<=nCoeffs;i++) {
int j= s->intra_scantable.permutated[i]; int j= s->intra_scantable.permutated[i];
@ -2806,10 +2797,7 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s,
qmul = qscale << 1; qmul = qscale << 1;
if (!s->h263_aic) { if (!s->h263_aic) {
if (n < 4) block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
block[0] = block[0] * s->y_dc_scale;
else
block[0] = block[0] * s->c_dc_scale;
qadd = (qscale - 1) | 1; qadd = (qscale - 1) | 1;
}else{ }else{
qadd = 0; qadd = 0;