videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avcodec/x86/mpegenc: support transpose permuation type

This commit is contained in:
James Darnley 2017-06-16 15:36:16 +02:00
parent fa30a0a548
commit e3db94302c
1 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libavcodec/x86/mpegvideoenc_template.c
View File

@ -366,12 +366,57 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
block[0x3D] = temp_block[0x3D]; block[0x36] = temp_block[0x36];
block[0x2F] = temp_block[0x2F]; block[0x37] = temp_block[0x37];
block[0x3E] = temp_block[0x3E]; block[0x3F] = temp_block[0x3F];
} else if (s->idsp.perm_type == FF_IDCT_PERM_TRANSPOSE) {
if(last_non_zero_p1 <= 1) goto end;
block[0x08] = temp_block[0x01];
block[0x01] = temp_block[0x08]; block[0x02] = temp_block[0x10];
if(last_non_zero_p1 <= 4) goto end;
block[0x09] = temp_block[0x09]; block[0x10] = temp_block[0x02];
block[0x18] = temp_block[0x03];
if(last_non_zero_p1 <= 7) goto end;
block[0x11] = temp_block[0x0A]; block[0x0A] = temp_block[0x11];
block[0x03] = temp_block[0x18]; block[0x04] = temp_block[0x20];
if(last_non_zero_p1 <= 11) goto end;
block[0x0B] = temp_block[0x19];
block[0x12] = temp_block[0x12]; block[0x19] = temp_block[0x0B];
block[0x20] = temp_block[0x04]; block[0x28] = temp_block[0x05];
if(last_non_zero_p1 <= 16) goto end;
block[0x21] = temp_block[0x0C]; block[0x1A] = temp_block[0x13];
block[0x13] = temp_block[0x1A]; block[0x0C] = temp_block[0x21];
block[0x05] = temp_block[0x28]; block[0x06] = temp_block[0x30];
block[0x0D] = temp_block[0x29]; block[0x14] = temp_block[0x22];
if(last_non_zero_p1 <= 24) goto end;
block[0x1B] = temp_block[0x1B]; block[0x22] = temp_block[0x14];
block[0x29] = temp_block[0x0D]; block[0x30] = temp_block[0x06];
block[0x38] = temp_block[0x07]; block[0x31] = temp_block[0x0E];
block[0x2A] = temp_block[0x15]; block[0x23] = temp_block[0x1C];
if(last_non_zero_p1 <= 32) goto end;
block[0x1C] = temp_block[0x23]; block[0x15] = temp_block[0x2A];
block[0x0E] = temp_block[0x31]; block[0x07] = temp_block[0x38];
block[0x0F] = temp_block[0x39]; block[0x16] = temp_block[0x32];
block[0x1D] = temp_block[0x2B]; block[0x24] = temp_block[0x24];
if(last_non_zero_p1 <= 40) goto end;
block[0x2B] = temp_block[0x1D]; block[0x32] = temp_block[0x16];
block[0x39] = temp_block[0x0F]; block[0x3A] = temp_block[0x17];
block[0x33] = temp_block[0x1E]; block[0x2C] = temp_block[0x25];
block[0x25] = temp_block[0x2C]; block[0x1E] = temp_block[0x33];
if(last_non_zero_p1 <= 48) goto end;
block[0x17] = temp_block[0x3A]; block[0x1F] = temp_block[0x3B];
block[0x26] = temp_block[0x34]; block[0x2D] = temp_block[0x2D];
block[0x34] = temp_block[0x26]; block[0x3B] = temp_block[0x1F];
block[0x3C] = temp_block[0x27]; block[0x35] = temp_block[0x2E];
if(last_non_zero_p1 <= 56) goto end;
block[0x2E] = temp_block[0x35]; block[0x27] = temp_block[0x3C];
block[0x2F] = temp_block[0x3D]; block[0x36] = temp_block[0x36];
block[0x3D] = temp_block[0x2F]; block[0x3E] = temp_block[0x37];
block[0x37] = temp_block[0x3E]; block[0x3F] = temp_block[0x3F];
} else {
av_log(s, AV_LOG_DEBUG, "s->idsp.perm_type: %d\n",
(int)s->idsp.perm_type);
av_assert0(s->idsp.perm_type == FF_IDCT_PERM_NONE ||
s->idsp.perm_type == FF_IDCT_PERM_LIBMPEG2 ||
s->idsp.perm_type == FF_IDCT_PERM_SIMPLE);
s->idsp.perm_type == FF_IDCT_PERM_SIMPLE ||
s->idsp.perm_type == FF_IDCT_PERM_TRANSPOSE);
}
end:
return last_non_zero_p1 - 1;