RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '84d173d3de97c753234ab0c0b50551d51413d663' 

* commit '84d173d3de97c753234ab0c0b50551d51413d663':
  xvididct: Ensure that the scantable permutation is always set correctly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-08 22:00:29 +02:00
parent 5ff2b33401 84d173d3de
commit 0dcebb9f63
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/x86/idctdsp_init.c
View File

@ -37,6 +37,8 @@ static const uint8_t simple_mmx_permutation[64] = {
0x32, 0x3A, 0x36, 0x3B, 0x33, 0x3E, 0x37, 0x3F,
};
static const uint8_t idct_sse2_row_perm[8] = { 0, 4, 1, 5, 2, 6, 3, 7 };
av_cold int ff_init_scantable_permutation_x86(uint8_t *idct_permutation,
enum idct_permutation_type perm_type)
{
@ -47,6 +49,10 @@ av_cold int ff_init_scantable_permutation_x86(uint8_t *idct_permutation,
for (i = 0; i < 64; i++)
idct_permutation[i] = simple_mmx_permutation[i];
return 1;
case FF_IDCT_PERM_SSE2:
for (i = 0; i < 64; i++)
idct_permutation[i] = (i & 0x38) | idct_sse2_row_perm[i & 7];
return 1;
}
return 0;

15
libavcodec/x86/xvididct_init.c
View File

@ -25,17 +25,6 @@
#include "idct_xvid.h"
#include "idctdsp.h"
static const uint8_t idct_sse2_row_perm[8] = { 0, 4, 1, 5, 2, 6, 3, 7 };
static av_cold void init_scantable_permutation_sse2(uint8_t *idct_permutation,
enum idct_permutation_type perm_type)
{
int i;
for (i = 0; i < 64; i++)
idct_permutation[i] = (i & 0x38) | idct_sse2_row_perm[i & 7];
}
av_cold void ff_xvididct_init_x86(IDCTDSPContext *c)
{
int cpu_flags = av_get_cpu_flags();
@ -44,12 +33,14 @@ av_cold void ff_xvididct_init_x86(IDCTDSPContext *c)
c->idct_put = ff_idct_xvid_mmx_put;
c->idct_add = ff_idct_xvid_mmx_add;
c->idct = ff_idct_xvid_mmx;
c->perm_type = FF_IDCT_PERM_NONE;
}
if (INLINE_MMXEXT(cpu_flags)) {
c->idct_put = ff_idct_xvid_mmxext_put;
c->idct_add = ff_idct_xvid_mmxext_add;
c->idct = ff_idct_xvid_mmxext;
c->perm_type = FF_IDCT_PERM_NONE;
}
if (INLINE_SSE2(cpu_flags)) {
@ -57,7 +48,5 @@ av_cold void ff_xvididct_init_x86(IDCTDSPContext *c)
c->idct_add = ff_idct_xvid_sse2_add;
c->idct = ff_idct_xvid_sse2;
c->perm_type = FF_IDCT_PERM_SSE2;
init_scantable_permutation_sse2(c->idct_permutation, c->perm_type);
}
}

2
libavcodec/xvididct.c
View File

@ -33,4 +33,6 @@ av_cold void ff_xvididct_init(IDCTDSPContext *c, AVCodecContext *avctx)
if (ARCH_X86)
ff_xvididct_init_x86(c);
ff_init_scantable_permutation(c->idct_permutation, c->perm_type);
}