| Message ID | 1365629285-22793-1-git-send-email-ismael.luceno@corp.bluecherry.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Ismael! A quick review below: On Wed April 10 2013 23:28:05 Ismael Luceno wrote: > Instead of falling back to 1/25 (PAL) or 1/30 (NTSC). > > Signed-off-by: Ismael Luceno <ismael.luceno@corp.bluecherry.net> > > # Please enter the commit message for your changes. Lines starting > # with '#' will be ignored, and an empty message aborts the commit. > # On branch media > # Changes to be committed: > # (use "git reset HEAD <file>..." to unstage) > # > # modified: drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c > # > # Untracked files: > # (use "git add <file>..." to include in what will be committed) > # > # buildtest/ > --- > drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 38 +++++++++------------- > 1 file changed, 15 insertions(+), 23 deletions(-) > > diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c > index 6c7d20f..6965307 100644 > --- a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c > +++ b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c > @@ -975,12 +975,11 @@ static int solo_g_parm(struct file *file, void *priv, > struct v4l2_streamparm *sp) > { > struct solo_enc_dev *solo_enc = video_drvdata(file); > - struct solo_dev *solo_dev = solo_enc->solo_dev; > struct v4l2_captureparm *cp = &sp->parm.capture; > > cp->capability = V4L2_CAP_TIMEPERFRAME; > cp->timeperframe.numerator = solo_enc->interval; > - cp->timeperframe.denominator = solo_dev->fps; > + cp->timeperframe.denominator = solo_enc->solo_dev->fps; > cp->capturemode = 0; > /* XXX: Shouldn't we be able to get/set this from videobuf? */ > cp->readbuffers = 2; > @@ -988,36 +987,29 @@ static int solo_g_parm(struct file *file, void *priv, > return 0; > } > > +static inline int calc_interval(u8 fps, u32 n, u32 d) > +{ > + if (unlikely(!n || !d)) > + return 1; > + if (likely(d == fps)) > + return n; Don't use likely/unlikely in code that is rarely executed. It just makes it harder to read. These optimizations are only useful in tight loops. > + n *= fps; > + return min(15U, n / d + (n % d >= (fps >> 1))); > +} > + > static int solo_s_parm(struct file *file, void *priv, > struct v4l2_streamparm *sp) > { > struct solo_enc_dev *solo_enc = video_drvdata(file); > - struct solo_dev *solo_dev = solo_enc->solo_dev; > - struct v4l2_captureparm *cp = &sp->parm.capture; > + struct v4l2_fract *t = &sp->parm.capture.timeperframe; > + u8 fps = solo_enc->solo_dev->fps; > > if (vb2_is_streaming(&solo_enc->vidq)) > return -EBUSY; > > - if ((cp->timeperframe.numerator == 0) || > - (cp->timeperframe.denominator == 0)) { > - /* reset framerate */ > - cp->timeperframe.numerator = 1; > - cp->timeperframe.denominator = solo_dev->fps; > - } > - > - if (cp->timeperframe.denominator != solo_dev->fps) > - cp->timeperframe.denominator = solo_dev->fps; > - > - if (cp->timeperframe.numerator > 15) > - cp->timeperframe.numerator = 15; > - > - solo_enc->interval = cp->timeperframe.numerator; > - > - cp->capability = V4L2_CAP_TIMEPERFRAME; > - cp->readbuffers = 2; > - > + solo_enc->interval = calc_interval(fps, t->numerator, t->denominator); > solo_update_mode(solo_enc); > - return 0; > + return solo_g_parm(file, priv, sp); > } > > static long solo_enc_default(struct file *file, void *fh, > If you post a new version today with that small fix, then I can still merge it for 3.10 tomorrow. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c index 6c7d20f..6965307 100644 --- a/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c +++ b/drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c @@ -975,12 +975,11 @@ static int solo_g_parm(struct file *file, void *priv, struct v4l2_streamparm *sp) { struct solo_enc_dev *solo_enc = video_drvdata(file); - struct solo_dev *solo_dev = solo_enc->solo_dev; struct v4l2_captureparm *cp = &sp->parm.capture; cp->capability = V4L2_CAP_TIMEPERFRAME; cp->timeperframe.numerator = solo_enc->interval; - cp->timeperframe.denominator = solo_dev->fps; + cp->timeperframe.denominator = solo_enc->solo_dev->fps; cp->capturemode = 0; /* XXX: Shouldn't we be able to get/set this from videobuf? */ cp->readbuffers = 2; @@ -988,36 +987,29 @@ static int solo_g_parm(struct file *file, void *priv, return 0; } +static inline int calc_interval(u8 fps, u32 n, u32 d) +{ + if (unlikely(!n || !d)) + return 1; + if (likely(d == fps)) + return n; + n *= fps; + return min(15U, n / d + (n % d >= (fps >> 1))); +} + static int solo_s_parm(struct file *file, void *priv, struct v4l2_streamparm *sp) { struct solo_enc_dev *solo_enc = video_drvdata(file); - struct solo_dev *solo_dev = solo_enc->solo_dev; - struct v4l2_captureparm *cp = &sp->parm.capture; + struct v4l2_fract *t = &sp->parm.capture.timeperframe; + u8 fps = solo_enc->solo_dev->fps; if (vb2_is_streaming(&solo_enc->vidq)) return -EBUSY; - if ((cp->timeperframe.numerator == 0) || - (cp->timeperframe.denominator == 0)) { - /* reset framerate */ - cp->timeperframe.numerator = 1; - cp->timeperframe.denominator = solo_dev->fps; - } - - if (cp->timeperframe.denominator != solo_dev->fps) - cp->timeperframe.denominator = solo_dev->fps; - - if (cp->timeperframe.numerator > 15) - cp->timeperframe.numerator = 15; - - solo_enc->interval = cp->timeperframe.numerator; - - cp->capability = V4L2_CAP_TIMEPERFRAME; - cp->readbuffers = 2; - + solo_enc->interval = calc_interval(fps, t->numerator, t->denominator); solo_update_mode(solo_enc); - return 0; + return solo_g_parm(file, priv, sp); } static long solo_enc_default(struct file *file, void *fh,
Instead of falling back to 1/25 (PAL) or 1/30 (NTSC). Signed-off-by: Ismael Luceno <ismael.luceno@corp.bluecherry.net> # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # On branch media # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # buildtest/ --- drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 38 +++++++++------------- 1 file changed, 15 insertions(+), 23 deletions(-)