diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-05 14:15:11 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-05 14:15:11 +0000 |
| commit | 8621a37d9feff940be19e47344cc521adca1fca2 (patch) | |
| tree | 7fb9e80b32e6286ba6e85ddcbdb299016c354efd /libavdevice | |
| parent | 2d777bb7a20041ac0564ffef85bf40619af8ccd1 (diff) | |
| download | ffmpeg-8621a37d9feff940be19e47344cc521adca1fca2.tar.gz | |
In video4linux2, in the case the timebase value in ap is 0/0, read the
timebase value already set in the driver, and set it back in the codec
stream, rather than leaving the invalid value of 0/0.
In particular, fix ffmpeg grabbing timestamps when the timebase value
is not set through the CLI.
Originally committed as revision 26224 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/avdevice.h | 2 | ||||
| -rw-r--r-- | libavdevice/v4l2.c | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 9508f2277f..5c3739fdcd 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -23,7 +23,7 @@ #define LIBAVDEVICE_VERSION_MAJOR 52 #define LIBAVDEVICE_VERSION_MINOR 2 -#define LIBAVDEVICE_VERSION_MICRO 2 +#define LIBAVDEVICE_VERSION_MICRO 3 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \ LIBAVDEVICE_VERSION_MINOR, \ diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 54259284af..26f879a509 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -514,6 +514,19 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) ap->time_base.num = tpf->numerator; ap->time_base.den = tpf->denominator; } + } else { + /* if timebase value is not set in ap, read the timebase value + * from the driver and set it in ap */ + struct v4l2_streamparm streamparm = { 0 }; + struct v4l2_fract *tpf = &streamparm.parm.capture.timeperframe; + + streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + if (ioctl(s->fd, VIDIOC_G_PARM, &streamparm) != 0) { + av_log(s1, AV_LOG_ERROR, "ioctl(VIDIOC_G_PARM): %s\n", strerror(errno)); + return AVERROR(errno); + } + ap->time_base.num = tpf->numerator; + ap->time_base.den = tpf->denominator; } return 0; |