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

vd_lavc: simplify RPI and Mediacodec wrappers 

Use the recently added lavc_suffix mechanism to select the wrapper
decoder.

With all hwdec callbacks being optional, and RPI/Mediacodec having only
dummy callbacks, all the callbacks can be removed as well.

The result is that the vd_lavc_hwdec struct for both of them is tiny.
It's better to move them to vd_lavc.c directly, because they are so
trivial and small.
This commit is contained in:
wm4 2016-04-25 12:09:09 +02:00
parent 46e49a37be
commit 7e3d8e7134
4 changed files with 12 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
video/decode/mediacodec.c
View File

@ -1,68 +0,0 @@
/*
* This file is part of mpv.
*
* mpv is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lavc.h"
#include "common/common.h"
static const char *const codecs[][2] = {
{"h264", "h264_mediacodec"},
{0}
};
static const char *map_codec(const char *c)
{
for (int n = 0; codecs[n][0]; n++) {
if (c && strcmp(codecs[n][0], c) == 0)
return codecs[n][1];
}
return NULL;
}
static int init_decoder(struct lavc_ctx *ctx, int w, int h)
{
return 0;
}
static void uninit(struct lavc_ctx *ctx)
{
}
static int init(struct lavc_ctx *ctx)
{
return 0;
}
static int probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info,
const char *decoder)
{
return map_codec(decoder) ? 0 : HWDEC_ERR_NO_CODEC;
}
static const char *get_codec(struct lavc_ctx *ctx, const char *codec)
{
return map_codec(codec);
}
const struct vd_lavc_hwdec mp_vd_lavc_mediacodec = {
.type = HWDEC_MEDIACODEC,
.image_format = IMGFMT_NV12,
.probe = probe,
.init = init,
.uninit = uninit,
.init_decoder = init_decoder,
.get_codec = get_codec,
};

71
video/decode/rpi.c
View File

@ -1,71 +0,0 @@
/*
* This file is part of mpv.
*
* mpv is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 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 Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lavc.h"
#include "common/common.h"
static const char *const codecs[][2] = {
{"h264", "h264_mmal"},
{"mpeg2video", "mpeg2_mmal"},
{"mpeg4", "mpeg4_mmal"},
{"vc1", "vc1_mmal"},
{0}
};
static const char *map_codec(const char *c)
{
for (int n = 0; codecs[n][0]; n++) {
if (c && strcmp(codecs[n][0], c) == 0)
return codecs[n][1];
}
return NULL;
}
static int init_decoder(struct lavc_ctx *ctx, int w, int h)
{
return 0;
}
static void uninit(struct lavc_ctx *ctx)
{
}
static int init(struct lavc_ctx *ctx)
{
return 0;
}
static int probe(struct vd_lavc_hwdec *hwdec, struct mp_hwdec_info *info,
const char *codec)
{
return map_codec(codec) ? 0 : HWDEC_ERR_NO_CODEC;
}
static const char *get_codec(struct lavc_ctx *ctx, const char *codec)
{
return map_codec(codec);
}
const struct vd_lavc_hwdec mp_vd_lavc_rpi = {
.type = HWDEC_RPI,
.image_format = IMGFMT_MMAL,
.probe = probe,
.init = init,
.uninit = uninit,
.init_decoder = init_decoder,
.get_codec = get_codec,
};

14
video/decode/vd_lavc.c
View File

@ -127,8 +127,18 @@ extern const struct vd_lavc_hwdec mp_vd_lavc_vaapi_copy;
extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2;
extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2_copy;
extern const struct vd_lavc_hwdec mp_vd_lavc_d3d11va_copy;
extern const struct vd_lavc_hwdec mp_vd_lavc_rpi;
extern const struct vd_lavc_hwdec mp_vd_lavc_mediacodec;
static const struct vd_lavc_hwdec mp_vd_lavc_rpi = {
.type = HWDEC_RPI,
.lavc_suffix = "_mmal",
.image_format = IMGFMT_MMAL,
};
static const struct vd_lavc_hwdec mp_vd_lavc_mediacodec = {
.type = HWDEC_MEDIACODEC,
.lavc_suffix = "_mediacodec",
.image_format = IMGFMT_NV12,
};
static const struct vd_lavc_hwdec *const hwdec_list[] = {
#if HAVE_RPI

2
wscript_build.py
View File

@ -294,12 +294,10 @@ def build(ctx):
( "video/decode/dxva2.c", "dxva2-hwaccel" ),
( "video/decode/d3d11va.c", "d3d11va-hwaccel" ),
( "video/decode/d3d.c", "d3d-hwaccel" ),
( "video/decode/rpi.c", "rpi" ),
( "video/decode/vaapi.c", "vaapi-hwaccel" ),
( "video/decode/vd_lavc.c" ),
( "video/decode/videotoolbox.c", "videotoolbox-hwaccel" ),
( "video/decode/vdpau.c", "vdpau-hwaccel" ),
( "video/decode/mediacodec.c", "android" ),
( "video/filter/vf.c" ),
( "video/filter/vf_buffer.c" ),
( "video/filter/vf_crop.c" ),