[vlc-commits] [Git][videolan/vlc][master] grain, chroma-copy: purge stray emms

[François Cartegnie (@fcartegnie)]

François Cartegnie pushed to branch master at VideoLAN / VLC


Commits:
dde35460 by Lyndon Brown at 2021-07-20T17:18:17+00:00
grain,chroma-copy: purge stray emms

these modules have no MMX code, and MMX is being purged, so there
is no reason for issuing `emms` instructions.

- - - - -


2 changed files:

- modules/video_chroma/copy.c
- modules/video_filter/grain.c


Changes:

=====================================
modules/video_chroma/copy.c
=====================================
@@ -567,7 +567,6 @@ static void SSE_Copy420_P_to_P(picture_t *dst, const uint8_t *src[static 3],
                       cache->buffer, cache->size,
                       (height+d-1)/d, 0);
     }
-    asm volatile ("emms");
 }
 
 
@@ -579,7 +578,6 @@ static void SSE_Copy420_SP_to_SP(picture_t *dst, const uint8_t *src[static 2],
                   cache->buffer, cache->size, height, 0);
     SSE_CopyPlane(dst->p[1].p_pixels, dst->p[1].i_pitch, src[1], src_pitch[1],
                   cache->buffer, cache->size, (height+1) / 2, 0);
-    asm volatile ("emms");
 }
 
 static void
@@ -594,7 +592,6 @@ SSE_Copy420_SP_to_P(picture_t *dest, const uint8_t *src[static 2],
                     dest->p[2].p_pixels, dest->p[2].i_pitch,
                     src[1], src_pitch[1], cache->buffer, cache->size,
                     (height+1) / 2, pixel_size, bitshift);
-    asm volatile ("emms");
 }
 
 static void SSE_Copy420_P_to_SP(picture_t *dst, const uint8_t *src[static 3],
@@ -608,7 +605,6 @@ static void SSE_Copy420_P_to_SP(picture_t *dst, const uint8_t *src[static 3],
                          src[U_PLANE], src_pitch[U_PLANE],
                          src[V_PLANE], src_pitch[V_PLANE],
                          cache->buffer, cache->size, (height+1) / 2, pixel_size, bitshift);
-    asm volatile ("emms");
 }
 #undef COPY64
 #endif /* CAN_COMPILE_SSE2 */


=====================================
modules/video_filter/grain.c
=====================================
@@ -92,7 +92,6 @@ typedef struct
     void (*blend)(uint8_t *dst, size_t dst_pitch,
                   const uint8_t *src, size_t src_pitch,
                   const int16_t *noise);
-    void (*emms)(void);
 
     struct {
         vlc_mutex_t lock;
@@ -192,10 +191,6 @@ static void BlockBlendSse2(uint8_t *dst, size_t dst_pitch,
 #   error "BLEND_SIZE unsupported"
 #endif
 }
-static void Emms(void)
-{
-    asm volatile ("emms");
-}
 #endif
 
 /**
@@ -244,8 +239,6 @@ static void PlaneFilter(filter_t *filter,
                            __MIN(w, BLEND_SIZE), __MIN(h, BLEND_SIZE));
         }
     }
-    if (sys->emms)
-        sys->emms();
 }
 
 static void Filter(filter_t *filter, picture_t *src, picture_t *dst)
@@ -394,11 +387,9 @@ static int Open(filter_t *filter)
     }
 
     sys->blend = BlockBlendC;
-    sys->emms  = NULL;
-#if defined(CAN_COMPILE_SSE2) && 1
+#if defined(CAN_COMPILE_SSE2)
     if (vlc_CPU_SSE2()) {
         sys->blend = BlockBlendSse2;
-        sys->emms  = Emms;
     }
 #endif
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/dde3546047a896b1c001a15ba062e27ff164feea

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/dde3546047a896b1c001a15ba062e27ff164feea
You're receiving this email because of your account on code.videolan.org.