Attachment 84021 Details for Bug 67530 – use more common defaults for the level (all cards)

[patch] use more common defaults for the level (all cards)

uvdlevel.patch (text/plain), 8.54 KB, created by gurketsky on 2013-08-13 16:21:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gurketsky

Created: 2013-08-13 16:21:14 UTC

Size: 8.54 KB

patch

obsolete

>diff --git a/src/gallium/auxiliary/vl/vl_decoder.c b/src/gallium/auxiliary/vl/vl_decoder.c
>index d6909cb..16f09b5 100644
>--- a/src/gallium/auxiliary/vl/vl_decoder.c
>+++ b/src/gallium/auxiliary/vl/vl_decoder.c
>@@ -44,6 +44,21 @@ vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile
>    }
> }
> 
>+int
>+vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile)
>+{
>+   assert(screen);
>+   switch (profile) {
>+      case PIPE_VIDEO_PROFILE_MPEG1:
>+         return 0;
>+      case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE:
>+      case PIPE_VIDEO_PROFILE_MPEG2_MAIN:
>+         return 3;
>+      default:
>+         return 0;
>+   }
>+}
>+
> struct pipe_video_decoder *
> vl_create_decoder(struct pipe_context *pipe,
>                   enum pipe_video_profile profile,
>diff --git a/src/gallium/auxiliary/vl/vl_decoder.h b/src/gallium/auxiliary/vl/vl_decoder.h
>index 8fa6527..b0b4161 100644
>--- a/src/gallium/auxiliary/vl/vl_decoder.h
>+++ b/src/gallium/auxiliary/vl/vl_decoder.h
>@@ -38,6 +38,12 @@ bool
> vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile);
> 
> /**
>+ * get the maximum supported level for the given profile with shader based decoding
>+ */
>+int
>+vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile);
>+
>+/**
>  * standard implementation of pipe->create_video_decoder
>  */
> struct pipe_video_decoder *
>diff --git a/src/gallium/drivers/ilo/ilo_screen.c b/src/gallium/drivers/ilo/ilo_screen.c
>index e8262bc..5f97226 100644
>--- a/src/gallium/drivers/ilo/ilo_screen.c
>+++ b/src/gallium/drivers/ilo/ilo_screen.c
>@@ -170,7 +170,8 @@ ilo_get_video_param(struct pipe_screen *screen,
>       return 1;
>    case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
>       return 0;
>-
>+   case PIPE_VIDEO_CAP_MAX_LEVEL:
>+      return vl_level_supported(screen, profile);
>    default:
>       return 0;
>    }
>diff --git a/src/gallium/drivers/nouveau/nouveau_video.c b/src/gallium/drivers/nouveau/nouveau_video.c
>index 9357508..1563b22 100644
>--- a/src/gallium/drivers/nouveau/nouveau_video.c
>+++ b/src/gallium/drivers/nouveau/nouveau_video.c
>@@ -862,6 +862,8 @@ nouveau_screen_get_video_param(struct pipe_screen *pscreen,
>       return false;
>    case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
>       return true;
>+   case PIPE_VIDEO_CAP_MAX_LEVEL:
>+      return vl_level_supported(screen, profile);
>    default:
>       debug_printf("unknown video param: %d\n", param);
>       return 0;
>diff --git a/src/gallium/drivers/nv50/nv84_video.c b/src/gallium/drivers/nv50/nv84_video.c
>index d5f6295..3602a6d 100644
>--- a/src/gallium/drivers/nv50/nv84_video.c
>+++ b/src/gallium/drivers/nv50/nv84_video.c
>@@ -778,6 +778,21 @@ nv84_screen_get_video_param(struct pipe_screen *pscreen,
>       return true;
>    case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
>       return false;
>+   case PIPE_VIDEO_CAP_MAX_LEVEL:
>+      switch (profile) {
>+      case PIPE_VIDEO_PROFILE_MPEG1:
>+         return 0;
>+      case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE:
>+      case PIPE_VIDEO_PROFILE_MPEG2_MAIN:
>+         return 3;
>+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE:
>+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN:
>+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH:
>+         return 41;
>+      default:
>+         debug_printf("unknown video profile: %d\n", profile);
>+         return 0;
>+      }
>    default:
>       debug_printf("unknown video param: %d\n", param);
>       return 0;
>diff --git a/src/gallium/drivers/nvc0/nvc0_video.c b/src/gallium/drivers/nvc0/nvc0_video.c
>index 7cc086a..a871ab7 100644
>--- a/src/gallium/drivers/nvc0/nvc0_video.c
>+++ b/src/gallium/drivers/nvc0/nvc0_video.c
>@@ -48,6 +48,31 @@ nvc0_screen_get_video_param(struct pipe_screen *pscreen,
>       return true;
>    case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
>       return false;
>+   case PIPE_VIDEO_CAP_MAX_LEVEL:
>+      switch (profile) {
>+      case PIPE_VIDEO_PROFILE_MPEG1:
>+         return 0;
>+      case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE:
>+      case PIPE_VIDEO_PROFILE_MPEG2_MAIN:
>+         return 3;
>+      case PIPE_VIDEO_PROFILE_MPEG4_SIMPLE:
>+         return 3;
>+      case PIPE_VIDEO_PROFILE_MPEG4_ADVANCED_SIMPLE:
>+         return 5;
>+      case PIPE_VIDEO_PROFILE_VC1_SIMPLE:
>+         return 1;
>+      case PIPE_VIDEO_PROFILE_VC1_MAIN:
>+         return 2;
>+      case PIPE_VIDEO_PROFILE_VC1_ADVANCED:
>+         return 4;
>+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE:
>+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN:
>+      case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH:
>+         return 41;
>+      default:
>+         debug_printf("unknown video profile: %d\n", profile);
>+         return 0;
>+      }
>    default:
>       debug_printf("unknown video param: %d\n", param);
>       return 0;
>diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
>index 7ead292..25ff286 100644
>--- a/src/gallium/drivers/r300/r300_screen.c
>+++ b/src/gallium/drivers/r300/r300_screen.c
>@@ -359,6 +359,8 @@ static int r300_get_video_param(struct pipe_screen *screen,
>          return false;
>       case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
>          return true;
>+      case PIPE_VIDEO_CAP_MAX_LEVEL:
>+         return vl_level_supported(screen, profile);
>       default:
>          return 0;
>    }
>diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
>index 74dd960..e5aa55e 100644
>--- a/src/gallium/drivers/r600/r600_pipe.c
>+++ b/src/gallium/drivers/r600/r600_pipe.c
>@@ -795,6 +795,8 @@ static int r600_get_video_param(struct pipe_screen *screen,
> 		return false;
> 	case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
> 		return true;
>+	case PIPE_VIDEO_CAP_MAX_LEVEL:
>+		return vl_level_supported(screen, profile);
> 	default:
> 		return 0;
> 	}
>diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c
>index 2f98de2..e3c3dd6 100644
>--- a/src/gallium/drivers/radeon/radeon_uvd.c
>+++ b/src/gallium/drivers/radeon/radeon_uvd.c
>@@ -1113,6 +1113,30 @@ int ruvd_get_video_param(struct pipe_screen *screen,
> 		return true;
> 	case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
> 		return true;
>+	case PIPE_VIDEO_CAP_MAX_LEVEL:
>+		switch (profile) {
>+		case PIPE_VIDEO_PROFILE_MPEG1:
>+			return 0;
>+		case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE:
>+		case PIPE_VIDEO_PROFILE_MPEG2_MAIN:
>+			return 3;
>+		case PIPE_VIDEO_PROFILE_MPEG4_SIMPLE:
>+			return 3;
>+		case PIPE_VIDEO_PROFILE_MPEG4_ADVANCED_SIMPLE:
>+			return 5;
>+		case PIPE_VIDEO_PROFILE_VC1_SIMPLE:
>+			return 1;
>+		case PIPE_VIDEO_PROFILE_VC1_MAIN:
>+			return 2;
>+		case PIPE_VIDEO_PROFILE_VC1_ADVANCED:
>+			return 4;
>+		case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE:
>+		case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN:
>+		case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH:
>+			return 41;
>+		default:
>+			return 0;
>+		}
> 	default:
> 		return 0;
> 	}
>diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
>index 69b9ca9..3c73679 100644
>--- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c
>+++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
>@@ -546,6 +546,8 @@ static int r600_get_video_param(struct pipe_screen *screen,
> 		return vl_video_buffer_max_size(screen);
> 	case PIPE_VIDEO_CAP_PREFERED_FORMAT:
> 		return PIPE_FORMAT_NV12;
>+	case PIPE_VIDEO_CAP_MAX_LEVEL:
>+		return vl_level_supported(screen, profile);
> 	default:
> 		return 0;
> 	}
>diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h
>index deacf8d..e66948e 100644
>--- a/src/gallium/include/pipe/p_video_enums.h
>+++ b/src/gallium/include/pipe/p_video_enums.h
>@@ -54,7 +54,8 @@ enum pipe_video_cap
>    PIPE_VIDEO_CAP_PREFERED_FORMAT = 4,
>    PIPE_VIDEO_CAP_PREFERS_INTERLACED = 5,
>    PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE = 6,
>-   PIPE_VIDEO_CAP_SUPPORTS_INTERLACED = 7
>+   PIPE_VIDEO_CAP_SUPPORTS_INTERLACED = 7,
>+   PIPE_VIDEO_CAP_MAX_LEVEL = 8
> };
> 
> enum pipe_video_codec
>diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c
>index 2281dcf..a6b34c7 100644
>--- a/src/gallium/state_trackers/vdpau/query.c
>+++ b/src/gallium/state_trackers/vdpau/query.c
>@@ -176,13 +176,13 @@ vlVdpDecoderQueryCapabilities(VdpDevice device, VdpDecoderProfile profile,
>       *is_supported = false;
>       return VDP_STATUS_OK;
>    }
>-   
>+
>    pipe_mutex_lock(dev->mutex);
>    *is_supported = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_CAP_SUPPORTED);
>    if (*is_supported) {
>       *max_width = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_CAP_MAX_WIDTH); 
>       *max_height = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_CAP_MAX_HEIGHT);
>-      *max_level = 16;
>+      *max_level = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_CAP_MAX_LEVEL);
>       *max_macroblocks = (*max_width/16)*(*max_height/16);
>    } else {
>       *max_width = 0;

Actions: View | Splinter Review

Attachments on bug 67530: 83741 | 84021

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.