mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

Try several formats instead of only YV12 if no format was explicitly

Browse Source 
requested. Patch from Benjamin Zores <ben -at- geexbox -dot- org> with
a few whitespace changes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17863 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2006-03-14 00:45:06 +00:00
parent 5c1f13b9be
commit 0e8dd7511d
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libmpdemux/tv.c
View File

@ -53,7 +53,7 @@ char *tv_param_driver = "dummy";
int tv_param_width = -1;
int tv_param_height = -1;
int tv_param_input = 0; /* used in v4l and bttv */
int tv_param_outfmt = IMGFMT_YV12;
int tv_param_outfmt = -1;
float tv_param_fps = -1.0;
char **tv_param_channels = NULL;
int tv_param_audio_id = 0;
@ -165,6 +165,16 @@ static int open_tv(tvi_handle_t *tvh)
{
int i;
tvi_functions_t *funcs = tvh->functions;
int tv_fmt_list[] = {
IMGFMT_YV12,
IMGFMT_I420,
IMGFMT_UYVY,
IMGFMT_YUY2,
IMGFMT_RGB32,
IMGFMT_RGB24,
IMGFMT_RGB16,
IMGFMT_RGB15
};
if (funcs->control(tvh->priv, TVI_CONTROL_IS_VIDEO, 0) != TVI_CONTROL_TRUE)
{
@ -172,6 +182,16 @@ static int open_tv(tvi_handle_t *tvh)
return 0;
}
if (tv_param_outfmt == -1)
for (i = 0; i < sizeof (tv_fmt_list) / sizeof (*tv_fmt_list); i++)
{
tv_param_outfmt = tv_fmt_list[i];
if (funcs->control (tvh->priv, TVI_CONTROL_VID_SET_FORMAT,
&tv_param_outfmt) == TVI_CONTROL_TRUE)
break;
}
else
{
switch(tv_param_outfmt)
{
case IMGFMT_YV12:
@ -194,6 +214,7 @@ static int open_tv(tvi_handle_t *tvh)
mp_msg(MSGT_TV, MSGL_ERR, "==================================================================\n");
}
funcs->control(tvh->priv, TVI_CONTROL_VID_SET_FORMAT, &tv_param_outfmt);
}
/* set some params got from cmdline */
funcs->control(tvh->priv, TVI_CONTROL_SPC_SET_INPUT, &tv_param_input);