Commit 814a19c3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Revert "deinterlace: u_cpu is used only if MMXEXT can be compiled."

This reverts commit 45b7ce9e.
Nothing wrong with the commit, but I need to revert it to refactor the
deinterlacer.
parent 104335bb
...@@ -1629,10 +1629,7 @@ static inline void XDeintBand8x8MMXEXT( uint8_t *dst, int i_dst, ...@@ -1629,10 +1629,7 @@ static inline void XDeintBand8x8MMXEXT( uint8_t *dst, int i_dst,
static void RenderX( picture_t *p_outpic, picture_t *p_pic ) static void RenderX( picture_t *p_outpic, picture_t *p_pic )
{ {
int i_plane; int i_plane;
#ifdef CAN_COMPILE_MMXEXT
unsigned u_cpu = vlc_CPU(); unsigned u_cpu = vlc_CPU();
#endif
/* Copy image and skip lines */ /* Copy image and skip lines */
for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ ) for( i_plane = 0 ; i_plane < p_pic->i_planes ; i_plane++ )
...@@ -2098,13 +2095,13 @@ static void DarkenField( picture_t *p_dst, const int i_field, ...@@ -2098,13 +2095,13 @@ static void DarkenField( picture_t *p_dst, const int i_field,
assert( i_field == 0 || i_field == 1 ); assert( i_field == 0 || i_field == 1 );
assert( i_strength >= 1 && i_strength <= 3 ); assert( i_strength >= 1 && i_strength <= 3 );
unsigned u_cpu = vlc_CPU();
/* Bitwise ANDing with this clears the i_strength highest bits /* Bitwise ANDing with this clears the i_strength highest bits
of each byte */ of each byte */
#ifdef CAN_COMPILE_MMXEXT #ifdef CAN_COMPILE_MMXEXT
uint64_t i_strength_u64 = i_strength; /* for MMX version (needs to know uint64_t i_strength_u64 = i_strength; /* for MMX version (needs to know
number of bits) */ number of bits) */
unsigned u_cpu = vlc_CPU();
#endif #endif
const uint8_t remove_high_u8 = 0xFF >> i_strength; const uint8_t remove_high_u8 = 0xFF >> i_strength;
const uint64_t remove_high_u64 = remove_high_u8 * const uint64_t remove_high_u64 = remove_high_u8 *
...@@ -3065,13 +3062,13 @@ static int CalculateInterlaceScore( const picture_t* p_pic_top, ...@@ -3065,13 +3062,13 @@ static int CalculateInterlaceScore( const picture_t* p_pic_top,
if( p_pic_top->i_planes != p_pic_bot->i_planes ) if( p_pic_top->i_planes != p_pic_bot->i_planes )
return -1; return -1;
unsigned u_cpu = vlc_CPU();
/* Amount of bits must be known for MMX, thus int32_t. /* Amount of bits must be known for MMX, thus int32_t.
Doesn't hurt the C implementation. */ Doesn't hurt the C implementation. */
int32_t i_score = 0; int32_t i_score = 0;
#ifdef CAN_COMPILE_MMXEXT #ifdef CAN_COMPILE_MMXEXT
unsigned u_cpu = vlc_CPU();
if( u_cpu & CPU_CAPABILITY_MMXEXT ) if( u_cpu & CPU_CAPABILITY_MMXEXT )
pxor_r2r( mm7, mm7 ); /* we will keep score in mm7 */ pxor_r2r( mm7, mm7 ); /* we will keep score in mm7 */
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment