mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00
Code Issues Releases Activity

Use BT848SFMT ioctl instead of METEORSFMT (which is incorrect). Allows

Browse Source 
setting norm=SECAM which previously did not work.  Bump PORTREVISION.

PR:		ports/90001
Submitted by:	Vladimir Kushnir <vkushnir@i.kiev.ua>
Approved by:	Thomas E. Zander <riggs@rrr.de> (maintainer)
This commit is contained in:
Sam Lawrance 2005-12-16 10:39:07 +00:00
parent 1713538fe4
commit 8098efcdcd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=151305
2 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multimedia/mplayer/Makefile
View File

@ -270,7 +270,7 @@
PORTNAME= mplayer
PORTVERSION= 0.99.7
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= multimedia audio ipv6
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \

74
multimedia/mplayer/files/patch-libmpdemux_tvi_bsdbt848.c Normal file
View File

@ -0,0 +1,74 @@
--- libmpdemux/tvi_bsdbt848.c.orig Tue Dec 28 04:30:14 2004
+++ libmpdemux/tvi_bsdbt848.c Fri Dec 16 20:42:14 2005
@@ -296,11 +296,11 @@
int req_mode = (int)*(void **)arg;
u_short tmp_fps;
- priv->iformat = METEOR_FMT_AUTOMODE;
+ priv->iformat = BT848_IFORM_F_AUTO;
if(req_mode == TV_NORM_PAL)
{
- priv->iformat = METEOR_FMT_PAL;
+ priv->iformat = BT848_IFORM_F_PALBDGHI;
priv->maxheight = PAL_HEIGHT;
priv->maxwidth = PAL_WIDTH;
priv->maxfps = PAL_FPS;
@@ -321,7 +321,7 @@
if(req_mode == TV_NORM_NTSC)
{
- priv->iformat = METEOR_FMT_NTSC;
+ priv->iformat = BT848_IFORM_F_NTSCM;
priv->maxheight = NTSC_HEIGHT;
priv->maxwidth = NTSC_WIDTH;
priv->maxfps = NTSC_FPS;
@@ -345,9 +345,28 @@
}
}
- if(req_mode == TV_NORM_SECAM) priv->iformat = METEOR_FMT_SECAM;
+ if(req_mode == TV_NORM_SECAM)
+ {
+ priv->iformat = BT848_IFORM_F_SECAM;
+ priv->maxheight = PAL_HEIGHT;
+ priv->maxwidth = PAL_WIDTH;
+ priv->maxfps = PAL_FPS;
+ priv->fps = PAL_FPS;
+
+ if(priv->fps > priv->maxfps) priv->fps = priv->maxfps;
+
+ if(priv->geom.rows > priv->maxheight)
+ {
+ priv->geom.rows = priv->maxheight;
+ }
+
+ if(priv->geom.columns > priv->maxwidth)
+ {
+ priv->geom.columns = priv->maxwidth;
+ }
+ }
- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
+ if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
{
perror("format:ioctl");
return(TVI_CONTROL_FALSE);
@@ -478,7 +497,7 @@
priv->videoready = TRUE;
priv->btdev = strdup("/dev/bktr0");
priv->immediatemode = FALSE;
-priv->iformat = METEOR_FMT_PAL;
+priv->iformat = BT848_IFORM_F_PALBDGHI;
priv->maxheight = PAL_HEIGHT;
priv->maxwidth = PAL_WIDTH;
priv->maxfps = PAL_FPS;
@@ -503,7 +522,7 @@
}
if(priv->videoready == TRUE &&
- ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
+ ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
{
perror("FMT:ioctl");
}