mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 09:36:22 +02:00
media: ivtv: use clamp in ivtv_try_fmt_vid_{out,cap}
Replace multiple min(), max() calls with clamp(). Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
parent
ffdb7c4eca
commit
5d579ece43
|
|
@ -467,15 +467,13 @@ static int ivtv_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format
|
|||
int h = fmt->fmt.pix.height;
|
||||
int min_h = 2;
|
||||
|
||||
w = min(w, 720);
|
||||
w = max(w, 2);
|
||||
w = clamp(w, 2, 720);
|
||||
if (id->type == IVTV_ENC_STREAM_TYPE_YUV) {
|
||||
/* YUV height must be a multiple of 32 */
|
||||
h &= ~0x1f;
|
||||
min_h = 32;
|
||||
}
|
||||
h = min(h, itv->is_50hz ? 576 : 480);
|
||||
h = max(h, min_h);
|
||||
h = clamp(h, min_h, itv->is_50hz ? 576 : 480);
|
||||
ivtv_g_fmt_vid_cap(file, fh, fmt);
|
||||
fmt->fmt.pix.width = w;
|
||||
fmt->fmt.pix.height = h;
|
||||
|
|
@ -516,8 +514,7 @@ static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format
|
|||
int field = fmt->fmt.pix.field;
|
||||
int ret = ivtv_g_fmt_vid_out(file, fh, fmt);
|
||||
|
||||
w = min(w, 720);
|
||||
w = max(w, 2);
|
||||
w = clamp(w, 2, 720);
|
||||
/* Why can the height be 576 even when the output is NTSC?
|
||||
|
||||
Internally the buffers of the PVR350 are always set to 720x576. The
|
||||
|
|
@ -533,8 +530,7 @@ static int ivtv_try_fmt_vid_out(struct file *file, void *fh, struct v4l2_format
|
|||
resolution is locked to the broadcast standard and not scaled.
|
||||
|
||||
Thanks to Ian Armstrong for this explanation. */
|
||||
h = min(h, 576);
|
||||
h = max(h, 2);
|
||||
h = clamp(h, 2, 576);
|
||||
if (id->type == IVTV_DEC_STREAM_TYPE_YUV)
|
||||
fmt->fmt.pix.field = field;
|
||||
fmt->fmt.pix.width = w;
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user