[FFmpeg-devel] [PATCH] Misc patches for libavdevice/v4l.c

[Michael Niedermayer]

On Fri, Dec 26, 2008 at 11:36:36AM +0100, Stefano Sabatini wrote:
> On date Friday 2008-12-26 00:52:12 +0100, Michael Niedermayer encoded:
> > On Wed, Dec 24, 2008 at 03:37:05PM +0100, Stefano Sabatini wrote:
[...]
> > [...]
> > 
> > 
> > > Index: ffmpeg/libavdevice/v4l.c
> > > ===================================================================
> > > --- ffmpeg.orig/libavdevice/v4l.c	2008-12-21 23:45:13.000000000 +0100
> > > +++ ffmpeg/libavdevice/v4l.c	2008-12-24 13:34:57.000000000 +0100
> > > @@ -84,11 +84,6 @@
> > >      }
> > >      s->time_base = ap->time_base;
> > >  
> > > -    if((unsigned)ap->width > 32767 || (unsigned)ap->height > 32767) {
> > > -        av_log(s1, AV_LOG_ERROR, "Capture size is out of range: %dx%d\n",
> > > -            ap->width, ap->height);
> > > -        return -1;
> > > -    }
> > >      s->video_win.width = ap->width;
> > >      s->video_win.height = ap->height;
> > >  
> > ?
> 
> The idea is that this check is useless, since either the VIDIOCSWIN
> either the VIDIOCMCAPTURE iotctl will perform a check on the size (but
> I don't know where the 32767 value comes from).

I think the check is insufficient and more not less checking is needed

 frame_size = s->video_win.width * s->video_win.height * video_formats[j].depth / 8;

will not work with 32767*32767*...


> 
> Patches attached:
> 
> * v4l-add-videocswin-check.patch: add a missing check

ok


[...]
> * v4l-vidiocmcapture-errmsg.patch: more consistent with the other
>   ioctls error messages, no strong opinion on this though.

ok

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

He who knows, does not speak. He who speaks, does not know. -- Lao Tsu
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20081226/bb67eef1/attachment.pgp>