Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 37445
b: refs/heads/master
c: 66440cc
h: refs/heads/master
i:
  37443: 640ce9e
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Sep 26, 2006
1 parent e0c4794 commit 8ecbcf9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4fcd7d8f7b6ce0a0adb3edd6d6edcbf2fd05a02b
refs/heads/master: 66440ccbf2f4077ce59c9692a2c7288201ea0171
16 changes: 4 additions & 12 deletions trunk/drivers/media/video/saa7115.c
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ static int saa711x_set_size(struct i2c_client *client, int width, int height)
int VSCY;
int res;
int is_50hz = state->std & V4L2_STD_625_50;
int Vsrc = is_50hz ? 576 : 480;
int Vsrc = is_50hz ? 576 : 480+16;

v4l_dbg(1, debug, client, "decoder set size to %ix%i\n",width,height);

Expand Down Expand Up @@ -1082,22 +1082,14 @@ static int saa711x_set_size(struct i2c_client *client, int width, int height)
saa711x_write(client, R_CD_B_HORIZ_OUTPUT_WINDOW_LENGTH_MSB,
(u8) ((width >> 8) & 0xff));

if (height == Vsrc) {
/*FIXME: This code seems weird, however, this is how it is
working right now.
*/
res=height/2;
if (!is_50hz)
res+=8;
} else
res=height;
/* Vertical Scaling uses height/2 */
res=height/2;

/* height */
saa711x_write(client, R_CE_B_VERT_OUTPUT_WINDOW_LENGTH,
(u8) (res & 0xff));
saa711x_write(client, R_CF_B_VERT_OUTPUT_WINDOW_LENGTH_MSB,
(u8) (res & 0xff));

(u8) ((res >> 8) & 0xff));

/* Scaling settings */
/* Hprescaler is floor(inres/outres) */
Expand Down

0 comments on commit 8ecbcf9

Please sign in to comment.