* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <math.h>
#include "vdpau_private.h"
-#include "vl_winsys.h"
#include "pipe/p_screen.h"
#include "pipe/p_defines.h"
#include "util/u_debug.h"
if (!pscreen)
return VDP_STATUS_RESOURCES;
+ pipe_mutex_lock(dev->mutex);
+
/* XXX: Current limits */
*is_supported = true;
- if (surface_chroma_type != VDP_CHROMA_TYPE_420)
- *is_supported = false;
-
max_2d_texture_level = pscreen->get_param(pscreen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS);
+ pipe_mutex_unlock(dev->mutex);
if (!max_2d_texture_level)
return VDP_STATUS_RESOURCES;
if (!pscreen)
return VDP_STATUS_RESOURCES;
- *is_supported = pscreen->is_video_format_supported
+ pipe_mutex_lock(dev->mutex);
+
+ switch(bits_ycbcr_format) {
+ case VDP_YCBCR_FORMAT_NV12:
+ case VDP_YCBCR_FORMAT_YV12:
+ *is_supported = surface_chroma_type == VDP_CHROMA_TYPE_420;
+ break;
+
+ case VDP_YCBCR_FORMAT_UYVY:
+ case VDP_YCBCR_FORMAT_YUYV:
+ *is_supported = surface_chroma_type == VDP_CHROMA_TYPE_422;
+ break;
+
+ case VDP_YCBCR_FORMAT_Y8U8V8A8:
+ case VDP_YCBCR_FORMAT_V8U8Y8A8:
+ *is_supported = surface_chroma_type == VDP_CHROMA_TYPE_444;
+ break;
+
+ default:
+ *is_supported = false;
+ break;
+ }
+
+ *is_supported &= pscreen->is_video_format_supported
(
pscreen,
FormatYCBCRToPipe(bits_ycbcr_format),
- PIPE_VIDEO_PROFILE_UNKNOWN
+ PIPE_VIDEO_PROFILE_UNKNOWN,
+ PIPE_VIDEO_ENTRYPOINT_BITSTREAM
);
+ pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_OK;
}
*is_supported = false;
return VDP_STATUS_OK;
}
-
- *is_supported = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_CAP_SUPPORTED);
+
+ pipe_mutex_lock(dev->mutex);
+ *is_supported = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
+ 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_width = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
+ PIPE_VIDEO_CAP_MAX_WIDTH);
+ *max_height = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
+ PIPE_VIDEO_CAP_MAX_HEIGHT);
+ *max_level = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
+ PIPE_VIDEO_CAP_MAX_LEVEL);
*max_macroblocks = (*max_width/16)*(*max_height/16);
} else {
*max_width = 0;
*max_level = 0;
*max_macroblocks = 0;
}
+ pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_OK;
}
if (!(is_supported && max_width && max_height))
return VDP_STATUS_INVALID_POINTER;
+ pipe_mutex_lock(dev->mutex);
*is_supported = pscreen->is_format_supported
(
pscreen, format, PIPE_TEXTURE_3D, 1,
uint32_t max_2d_texture_level = pscreen->get_param(
pscreen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS);
- if (!max_2d_texture_level)
+ if (!max_2d_texture_level) {
+ pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_ERROR;
+ }
*max_width = *max_height = pow(2, max_2d_texture_level - 1);
} else {
*max_width = 0;
*max_height = 0;
}
+ pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_OK;
}
vlVdpOutputSurfaceQueryGetPutBitsNativeCapabilities(VdpDevice device, VdpRGBAFormat surface_rgba_format,
VdpBool *is_supported)
{
+ vlVdpDevice *dev;
+ struct pipe_screen *pscreen;
+ enum pipe_format format;
+
+ dev = vlGetDataHTAB(device);
+ if (!dev)
+ return VDP_STATUS_INVALID_HANDLE;
+
+ pscreen = dev->vscreen->pscreen;
+ if (!pscreen)
+ return VDP_STATUS_ERROR;
+
+ format = FormatRGBAToPipe(surface_rgba_format);
+ if (format == PIPE_FORMAT_NONE || format == PIPE_FORMAT_A8_UNORM)
+ return VDP_STATUS_INVALID_RGBA_FORMAT;
+
if (!is_supported)
return VDP_STATUS_INVALID_POINTER;
- return VDP_STATUS_NO_IMPLEMENTATION;
+ pipe_mutex_lock(dev->mutex);
+ *is_supported = pscreen->is_format_supported
+ (
+ pscreen, format, PIPE_TEXTURE_2D, 1,
+ PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET
+ );
+ pipe_mutex_unlock(dev->mutex);
+
+ return VDP_STATUS_OK;
}
/**
if (!is_supported)
return VDP_STATUS_INVALID_POINTER;
+ pipe_mutex_lock(dev->mutex);
*is_supported = pscreen->is_format_supported
(
pscreen, rgba_format, PIPE_TEXTURE_2D, 1,
pscreen, colortbl_format, PIPE_TEXTURE_1D, 1,
PIPE_BIND_SAMPLER_VIEW
);
+ pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_OK;
}
VdpYCbCrFormat bits_ycbcr_format,
VdpBool *is_supported)
{
+ vlVdpDevice *dev;
+ struct pipe_screen *pscreen;
+ enum pipe_format rgba_format, ycbcr_format;
+
+ dev = vlGetDataHTAB(device);
+ if (!dev)
+ return VDP_STATUS_INVALID_HANDLE;
+
+ pscreen = dev->vscreen->pscreen;
+ if (!pscreen)
+ return VDP_STATUS_ERROR;
+
+ rgba_format = FormatRGBAToPipe(surface_rgba_format);
+ if (rgba_format == PIPE_FORMAT_NONE || rgba_format == PIPE_FORMAT_A8_UNORM)
+ return VDP_STATUS_INVALID_RGBA_FORMAT;
+
+ ycbcr_format = FormatYCBCRToPipe(bits_ycbcr_format);
+ if (ycbcr_format == PIPE_FORMAT_NONE)
+ return VDP_STATUS_INVALID_INDEXED_FORMAT;
+
if (!is_supported)
return VDP_STATUS_INVALID_POINTER;
- return VDP_STATUS_NO_IMPLEMENTATION;
+ pipe_mutex_lock(dev->mutex);
+ *is_supported = pscreen->is_format_supported
+ (
+ pscreen, rgba_format, PIPE_TEXTURE_2D, 1,
+ PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET
+ );
+
+ *is_supported &= pscreen->is_video_format_supported
+ (
+ pscreen, ycbcr_format,
+ PIPE_VIDEO_PROFILE_UNKNOWN,
+ PIPE_VIDEO_ENTRYPOINT_BITSTREAM
+ );
+ pipe_mutex_unlock(dev->mutex);
+
+ return VDP_STATUS_OK;
}
/**
if (!(is_supported && max_width && max_height))
return VDP_STATUS_INVALID_POINTER;
+ pipe_mutex_lock(dev->mutex);
*is_supported = pscreen->is_format_supported
(
pscreen, format, PIPE_TEXTURE_3D, 1,
uint32_t max_2d_texture_level = pscreen->get_param(
pscreen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS);
- if (!max_2d_texture_level)
+ if (!max_2d_texture_level) {
+ pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_ERROR;
+ }
*max_width = *max_height = pow(2, max_2d_texture_level - 1);
} else {
*max_width = 0;
*max_height = 0;
}
+ pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_OK;
}
switch (feature) {
case VDP_VIDEO_MIXER_FEATURE_SHARPNESS:
case VDP_VIDEO_MIXER_FEATURE_NOISE_REDUCTION:
+ case VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL:
*is_supported = VDP_TRUE;
break;
default:
{
vlVdpDevice *dev = vlGetDataHTAB(device);
struct pipe_screen *screen;
- enum pipe_video_profile prof = PIPE_VIDEO_PROFILE_UNKNOWN;
+
if (!dev)
return VDP_STATUS_INVALID_HANDLE;
if (!(min_value && max_value))
return VDP_STATUS_INVALID_POINTER;
+
+ pipe_mutex_lock(dev->mutex);
screen = dev->vscreen->pscreen;
switch (parameter) {
case VDP_VIDEO_MIXER_PARAMETER_VIDEO_SURFACE_WIDTH:
*(uint32_t*)min_value = 48;
- *(uint32_t*)max_value = screen->get_video_param(screen, prof, PIPE_VIDEO_CAP_MAX_WIDTH);
+ *(uint32_t*)max_value = screen->get_video_param(screen, PIPE_VIDEO_PROFILE_UNKNOWN,
+ PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
+ PIPE_VIDEO_CAP_MAX_WIDTH);
break;
case VDP_VIDEO_MIXER_PARAMETER_VIDEO_SURFACE_HEIGHT:
*(uint32_t*)min_value = 48;
- *(uint32_t*)max_value = screen->get_video_param(screen, prof, PIPE_VIDEO_CAP_MAX_HEIGHT);
+ *(uint32_t*)max_value = screen->get_video_param(screen, PIPE_VIDEO_PROFILE_UNKNOWN,
+ PIPE_VIDEO_ENTRYPOINT_BITSTREAM,
+ PIPE_VIDEO_CAP_MAX_HEIGHT);
break;
case VDP_VIDEO_MIXER_PARAMETER_LAYERS:
case VDP_VIDEO_MIXER_PARAMETER_CHROMA_TYPE:
default:
+ pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_INVALID_VIDEO_MIXER_PARAMETER;
}
+ pipe_mutex_unlock(dev->mutex);
return VDP_STATUS_OK;
}
projects / mesa.git / blobdiff