From e60068baeb576f34a542c8cad75d5604e9c5a2a9 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Fri, 3 Jun 2011 10:39:54 +0200
Subject: [PATCH] v4l2: prefer "framerate_q" over "fps" in
v4l2_set_parameters()
The variable is used for containing the parsed value of framerate,
using a lexically consistent name eases readability/understanding.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
libavdevice/v4l2.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 2553bca48a7..b024c48d2ed 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -455,11 +455,11 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
struct v4l2_streamparm streamparm = { 0 };
struct v4l2_fract *tpf = &streamparm.parm.capture.timeperframe;
int i, ret;
- AVRational fps;
+ AVRational framerate_q;
streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if (s->framerate && (ret = av_parse_video_rate(&fps, s->framerate)) < 0) {
+ if (s->framerate && (ret = av_parse_video_rate(&framerate_q, s->framerate)) < 0) {
av_log(s1, AV_LOG_ERROR, "Couldn't parse framerate.\n");
return ret;
}
@@ -467,7 +467,7 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
if (ap->channel > 0)
s->channel = ap->channel;
if (ap->time_base.num)
- fps = (AVRational){ap->time_base.den, ap->time_base.num};
+ framerate_q = (AVRational){ap->time_base.den, ap->time_base.num};
#endif
/* set tv video input */
@@ -520,23 +520,23 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
}
}
- if (fps.num && fps.den) {
+ if (framerate_q.num && framerate_q.den) {
av_log(s1, AV_LOG_DEBUG, "Setting time per frame to %d/%d\n",
- fps.den, fps.num);
- tpf->numerator = fps.den;
- tpf->denominator = fps.num;
+ framerate_q.den, framerate_q.num);
+ tpf->numerator = framerate_q.den;
+ tpf->denominator = framerate_q.num;
if (ioctl(s->fd, VIDIOC_S_PARM, &streamparm) != 0) {
av_log(s1, AV_LOG_ERROR,
"ioctl set time per frame(%d/%d) failed\n",
- fps.den, fps.num);
+ framerate_q.den, framerate_q.num);
return AVERROR(EIO);
}
- if (fps.num != tpf->denominator ||
- fps.den != tpf->numerator) {
+ if (framerate_q.num != tpf->denominator ||
+ framerate_q.den != tpf->numerator) {
av_log(s1, AV_LOG_INFO,
"The driver changed the time per frame from %d/%d to %d/%d\n",
- fps.den, fps.num,
+ framerate_q.den, framerate_q.num,
tpf->numerator, tpf->denominator);
}
} else {
--
GitLab