vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API
Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This
file is named so because because it's written against the "old"
libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau").
Add support for the "new" libavcodec vdpau support. This was recently
added and replaces the "old" vdpau parts. (In fact, Libav is about to
deprecate and remove the "old" API without deprecation grace period,
so we have to support it now. Moreover, there will probably be no Libav
release which supports both, so the transition is even less smooth than
we could hope, and we have to support both the old and new API.)
Whether the old or new API is used is checked by a configure test: if
the new API is found, it is used, otherwise the old API is assumed.
Some details might be handled differently. Especially display preemption
is a bit problematic with the "new" libavcodec vdpau support: it wants
to keep a pointer to a specific vdpau API function (which can be driver
specific, because preemption might switch drivers). Also, surface IDs
are now directly stored in AVFrames (and mp_images), so they can't be
forced to VDP_INVALID_HANDLE on preemption. (This changes even with
older libavcodec versions, because mp_image always uses the newer
representation to make vo_vdpau.c simpler.)
Decoder initialization in the new code tries to deal with codec
profiles, while the old code always uses the highest profile per codec.
Surface allocation changes. Since the decoder won't call config() in
vo_vdpau.c on video size change anymore, we allow allocating surfaces
of arbitrary size instead of locking it to what the VO was configured.
The non-hwdec code also has slightly different allocation behavior now.
Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau
doesn't work anymore (a warning suggesting the --hwdec option is
printed instead).
2013-07-27 23:49:45 +00:00
|
|
|
/*
|
|
|
|
* This file is part of mpv.
|
|
|
|
*
|
|
|
|
* mpv is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* mpv is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
2013-11-05 21:06:32 +00:00
|
|
|
#include <assert.h>
|
|
|
|
|
vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API
Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This
file is named so because because it's written against the "old"
libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau").
Add support for the "new" libavcodec vdpau support. This was recently
added and replaces the "old" vdpau parts. (In fact, Libav is about to
deprecate and remove the "old" API without deprecation grace period,
so we have to support it now. Moreover, there will probably be no Libav
release which supports both, so the transition is even less smooth than
we could hope, and we have to support both the old and new API.)
Whether the old or new API is used is checked by a configure test: if
the new API is found, it is used, otherwise the old API is assumed.
Some details might be handled differently. Especially display preemption
is a bit problematic with the "new" libavcodec vdpau support: it wants
to keep a pointer to a specific vdpau API function (which can be driver
specific, because preemption might switch drivers). Also, surface IDs
are now directly stored in AVFrames (and mp_images), so they can't be
forced to VDP_INVALID_HANDLE on preemption. (This changes even with
older libavcodec versions, because mp_image always uses the newer
representation to make vo_vdpau.c simpler.)
Decoder initialization in the new code tries to deal with codec
profiles, while the old code always uses the highest profile per codec.
Surface allocation changes. Since the decoder won't call config() in
vo_vdpau.c on video size change anymore, we allow allocating surfaces
of arbitrary size instead of locking it to what the VO was configured.
The non-hwdec code also has slightly different allocation behavior now.
Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau
doesn't work anymore (a warning suggesting the --hwdec option is
printed instead).
2013-07-27 23:49:45 +00:00
|
|
|
#include "vdpau.h"
|
|
|
|
|
2013-11-05 21:06:32 +00:00
|
|
|
#include "osdep/timer.h"
|
|
|
|
|
|
|
|
#include "video/out/x11_common.h"
|
vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API
Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This
file is named so because because it's written against the "old"
libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau").
Add support for the "new" libavcodec vdpau support. This was recently
added and replaces the "old" vdpau parts. (In fact, Libav is about to
deprecate and remove the "old" API without deprecation grace period,
so we have to support it now. Moreover, there will probably be no Libav
release which supports both, so the transition is even less smooth than
we could hope, and we have to support both the old and new API.)
Whether the old or new API is used is checked by a configure test: if
the new API is found, it is used, otherwise the old API is assumed.
Some details might be handled differently. Especially display preemption
is a bit problematic with the "new" libavcodec vdpau support: it wants
to keep a pointer to a specific vdpau API function (which can be driver
specific, because preemption might switch drivers). Also, surface IDs
are now directly stored in AVFrames (and mp_images), so they can't be
forced to VDP_INVALID_HANDLE on preemption. (This changes even with
older libavcodec versions, because mp_image always uses the newer
representation to make vo_vdpau.c simpler.)
Decoder initialization in the new code tries to deal with codec
profiles, while the old code always uses the highest profile per codec.
Surface allocation changes. Since the decoder won't call config() in
vo_vdpau.c on video size change anymore, we allow allocating surfaces
of arbitrary size instead of locking it to what the VO was configured.
The non-hwdec code also has slightly different allocation behavior now.
Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau
doesn't work anymore (a warning suggesting the --hwdec option is
printed instead).
2013-07-27 23:49:45 +00:00
|
|
|
#include "video/img_format.h"
|
2013-11-05 21:06:32 +00:00
|
|
|
#include "video/mp_image.h"
|
|
|
|
|
|
|
|
static void mark_vdpau_objects_uninitialized(struct mp_vdpau_ctx *ctx)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < MAX_VIDEO_SURFACES; i++)
|
|
|
|
ctx->video_surfaces[i].surface = VDP_INVALID_HANDLE;
|
|
|
|
ctx->vdp_device = VDP_INVALID_HANDLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void preemption_callback(VdpDevice device, void *context)
|
|
|
|
{
|
|
|
|
struct mp_vdpau_ctx *ctx = context;
|
|
|
|
ctx->is_preempted = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int win_x11_init_vdpau_procs(struct mp_vdpau_ctx *ctx)
|
|
|
|
{
|
|
|
|
struct vo_x11_state *x11 = ctx->x11;
|
|
|
|
VdpStatus vdp_st;
|
|
|
|
|
|
|
|
// Don't operate on ctx->vdp directly, so that even if init fails, ctx->vdp
|
|
|
|
// will have the function pointers from the previous successful init, and
|
|
|
|
// won't randomly make other code crash on calling NULL pointers.
|
|
|
|
struct vdp_functions vdp = {0};
|
|
|
|
|
|
|
|
if (!x11)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
struct vdp_function {
|
|
|
|
const int id;
|
|
|
|
int offset;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct vdp_function vdp_func[] = {
|
|
|
|
#define VDP_FUNCTION(_, macro_name, mp_name) {macro_name, offsetof(struct vdp_functions, mp_name)},
|
|
|
|
#include "video/vdpau_functions.inc"
|
|
|
|
#undef VDP_FUNCTION
|
|
|
|
{0, -1}
|
|
|
|
};
|
|
|
|
|
|
|
|
VdpGetProcAddress *get_proc_address;
|
|
|
|
vdp_st = vdp_device_create_x11(x11->display, x11->screen, &ctx->vdp_device,
|
|
|
|
&get_proc_address);
|
|
|
|
if (vdp_st != VDP_STATUS_OK) {
|
|
|
|
if (ctx->is_preempted)
|
|
|
|
MP_DBG(ctx, "Error calling vdp_device_create_x11 while preempted: %d\n",
|
|
|
|
vdp_st);
|
|
|
|
else
|
|
|
|
MP_ERR(ctx, "Error when calling vdp_device_create_x11: %d\n", vdp_st);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (const struct vdp_function *dsc = vdp_func; dsc->offset >= 0; dsc++) {
|
|
|
|
vdp_st = get_proc_address(ctx->vdp_device, dsc->id,
|
|
|
|
(void **)((char *)&vdp + dsc->offset));
|
|
|
|
if (vdp_st != VDP_STATUS_OK) {
|
|
|
|
MP_ERR(ctx, "Error when calling vdp_get_proc_address(function "
|
|
|
|
"id %d): %s\n", dsc->id,
|
|
|
|
vdp.get_error_string ? vdp.get_error_string(vdp_st) : "?");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-19 18:57:08 +00:00
|
|
|
ctx->vdp = vdp;
|
2013-11-05 21:06:32 +00:00
|
|
|
ctx->get_proc_address = get_proc_address;
|
|
|
|
|
|
|
|
vdp_st = vdp.preemption_callback_register(ctx->vdp_device,
|
|
|
|
preemption_callback, ctx);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int handle_preemption(struct mp_vdpau_ctx *ctx)
|
|
|
|
{
|
|
|
|
if (!ctx->is_preempted)
|
|
|
|
return 0;
|
|
|
|
mark_vdpau_objects_uninitialized(ctx);
|
|
|
|
if (!ctx->preemption_user_notified) {
|
|
|
|
MP_ERR(ctx, "Got display preemption notice! Will attempt to recover.\n");
|
|
|
|
ctx->preemption_user_notified = true;
|
|
|
|
}
|
|
|
|
/* Trying to initialize seems to be quite slow, so only try once a
|
|
|
|
* second to avoid using 100% CPU. */
|
|
|
|
if (ctx->last_preemption_retry_fail &&
|
|
|
|
mp_time_sec() - ctx->last_preemption_retry_fail < 1.0)
|
|
|
|
return -1;
|
|
|
|
if (win_x11_init_vdpau_procs(ctx) < 0) {
|
|
|
|
ctx->last_preemption_retry_fail = mp_time_sec();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
ctx->preemption_user_notified = false;
|
|
|
|
ctx->last_preemption_retry_fail = 0;
|
|
|
|
ctx->is_preempted = false;
|
|
|
|
ctx->preemption_counter++;
|
|
|
|
MP_INFO(ctx, "Recovered from display preemption.\n");
|
|
|
|
return 1;
|
|
|
|
}
|
vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API
Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This
file is named so because because it's written against the "old"
libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau").
Add support for the "new" libavcodec vdpau support. This was recently
added and replaces the "old" vdpau parts. (In fact, Libav is about to
deprecate and remove the "old" API without deprecation grace period,
so we have to support it now. Moreover, there will probably be no Libav
release which supports both, so the transition is even less smooth than
we could hope, and we have to support both the old and new API.)
Whether the old or new API is used is checked by a configure test: if
the new API is found, it is used, otherwise the old API is assumed.
Some details might be handled differently. Especially display preemption
is a bit problematic with the "new" libavcodec vdpau support: it wants
to keep a pointer to a specific vdpau API function (which can be driver
specific, because preemption might switch drivers). Also, surface IDs
are now directly stored in AVFrames (and mp_images), so they can't be
forced to VDP_INVALID_HANDLE on preemption. (This changes even with
older libavcodec versions, because mp_image always uses the newer
representation to make vo_vdpau.c simpler.)
Decoder initialization in the new code tries to deal with codec
profiles, while the old code always uses the highest profile per codec.
Surface allocation changes. Since the decoder won't call config() in
vo_vdpau.c on video size change anymore, we allow allocating surfaces
of arbitrary size instead of locking it to what the VO was configured.
The non-hwdec code also has slightly different allocation behavior now.
Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau
doesn't work anymore (a warning suggesting the --hwdec option is
printed instead).
2013-07-27 23:49:45 +00:00
|
|
|
|
|
|
|
// Check whether vdpau initialization and preemption status is ok and we can
|
|
|
|
// proceed normally.
|
|
|
|
bool mp_vdpau_status_ok(struct mp_vdpau_ctx *ctx)
|
|
|
|
{
|
2013-11-05 21:06:32 +00:00
|
|
|
return handle_preemption(ctx) >= 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void release_decoder_surface(void *ptr)
|
|
|
|
{
|
|
|
|
bool *in_use_ptr = ptr;
|
|
|
|
*in_use_ptr = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct mp_image *create_ref(struct surface_entry *e)
|
|
|
|
{
|
|
|
|
assert(!e->in_use);
|
|
|
|
e->in_use = true;
|
|
|
|
struct mp_image *res =
|
|
|
|
mp_image_new_custom_ref(&(struct mp_image){0}, &e->in_use,
|
|
|
|
release_decoder_surface);
|
2014-03-17 17:21:11 +00:00
|
|
|
mp_image_setfmt(res, IMGFMT_VDPAU);
|
2013-11-05 21:06:32 +00:00
|
|
|
mp_image_set_size(res, e->w, e->h);
|
|
|
|
res->planes[0] = (void *)"dummy"; // must be non-NULL, otherwise arbitrary
|
|
|
|
res->planes[3] = (void *)(intptr_t)e->surface;
|
|
|
|
return res;
|
vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API
Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This
file is named so because because it's written against the "old"
libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau").
Add support for the "new" libavcodec vdpau support. This was recently
added and replaces the "old" vdpau parts. (In fact, Libav is about to
deprecate and remove the "old" API without deprecation grace period,
so we have to support it now. Moreover, there will probably be no Libav
release which supports both, so the transition is even less smooth than
we could hope, and we have to support both the old and new API.)
Whether the old or new API is used is checked by a configure test: if
the new API is found, it is used, otherwise the old API is assumed.
Some details might be handled differently. Especially display preemption
is a bit problematic with the "new" libavcodec vdpau support: it wants
to keep a pointer to a specific vdpau API function (which can be driver
specific, because preemption might switch drivers). Also, surface IDs
are now directly stored in AVFrames (and mp_images), so they can't be
forced to VDP_INVALID_HANDLE on preemption. (This changes even with
older libavcodec versions, because mp_image always uses the newer
representation to make vo_vdpau.c simpler.)
Decoder initialization in the new code tries to deal with codec
profiles, while the old code always uses the highest profile per codec.
Surface allocation changes. Since the decoder won't call config() in
vo_vdpau.c on video size change anymore, we allow allocating surfaces
of arbitrary size instead of locking it to what the VO was configured.
The non-hwdec code also has slightly different allocation behavior now.
Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau
doesn't work anymore (a warning suggesting the --hwdec option is
printed instead).
2013-07-27 23:49:45 +00:00
|
|
|
}
|
|
|
|
|
2014-03-17 17:21:11 +00:00
|
|
|
struct mp_image *mp_vdpau_get_video_surface(struct mp_vdpau_ctx *ctx,
|
vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API
Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This
file is named so because because it's written against the "old"
libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau").
Add support for the "new" libavcodec vdpau support. This was recently
added and replaces the "old" vdpau parts. (In fact, Libav is about to
deprecate and remove the "old" API without deprecation grace period,
so we have to support it now. Moreover, there will probably be no Libav
release which supports both, so the transition is even less smooth than
we could hope, and we have to support both the old and new API.)
Whether the old or new API is used is checked by a configure test: if
the new API is found, it is used, otherwise the old API is assumed.
Some details might be handled differently. Especially display preemption
is a bit problematic with the "new" libavcodec vdpau support: it wants
to keep a pointer to a specific vdpau API function (which can be driver
specific, because preemption might switch drivers). Also, surface IDs
are now directly stored in AVFrames (and mp_images), so they can't be
forced to VDP_INVALID_HANDLE on preemption. (This changes even with
older libavcodec versions, because mp_image always uses the newer
representation to make vo_vdpau.c simpler.)
Decoder initialization in the new code tries to deal with codec
profiles, while the old code always uses the highest profile per codec.
Surface allocation changes. Since the decoder won't call config() in
vo_vdpau.c on video size change anymore, we allow allocating surfaces
of arbitrary size instead of locking it to what the VO was configured.
The non-hwdec code also has slightly different allocation behavior now.
Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau
doesn't work anymore (a warning suggesting the --hwdec option is
printed instead).
2013-07-27 23:49:45 +00:00
|
|
|
VdpChromaType chroma, int w, int h)
|
|
|
|
{
|
2014-03-19 18:57:08 +00:00
|
|
|
struct vdp_functions *vdp = &ctx->vdp;
|
2013-11-05 21:06:32 +00:00
|
|
|
VdpStatus vdp_st;
|
|
|
|
|
|
|
|
// Destroy all unused surfaces that don't have matching parameters
|
|
|
|
for (int n = 0; n < MAX_VIDEO_SURFACES; n++) {
|
|
|
|
struct surface_entry *e = &ctx->video_surfaces[n];
|
|
|
|
if (!e->in_use && e->surface != VDP_INVALID_HANDLE) {
|
2014-03-17 17:21:11 +00:00
|
|
|
if (e->chroma != chroma || e->w != w || e->h != h) {
|
2013-11-05 21:06:32 +00:00
|
|
|
vdp_st = vdp->video_surface_destroy(e->surface);
|
2013-12-21 17:05:23 +00:00
|
|
|
CHECK_VDP_WARNING(ctx, "Error when calling vdp_video_surface_destroy");
|
2013-11-05 21:06:32 +00:00
|
|
|
e->surface = VDP_INVALID_HANDLE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try to find an existing unused surface
|
|
|
|
for (int n = 0; n < MAX_VIDEO_SURFACES; n++) {
|
|
|
|
struct surface_entry *e = &ctx->video_surfaces[n];
|
|
|
|
if (!e->in_use && e->surface != VDP_INVALID_HANDLE) {
|
|
|
|
assert(e->w == w && e->h == h);
|
2014-03-17 17:21:11 +00:00
|
|
|
assert(e->chroma == chroma);
|
2013-11-05 21:06:32 +00:00
|
|
|
return create_ref(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Allocate new surface
|
|
|
|
for (int n = 0; n < MAX_VIDEO_SURFACES; n++) {
|
|
|
|
struct surface_entry *e = &ctx->video_surfaces[n];
|
|
|
|
if (!e->in_use) {
|
|
|
|
assert(e->surface == VDP_INVALID_HANDLE);
|
|
|
|
e->chroma = chroma;
|
|
|
|
e->w = w;
|
|
|
|
e->h = h;
|
|
|
|
if (ctx->is_preempted) {
|
|
|
|
MP_WARN(ctx, "Preempted, no surface.\n");
|
|
|
|
} else {
|
|
|
|
vdp_st = vdp->video_surface_create(ctx->vdp_device, chroma,
|
|
|
|
w, h, &e->surface);
|
2013-12-21 17:05:23 +00:00
|
|
|
CHECK_VDP_WARNING(ctx, "Error when calling vdp_video_surface_create");
|
2013-11-05 21:06:32 +00:00
|
|
|
}
|
|
|
|
return create_ref(e);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
MP_ERR(ctx, "no surfaces available in mp_vdpau_get_video_surface\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct mp_vdpau_ctx *mp_vdpau_create_device_x11(struct mp_log *log,
|
|
|
|
struct vo_x11_state *x11)
|
|
|
|
{
|
|
|
|
struct mp_vdpau_ctx *ctx = talloc_ptrtype(NULL, ctx);
|
|
|
|
*ctx = (struct mp_vdpau_ctx) {
|
|
|
|
.log = log,
|
|
|
|
.x11 = x11,
|
|
|
|
};
|
|
|
|
|
|
|
|
mark_vdpau_objects_uninitialized(ctx);
|
|
|
|
|
|
|
|
if (win_x11_init_vdpau_procs(ctx) < 0) {
|
2014-03-19 18:57:08 +00:00
|
|
|
if (ctx->vdp.device_destroy)
|
|
|
|
ctx->vdp.device_destroy(ctx->vdp_device);
|
2013-11-05 21:06:32 +00:00
|
|
|
talloc_free(ctx);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return ctx;
|
|
|
|
}
|
|
|
|
|
|
|
|
void mp_vdpau_destroy(struct mp_vdpau_ctx *ctx)
|
|
|
|
{
|
2014-03-19 18:57:08 +00:00
|
|
|
struct vdp_functions *vdp = &ctx->vdp;
|
2013-11-05 21:06:32 +00:00
|
|
|
VdpStatus vdp_st;
|
|
|
|
|
|
|
|
for (int i = 0; i < MAX_VIDEO_SURFACES; i++) {
|
|
|
|
// can't hold references past context lifetime
|
|
|
|
assert(!ctx->video_surfaces[i].in_use);
|
|
|
|
if (ctx->video_surfaces[i].surface != VDP_INVALID_HANDLE) {
|
|
|
|
vdp_st = vdp->video_surface_destroy(ctx->video_surfaces[i].surface);
|
2013-12-21 17:05:23 +00:00
|
|
|
CHECK_VDP_WARNING(ctx, "Error when calling vdp_video_surface_destroy");
|
2013-11-05 21:06:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx->vdp_device != VDP_INVALID_HANDLE) {
|
|
|
|
vdp_st = vdp->device_destroy(ctx->vdp_device);
|
2013-12-21 17:05:23 +00:00
|
|
|
CHECK_VDP_WARNING(ctx, "Error when calling vdp_device_destroy");
|
2013-11-05 21:06:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
talloc_free(ctx);
|
vdpau: split off decoder parts, use "new" libavcodec vdpau hwaccel API
Move the decoder parts from vo_vdpau.c to a new file vdpau_old.c. This
file is named so because because it's written against the "old"
libavcodec vdpau pseudo-decoder (e.g. "h264_vdpau").
Add support for the "new" libavcodec vdpau support. This was recently
added and replaces the "old" vdpau parts. (In fact, Libav is about to
deprecate and remove the "old" API without deprecation grace period,
so we have to support it now. Moreover, there will probably be no Libav
release which supports both, so the transition is even less smooth than
we could hope, and we have to support both the old and new API.)
Whether the old or new API is used is checked by a configure test: if
the new API is found, it is used, otherwise the old API is assumed.
Some details might be handled differently. Especially display preemption
is a bit problematic with the "new" libavcodec vdpau support: it wants
to keep a pointer to a specific vdpau API function (which can be driver
specific, because preemption might switch drivers). Also, surface IDs
are now directly stored in AVFrames (and mp_images), so they can't be
forced to VDP_INVALID_HANDLE on preemption. (This changes even with
older libavcodec versions, because mp_image always uses the newer
representation to make vo_vdpau.c simpler.)
Decoder initialization in the new code tries to deal with codec
profiles, while the old code always uses the highest profile per codec.
Surface allocation changes. Since the decoder won't call config() in
vo_vdpau.c on video size change anymore, we allow allocating surfaces
of arbitrary size instead of locking it to what the VO was configured.
The non-hwdec code also has slightly different allocation behavior now.
Enabling the old vdpau special decoders via e.g. --vd=lavc:h264_vdpau
doesn't work anymore (a warning suggesting the --hwdec option is
printed instead).
2013-07-27 23:49:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool mp_vdpau_get_format(int imgfmt, VdpChromaType *out_chroma_type,
|
|
|
|
VdpYCbCrFormat *out_pixel_format)
|
|
|
|
{
|
|
|
|
VdpChromaType chroma = VDP_CHROMA_TYPE_420;
|
|
|
|
VdpYCbCrFormat ycbcr = (VdpYCbCrFormat)-1;
|
|
|
|
|
|
|
|
switch (imgfmt) {
|
|
|
|
case IMGFMT_420P:
|
|
|
|
ycbcr = VDP_YCBCR_FORMAT_YV12;
|
|
|
|
break;
|
|
|
|
case IMGFMT_NV12:
|
|
|
|
ycbcr = VDP_YCBCR_FORMAT_NV12;
|
|
|
|
break;
|
|
|
|
case IMGFMT_YUYV:
|
|
|
|
ycbcr = VDP_YCBCR_FORMAT_YUYV;
|
|
|
|
chroma = VDP_CHROMA_TYPE_422;
|
|
|
|
break;
|
|
|
|
case IMGFMT_UYVY:
|
|
|
|
ycbcr = VDP_YCBCR_FORMAT_UYVY;
|
|
|
|
chroma = VDP_CHROMA_TYPE_422;
|
|
|
|
break;
|
|
|
|
case IMGFMT_VDPAU:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (out_chroma_type)
|
|
|
|
*out_chroma_type = chroma;
|
|
|
|
if (out_pixel_format)
|
|
|
|
*out_pixel_format = ycbcr;
|
|
|
|
return true;
|
|
|
|
}
|