2 files changed, 28 insertions, 83 deletions

diff --git a/src/gallium/state_trackers/xorg/xvmc/context.c b/src/gallium/state_trackers/xorg/xvmc/context.c
index 33f47838f51..ff2bd295ece 100644
--- a/src/gallium/state_trackers/xorg/xvmc/context.c
+++ b/src/gallium/state_trackers/xorg/xvmc/context.c
@@ -28,16 +28,13 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id,
 
    *found_port = false;
 
-   for (unsigned int i = 0; i < XScreenCount(dpy); ++i)
-   {
+   for (unsigned int i = 0; i < XScreenCount(dpy); ++i) {
       ret = XvQueryAdaptors(dpy, XRootWindow(dpy, i), &num_adaptors, &adaptor_info);
       if (ret != Success)
          return ret;
 
-      for (unsigned int j = 0; j < num_adaptors && !*found_port; ++j)
-      {
-         for (unsigned int k = 0; k < adaptor_info[j].num_ports && !*found_port; ++k)
-         {
+      for (unsigned int j = 0; j < num_adaptors && !*found_port; ++j) {
+         for (unsigned int k = 0; k < adaptor_info[j].num_ports && !*found_port; ++k) {
             XvMCSurfaceInfo *surface_info;
 
             if (adaptor_info[j].base_id + k != port)
@@ -46,14 +43,12 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id,
             *found_port = true;
 
             surface_info = XvMCListSurfaceTypes(dpy, adaptor_info[j].base_id, &num_types);
-            if (!surface_info)
-            {
+            if (!surface_info) {
                XvFreeAdaptorInfo(adaptor_info);
                return BadAlloc;
             }
 
-            for (unsigned int l = 0; l < num_types && !found_surface; ++l)
-            {
+            for (unsigned int l = 0; l < num_types && !found_surface; ++l) {
                if (surface_info[l].surface_type_id != surface_type_id)
                   continue;
 
@@ -65,7 +60,7 @@ static Status Validate(Display *dpy, XvPortID port, int surface_type_id,
                *screen = i;
             }
 
-         XFree(surface_info);
+            XFree(surface_info);
          }
       }
 
@@ -102,8 +97,7 @@ static enum pipe_video_profile ProfileToPipe(int xvmc_profile)
 
 static enum pipe_video_chroma_format FormatToPipe(int xvmc_format)
 {
-   switch (xvmc_format)
-   {
+   switch (xvmc_format) {
       case XVMC_CHROMA_FORMAT_420:
          return PIPE_VIDEO_CHROMA_FORMAT_420;
       case XVMC_CHROMA_FORMAT_422:
@@ -148,8 +142,7 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
    /* TODO: Reuse screen if process creates another context */
    screen = vl_screen_create(dpy, scrn);
 
-   if (!screen)
-   {
+   if (!screen) {
       FREE(context_priv);
       return BadAlloc;
    }
@@ -157,8 +150,7 @@ Status XvMCCreateContext(Display *dpy, XvPortID port, int surface_type_id,
    vpipe = vl_video_create(screen, ProfileToPipe(mc_type),
                            FormatToPipe(chroma_format), width, height);
 
-   if (!vpipe)
-   {
+   if (!vpipe) {
       screen->destroy(screen);
       FREE(context_priv);
       return BadAlloc;
diff --git a/src/gallium/state_trackers/xorg/xvmc/surface.c b/src/gallium/state_trackers/xorg/xvmc/surface.c
index 0467c4d07d9..6b7dbf11dcf 100644
--- a/src/gallium/state_trackers/xorg/xvmc/surface.c
+++ b/src/gallium/state_trackers/xorg/xvmc/surface.c
@@ -24,8 +24,7 @@ static enum pipe_mpeg12_macroblock_type TypeToPipe(int xvmc_mb_type)
 
 static enum pipe_mpeg12_picture_type PictureToPipe(int xvmc_pic)
 {
-   switch (xvmc_pic)
-   {
+   switch (xvmc_pic) {
       case XVMC_TOP_FIELD:
          return PIPE_MPEG12_PICTURE_TYPE_FIELD_TOP;
       case XVMC_BOTTOM_FIELD:
@@ -41,8 +40,7 @@ static enum pipe_mpeg12_picture_type PictureToPipe(int xvmc_pic)
 
 static enum pipe_mpeg12_motion_type MotionToPipe(int xvmc_motion_type, int xvmc_dct_type)
 {
-   switch (xvmc_motion_type)
-   {
+   switch (xvmc_motion_type) {
       case XVMC_PREDICTION_FRAME:
          return xvmc_dct_type == XVMC_DCT_TYPE_FIELD ?
             PIPE_MPEG12_MOTION_TYPE_16x8 : PIPE_MPEG12_MOTION_TYPE_FRAME;
@@ -66,8 +64,7 @@ CreateOrResizeBackBuffer(struct pipe_video_context *vpipe, unsigned int width, u
 
    assert(vpipe);
 
-   if (*backbuffer)
-   {
+   if (*backbuffer) {
       if ((*backbuffer)->width != width || (*backbuffer)->height != height)
          pipe_surface_reference(backbuffer, NULL);
       else
@@ -121,8 +118,7 @@ MacroBlocksToPipe(const XvMCMacroBlockArray *xvmc_macroblocks,
 
    xvmc_mb = xvmc_macroblocks->macro_blocks + first_macroblock;
 
-   for (i = 0; i < num_macroblocks; ++i)
-   {
+   for (i = 0; i < num_macroblocks; ++i) {
       pipe_macroblocks->base.codec = PIPE_VIDEO_CODEC_MPEG12;
       pipe_macroblocks->mbx = xvmc_mb->x;
       pipe_macroblocks->mby = xvmc_mb->y;
@@ -171,8 +167,7 @@ Status XvMCCreateSurface(Display *dpy, XvMCContext *context, XvMCSurface *surfac
 
    vsfc = vpipe->screen->video_surface_create(vpipe->screen, vpipe->chroma_format,
                                               vpipe->width, vpipe->height);
-   if (!vsfc)
-   {
+   if (!vsfc) {
       FREE(surface_priv);
       return BadAlloc;
    }
@@ -262,35 +257,21 @@ Status XvMCRenderSurface(Display *dpy, XvMCContext *context, unsigned int pictur
 
 Status XvMCFlushSurface(Display *dpy, XvMCSurface *surface)
 {
-#if 0
-	struct vlSurface *vl_sfc;
-
-	assert(dpy);
-
-	if (!surface)
-		return XvMCBadSurface;
+   assert(dpy);
 
-	vl_sfc = surface->privData;
+   if (!surface)
+      return XvMCBadSurface;
 
-	vlSurfaceFlush(vl_sfc);
-#endif
    return Success;
 }
 
 Status XvMCSyncSurface(Display *dpy, XvMCSurface *surface)
 {
-#if 0
-	struct vlSurface *vl_sfc;
-
-	assert(dpy);
-
-	if (!surface)
-		return XvMCBadSurface;
+   assert(dpy);
 
-	vl_sfc = surface->privData;
+   if (!surface)
+      return XvMCBadSurface;
 
-	vlSurfaceSync(vl_sfc);
-#endif
    return Success;
 }
 
@@ -359,43 +340,15 @@ Status XvMCPutSurface(Display *dpy, XvMCSurface *surface, Drawable drawable,
 
 Status XvMCGetSurfaceStatus(Display *dpy, XvMCSurface *surface, int *status)
 {
-#if 0
-	struct vlSurface	*vl_sfc;
-	enum vlResourceStatus	res_status;
-
-	assert(dpy);
-
-	if (!surface)
-		return XvMCBadSurface;
-
-	assert(status);
-
-	vl_sfc = surface->privData;
-
-	vlSurfaceGetStatus(vl_sfc, &res_status);
-
-	switch (res_status)
-	{
-		case vlResourceStatusFree:
-		{
-			*status = 0;
-			break;
-		}
-		case vlResourceStatusRendering:
-		{
-			*status = XVMC_RENDERING;
-			break;
-		}
-		case vlResourceStatusDisplaying:
-		{
-			*status = XVMC_DISPLAYING;
-			break;
-		}
-		default:
-			assert(0);
-	}
-#endif
+   assert(dpy);
+
+   if (!surface)
+      return XvMCBadSurface;
+
+   assert(status);
+
    *status = 0;
+
    return Success;
 }