RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl: videotoolbox: cleanups 

Get rid of the VDA specifics like naming or ancient pixel formats.
This commit is contained in:
wm4 2015-09-28 22:02:53 +02:00
parent 853fe788f8
commit 31316e9ca0
1 changed files with 26 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
video/out/opengl/hwdec_osx.c
View File

@ -27,17 +27,17 @@
#include "video/mp_image_pool.h" #include "video/mp_image_pool.h"
#include "hwdec.h" #include "hwdec.h"
struct vda_gl_plane_format { struct vt_gl_plane_format {
GLenum gl_format; GLenum gl_format;
GLenum gl_type; GLenum gl_type;
GLenum gl_internal_format; GLenum gl_internal_format;
}; };
struct vda_format { struct vt_format {
uint32_t cvpixfmt; uint32_t cvpixfmt;
int imgfmt; int imgfmt;
int planes; int planes;
struct vda_gl_plane_format gl[MP_MAX_PLANES]; struct vt_gl_plane_format gl[MP_MAX_PLANES];
}; };
struct priv { struct priv {
@ -46,15 +46,8 @@ struct priv {
struct mp_hwdec_ctx hwctx; struct mp_hwdec_ctx hwctx;
}; };
static struct vda_format vda_formats[] = { static struct vt_format vt_formats[] = {
{ {
.cvpixfmt = kCVPixelFormatType_422YpCbCr8,
.imgfmt = IMGFMT_UYVY,
.planes = 1,
.gl = {
{ GL_RGB_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, GL_RGB }
}
}, {
.cvpixfmt = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange, .cvpixfmt = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange,
.imgfmt = IMGFMT_NV12, .imgfmt = IMGFMT_NV12,
.planes = 2, .planes = 2,
@ -65,20 +58,20 @@ static struct vda_format vda_formats[] = {
} }
}; };
static struct vda_format *vda_get_gl_format(uint32_t cvpixfmt) static struct vt_format *vt_get_gl_format(uint32_t cvpixfmt)
{ {
for (int i = 0; i < MP_ARRAY_SIZE(vda_formats); i++) { for (int i = 0; i < MP_ARRAY_SIZE(vt_formats); i++) {
if (vda_formats[i].cvpixfmt == cvpixfmt) if (vt_formats[i].cvpixfmt == cvpixfmt)
return &vda_formats[i]; return &vt_formats[i];
} }
return NULL; return NULL;
} }
static struct vda_format *vda_get_gl_format_from_imgfmt(uint32_t imgfmt) static struct vt_format *vt_get_gl_format_from_imgfmt(uint32_t imgfmt)
{ {
for (int i = 0; i < MP_ARRAY_SIZE(vda_formats); i++) { for (int i = 0; i < MP_ARRAY_SIZE(vt_formats); i++) {
if (vda_formats[i].imgfmt == imgfmt) if (vt_formats[i].imgfmt == imgfmt)
return &vda_formats[i]; return &vt_formats[i];
} }
return NULL; return NULL;
} }
@ -87,7 +80,7 @@ static struct mp_image *download_image(struct mp_hwdec_ctx *ctx,
struct mp_image *hw_image, struct mp_image *hw_image,
struct mp_image_pool *swpool) struct mp_image_pool *swpool)
{ {
if (hw_image->imgfmt != IMGFMT_VDA && hw_image->imgfmt != IMGFMT_VIDEOTOOLBOX) if (hw_image->imgfmt != IMGFMT_VIDEOTOOLBOX)
return NULL; return NULL;
CVPixelBufferRef pbuf = (CVPixelBufferRef)hw_image->planes[3]; CVPixelBufferRef pbuf = (CVPixelBufferRef)hw_image->planes[3];
@ -95,7 +88,7 @@ static struct mp_image *download_image(struct mp_hwdec_ctx *ctx,
size_t width = CVPixelBufferGetWidth(pbuf); size_t width = CVPixelBufferGetWidth(pbuf);
size_t height = CVPixelBufferGetHeight(pbuf); size_t height = CVPixelBufferGetHeight(pbuf);
uint32_t cvpixfmt = CVPixelBufferGetPixelFormatType(pbuf); uint32_t cvpixfmt = CVPixelBufferGetPixelFormatType(pbuf);
struct vda_format *f = vda_get_gl_format(cvpixfmt); struct vt_format *f = vt_get_gl_format(cvpixfmt);
if (!f) { if (!f) {
CVPixelBufferUnlockBaseAddress(pbuf, 0); CVPixelBufferUnlockBaseAddress(pbuf, 0);
return NULL; return NULL;
@ -135,35 +128,25 @@ static bool check_hwdec(struct gl_hwdec *hw)
return true; return true;
} }
static int create_common(struct gl_hwdec *hw, struct vda_format *format) static int create(struct gl_hwdec *hw)
{ {
struct priv *p = talloc_zero(hw, struct priv);
hw->priv = p;
hw->gl_texture_target = GL_TEXTURE_RECTANGLE;
hw->converted_imgfmt = format->imgfmt;
if (!check_hwdec(hw)) if (!check_hwdec(hw))
return -1; return -1;
hw->hwctx = &p->hwctx; struct priv *p = talloc_zero(hw, struct priv);
hw->hwctx->download_image = download_image; struct vt_format *f = vt_get_gl_format_from_imgfmt(IMGFMT_NV12);
if (!f)
GL *gl = hw->gl;
gl->GenTextures(MP_MAX_PLANES, p->gl_planes);
return 0;
}
static int create(struct gl_hwdec *hw)
{
struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_NV12);
if (create_common(hw, f))
return -1; return -1;
hw->priv = p;
hw->converted_imgfmt = f->imgfmt;
hw->hwctx = &p->hwctx;
hw->hwctx->download_image = download_image;
hw->hwctx->type = HWDEC_VIDEOTOOLBOX; hw->hwctx->type = HWDEC_VIDEOTOOLBOX;
hw->gl_texture_target = GL_TEXTURE_RECTANGLE;
hw->gl->GenTextures(MP_MAX_PLANES, p->gl_planes);
return 0; return 0;
} }
@ -188,7 +171,7 @@ static int map_image(struct gl_hwdec *hw, struct mp_image *hw_image,
IOSurfaceRef surface = CVPixelBufferGetIOSurface(p->pbuf); IOSurfaceRef surface = CVPixelBufferGetIOSurface(p->pbuf);
uint32_t cvpixfmt = CVPixelBufferGetPixelFormatType(p->pbuf); uint32_t cvpixfmt = CVPixelBufferGetPixelFormatType(p->pbuf);
struct vda_format *f = vda_get_gl_format(cvpixfmt); struct vt_format *f = vt_get_gl_format(cvpixfmt);
if (!f) { if (!f) {
MP_ERR(hw, "CVPixelBuffer has unsupported format type\n"); MP_ERR(hw, "CVPixelBuffer has unsupported format type\n");
return -1; return -1;