From 7fdf3210dfb7d7ee7e40b7716a07edf7d07d0cd9 Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 11 Nov 2001 02:54:50 +0000 Subject: added support for -tv outfmt git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2818 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/tv.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'libmpdemux/tv.c') diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index 1b7a87c9fe..1a3ac2a2d1 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -31,6 +31,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 */ +char *tv_param_outfmt = "yv12"; /* ================== DEMUX_TV ===================== */ @@ -95,8 +96,24 @@ int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh) sh_video = new_sh_video(demuxer, 0); - /* hack to use YUV 4:2:0 format ;) */ - sh_video->format = IMGFMT_UYVY; + if (!strcasecmp(tv_param_outfmt, "yv12")) + sh_video->format = IMGFMT_YV12; + else if (!strcasecmp(tv_param_outfmt, "uyvy")) + sh_video->format = IMGFMT_UYVY; + else if (!strcasecmp(tv_param_outfmt, "rgb32")) + sh_video->format = IMGFMT_RGB32; + else if (!strcasecmp(tv_param_outfmt, "rgb24")) + sh_video->format = IMGFMT_RGB24; + else if (!strcasecmp(tv_param_outfmt, "rgb16")) + sh_video->format = IMGFMT_RGB16; + else if (!strcasecmp(tv_param_outfmt, "rgb15")) + sh_video->format = IMGFMT_RGB15; + else + { + printf("Unknown format given: %s\n", tv_param_outfmt); + printf("Using default: Planar YV12\n"); + sh_video->format = IMGFMT_YV12; + } funcs->control(tvh->priv, TVI_CONTROL_VID_SET_FORMAT, &sh_video->format); /* get IMGFMT_ */ @@ -185,7 +202,7 @@ int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh) case AFMT_MPEG: case AFMT_AC3: default: - printf("%s unsupported!\n", audio_out_format_name(audio_format)); +// printf("%s unsupported!\n", audio_out_format_name(audio_format)); goto no_audio; } -- cgit v1.2.3