Commit 18bef42c authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab

[media] gspca - main: Change the bandwidth estimation of isochronous transfer

Having:
- a mean image size of 0.375 time the max compressed image size and
- a frame rate of 30 fps for small images or with USB 2.0/3.0
seems more realistic and gives less image freezes.
Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 965b37a4
...@@ -633,13 +633,14 @@ static u32 which_bandwidth(struct gspca_dev *gspca_dev) ...@@ -633,13 +633,14 @@ static u32 which_bandwidth(struct gspca_dev *gspca_dev)
u32 bandwidth; u32 bandwidth;
int i; int i;
/* get the (max) image size */
i = gspca_dev->curr_mode; i = gspca_dev->curr_mode;
bandwidth = gspca_dev->cam.cam_mode[i].sizeimage; bandwidth = gspca_dev->cam.cam_mode[i].sizeimage;
/* if the image is compressed, estimate the mean image size */ /* if the image is compressed, estimate its mean size */
if (bandwidth < gspca_dev->cam.cam_mode[i].width * if (bandwidth < gspca_dev->cam.cam_mode[i].width *
gspca_dev->cam.cam_mode[i].height) gspca_dev->cam.cam_mode[i].height)
bandwidth /= 3; bandwidth = bandwidth * 3 / 8; /* 0.375 */
/* estimate the frame rate */ /* estimate the frame rate */
if (gspca_dev->sd_desc->get_streamparm) { if (gspca_dev->sd_desc->get_streamparm) {
...@@ -649,7 +650,14 @@ static u32 which_bandwidth(struct gspca_dev *gspca_dev) ...@@ -649,7 +650,14 @@ static u32 which_bandwidth(struct gspca_dev *gspca_dev)
gspca_dev->sd_desc->get_streamparm(gspca_dev, &parm); gspca_dev->sd_desc->get_streamparm(gspca_dev, &parm);
bandwidth *= parm.parm.capture.timeperframe.denominator; bandwidth *= parm.parm.capture.timeperframe.denominator;
} else { } else {
bandwidth *= 15; /* 15 fps */
/* don't hope more than 15 fps with USB 1.1 and
* image resolution >= 640x480 */
if (gspca_dev->width >= 640
&& gspca_dev->dev->speed == USB_SPEED_FULL)
bandwidth *= 15; /* 15 fps */
else
bandwidth *= 30; /* 30 fps */
} }
PDEBUG(D_STREAM, "min bandwidth: %d", bandwidth); PDEBUG(D_STREAM, "min bandwidth: %d", bandwidth);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment