Messages in this thread | | | Date | Thu, 27 Nov 2014 21:13:09 +0100 (CET) | From | Guennadi Liakhovetski <> | Subject | Re: [PATCH 1/2] media: v4l2-image-sizes.h: add SVGA, XGA and UXGA size definitions |
| |
Hi Josh,
On Thu, 27 Nov 2014, Josh Wu wrote:
> Hi, Guennadi > > On 11/26/2014 6:23 AM, Guennadi Liakhovetski wrote: > > Hi Josh, > > > > On Tue, 25 Nov 2014, Josh Wu wrote: > > > > > Add SVGA, UXGA and XGA size definitions to v4l2-image-sizes.h. > > > The definitions are sorted by alphabet order. > > > > > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > > Thanks for your patches. I'm ok with these two, but the second of them > > depends on the first one, and the first one wouldn't (normally) be going > > via the soc-camera tree. Mauro, how would you prefer to handle this? > > Should I pick up and push to you both of them or postpone #2 until the > > next merge window? > > The first patch is already merged in the media_tree. If the soc-camera tree > will be merged to the media_tree, then there should have no dependency issue. > Am I understanding correct?
Yes, then it should be ok!
Thanks Guennadi
> Best Regards, > Josh Wu > > > > > Thanks > > Guennadi > > > > > --- > > > include/media/v4l2-image-sizes.h | 9 +++++++++ > > > 1 file changed, 9 insertions(+) > > > > > > diff --git a/include/media/v4l2-image-sizes.h > > > b/include/media/v4l2-image-sizes.h > > > index 10daf92..c70c917 100644 > > > --- a/include/media/v4l2-image-sizes.h > > > +++ b/include/media/v4l2-image-sizes.h > > > @@ -25,10 +25,19 @@ > > > #define QVGA_WIDTH 320 > > > #define QVGA_HEIGHT 240 > > > +#define SVGA_WIDTH 800 > > > +#define SVGA_HEIGHT 680 > > > + > > > #define SXGA_WIDTH 1280 > > > #define SXGA_HEIGHT 1024 > > > #define VGA_WIDTH 640 > > > #define VGA_HEIGHT 480 > > > +#define UXGA_WIDTH 1600 > > > +#define UXGA_HEIGHT 1200 > > > + > > > +#define XGA_WIDTH 1024 > > > +#define XGA_HEIGHT 768 > > > + > > > #endif /* _IMAGE_SIZES_H */ > > > -- > > > 1.9.1 > > > >
| |