virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

v4l2: add a framerate private option.

Browse Source
This commit is contained in:
Anton Khirnov 2011-05-24 21:16:47 +02:00
parent 121ef2e26d
commit c21324eeb6
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavdevice/v4l2.c
View File

@ -73,6 +73,7 @@ struct video_data {
int channel; int channel;
char *video_size; /**< String describing video size, set by a private option. */ char *video_size; /**< String describing video size, set by a private option. */
char *pixel_format; /**< Set by a private option. */ char *pixel_format; /**< Set by a private option. */
char *framerate; /**< Set by a private option. */
}; };
struct buff_data { struct buff_data {
@ -453,13 +454,20 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
struct v4l2_standard standard; struct v4l2_standard standard;
struct v4l2_streamparm streamparm = { 0 }; struct v4l2_streamparm streamparm = { 0 };
struct v4l2_fract *tpf = &streamparm.parm.capture.timeperframe; struct v4l2_fract *tpf = &streamparm.parm.capture.timeperframe;
int i; int i, ret;
AVRational fps;
streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (s->framerate && (ret = av_parse_video_rate(&fps, s->framerate)) < 0) {
av_log(s1, AV_LOG_ERROR, "Couldn't parse framerate.\n");
return ret;
}
#if FF_API_FORMAT_PARAMETERS #if FF_API_FORMAT_PARAMETERS
if (ap->channel > 0) if (ap->channel > 0)
s->channel = ap->channel; s->channel = ap->channel;
if (ap->time_base.num)
fps = (AVRational){ap->time_base.den, ap->time_base.num};
#endif #endif
/* set tv video input */ /* set tv video input */
@ -512,34 +520,32 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
} }
} }
if (ap->time_base.num && ap->time_base.den) { if (fps.num && fps.den) {
av_log(s1, AV_LOG_DEBUG, "Setting time per frame to %d/%d\n", av_log(s1, AV_LOG_DEBUG, "Setting time per frame to %d/%d\n",
ap->time_base.num, ap->time_base.den); fps.den, fps.num);
tpf->numerator = ap->time_base.num; tpf->numerator = fps.den;
tpf->denominator = ap->time_base.den; tpf->denominator = fps.num;
if (ioctl(s->fd, VIDIOC_S_PARM, &streamparm) != 0) { if (ioctl(s->fd, VIDIOC_S_PARM, &streamparm) != 0) {
av_log(s1, AV_LOG_ERROR, av_log(s1, AV_LOG_ERROR,
"ioctl set time per frame(%d/%d) failed\n", "ioctl set time per frame(%d/%d) failed\n",
ap->time_base.num, ap->time_base.den); fps.den, fps.num);
return AVERROR(EIO); return AVERROR(EIO);
} }
if (ap->time_base.den != tpf->denominator || if (fps.num != tpf->denominator ||
ap->time_base.num != tpf->numerator) { fps.den != tpf->numerator) {
av_log(s1, AV_LOG_INFO, av_log(s1, AV_LOG_INFO,
"The driver changed the time per frame from %d/%d to %d/%d\n", "The driver changed the time per frame from %d/%d to %d/%d\n",
ap->time_base.num, ap->time_base.den, fps.den, fps.num,
tpf->numerator, tpf->denominator); tpf->numerator, tpf->denominator);
} }
} else { } else {
/* if timebase value is not set in ap, read the timebase value from the driver */ /* if timebase value is not set, read the timebase value from the driver */
if (ioctl(s->fd, VIDIOC_G_PARM, &streamparm) != 0) { if (ioctl(s->fd, VIDIOC_G_PARM, &streamparm) != 0) {
av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_PARM): %s\n", strerror(errno)); av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_PARM): %s\n", strerror(errno));
return AVERROR(errno); return AVERROR(errno);
} }
} }
ap->time_base.num = tpf->numerator;
ap->time_base.den = tpf->denominator;
return 0; return 0;
} }
@ -681,6 +687,7 @@ out:
av_freep(&s->video_size); av_freep(&s->video_size);
av_freep(&s->pixel_format); av_freep(&s->pixel_format);
av_freep(&s->standard); av_freep(&s->standard);
av_freep(&s->framerate);
return res; return res;
} }
@ -731,6 +738,7 @@ static const AVOption options[] = {
{ "channel", "", offsetof(struct video_data, channel), FF_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { "channel", "", offsetof(struct video_data, channel), FF_OPT_TYPE_INT, {.dbl = 0 }, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
{ "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC }, { "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
{ "framerate", "", OFFSET(framerate), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
{ NULL }, { NULL },
}; };