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

vo_rpi: handle rotation 

Since the MMAL video renderer component supports exactly what we need,
it's pretty simple.
This commit is contained in:
wm4 2016-01-05 14:34:45 +01:00
parent 0b5af5639b
commit 481d15ae60
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
video/out/vo_rpi.c
View File

@ -171,6 +171,12 @@ static void resize(struct vo *vo)
vo_get_src_dst_rects(vo, &src, &dst, &p->osd_res); vo_get_src_dst_rects(vo, &src, &dst, &p->osd_res);
int rotate[] = {MMAL_DISPLAY_ROT0,
MMAL_DISPLAY_ROT90,
MMAL_DISPLAY_ROT180,
MMAL_DISPLAY_ROT270};
int src_w = src.x1 - src.x0, src_h = src.y1 - src.y0, int src_w = src.x1 - src.x0, src_h = src.y1 - src.y0,
dst_w = dst.x1 - dst.x0, dst_h = dst.y1 - dst.y0; dst_w = dst.x1 - dst.x0, dst_h = dst.y1 - dst.y0;
int p_x, p_y; int p_x, p_y;
@ -184,11 +190,17 @@ static void resize(struct vo *vo)
.display_num = p->display_nr, .display_num = p->display_nr,
.pixel_x = p_x, .pixel_x = p_x,
.pixel_y = p_y, .pixel_y = p_y,
.transform = rotate[vo->params ? vo->params->rotate / 90 : 0],
.set = MMAL_DISPLAY_SET_SRC_RECT | MMAL_DISPLAY_SET_DEST_RECT | .set = MMAL_DISPLAY_SET_SRC_RECT | MMAL_DISPLAY_SET_DEST_RECT |
MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_NUM | MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_NUM |
MMAL_DISPLAY_SET_PIXEL, MMAL_DISPLAY_SET_PIXEL | MMAL_DISPLAY_SET_TRANSFORM,
}; };
if (vo->params && (vo->params->rotate % 180) == 90) {
MPSWAP(int, dr.src_rect.x, dr.src_rect.y);
MPSWAP(int, dr.src_rect.width, dr.src_rect.height);
}
if (mmal_port_parameter_set(input, &dr.hdr)) if (mmal_port_parameter_set(input, &dr.hdr))
MP_WARN(vo, "could not set video rectangle\n"); MP_WARN(vo, "could not set video rectangle\n");
} }
@ -677,6 +689,7 @@ static const struct m_option options[] = {
const struct vo_driver video_out_rpi = { const struct vo_driver video_out_rpi = {
.description = "Raspberry Pi (MMAL)", .description = "Raspberry Pi (MMAL)",
.name = "rpi", .name = "rpi",
.caps = VO_CAP_ROTATE90,
.preinit = preinit, .preinit = preinit,
.query_format = query_format, .query_format = query_format,
.reconfig = reconfig, .reconfig = reconfig,