aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/v4l2.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.Anton Khirnov2011-06-041-2/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-12/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.Anton Khirnov2011-06-021-1/+1
| |
| * v4l2: add a framerate private option.Anton Khirnov2011-06-021-12/+20
| |
* | v4l2: rewrite code iterating the supported standardsStefano Sabatini2011-05-301-9/+7
| | | | | | | | Simplify/clarify the code logic and error reporting.
* | v4l2: perform minor style fixesStefano Sabatini2011-05-301-3/+3
| |
* | v4l2: replace memset() with explicit struct initializationStefano Sabatini2011-05-301-16/+8
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: enable UAL syntax in asm.S v4l2: don't leak video standard string on error. swscale: Remove disabled code. avfilter: Surround function only used in debug mode by appropriate #ifdef. vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog(). build: remove BUILD_ROOT variable vp8: use av_clip_uintp2() where possible Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v4l2: don't leak video standard string on error.Anton Khirnov2011-05-291-1/+1
| |
* | Merge remote-tracking branch 'qatar/master' into masterMichael Niedermayer2011-05-291-3/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v4l2: add a pixel_format private option.Anton Khirnov2011-05-271-3/+15
| |
* | v4l2: create file @doxy from text in the copyright headerStefano Sabatini2011-05-281-8/+11
| |
* | v4l2: remove pointless empty linesStefano Sabatini2011-05-281-14/+0
| |
* | v4l2: set default standard to NULLStefano Sabatini2011-05-281-1/+1
| | | | | | | | | | Avoid a failure with the default value of "NTSC". Not all drivers support a standard.
* | v4l2: use OFFSET macro when setting optionsStefano Sabatini2011-05-281-2/+3
| | | | | | | | Improve readability.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-271-13/+33
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) ARM: disable ff_vector_fmul_vfp on VFPv3 systems ARM: check for VFPv3 swscale: Remove unused variables in x86 code. doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS. x86: Add appropriate ifdefs around certain AVX functions. cmdutils: use sws_freeContext() instead of av_freep(). swscale: delay allocation of formatConvBuffer(). swscale: fix build with --disable-swscale-alpha. movenc: Deprecate the global RTP hinting flag, use a private AVOption instead movenc: Add an AVClass for setting muxer specific options swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions. configure: report yasm/nasm presence properly tcp: make connect() timeout properly rawdec: factor video demuxer definitions into a macro. rtspdec: add initial_pause private option. lavf: deprecate AVFormatParameters.width/height. tty: add video_size private option. rawdec: add video_size private option. x11grab: add video_size private option. x11grab: factorize returning error codes. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v4l2: add video_size private option.Anton Khirnov2011-05-271-2/+16
| |
| * v4l2: factorize returning error codes.Anton Khirnov2011-05-271-11/+17
| | | | | | | | This will be useful in the following commit.
* | lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.hStefano Sabatini2011-05-271-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-261-20/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) doc: create separate section for audio encoders swscale: Remove orphaned, commented-out function declaration. swscale: Eliminate rgb24toyv12_c() duplication. Remove h263_msmpeg4 from MpegEncContext. APIchanges: Fill in git hash for fps_probe_size (30315a8) avformat: Add fpsprobesize as an AVOption. avoptions: Return explicitly NAN or {0,0} if the option isn't found rtmp: Reindent rtmp: Don't try to do av_malloc(0) tty: replace AVFormatParameters.sample_rate abuse with a private option. Fix end time of last chapter in compute_chapters_end ffmpeg: get rid of useless AVInputStream.nb_streams. ffmpeg: simplify managing input files and streams ffmpeg: purge redundant AVInputStream.index. lavf: deprecate AVFormatParameters.channel. libdc1394: add a private option for channel. dv1394: add a private option for channel. v4l2: reindent. v4l2: add a private option for channel. lavf: deprecate AVFormatParameters.standard. ... Conflicts: doc/APIchanges doc/encoders.texi ffmpeg.c libavdevice/alsa-audio.h libavformat/version.h libavutil/opt.c libswscale/rgb2rgb.h libswscale/rgb2rgb_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: deprecate AVFormatParameters.channel.Anton Khirnov2011-05-251-0/+2
| |
| * v4l2: reindent.Anton Khirnov2011-05-251-14/+14
| |
| * v4l2: add a private option for channel.Anton Khirnov2011-05-251-5/+8
| |
| * lavf: deprecate AVFormatParameters.standard.Anton Khirnov2011-05-251-0/+2
| |
| * v4l2: add a private option for video standard.Anton Khirnov2011-05-251-5/+28
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-261-1/+1
| | | | | | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* | Merge libavcore into libavutilReinhard Tartler2011-02-161-1/+1
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-281-1/+1
|/ | | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts. (cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca)
* Factorize common code in v4l2_set_parameters().Stefano Sabatini2011-01-051-14/+7
| | | | Originally committed as revision 26225 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In video4linux2, in the case the timebase value in ap is 0/0, read theStefano Sabatini2011-01-051-0/+13
| | | | | | | | | | 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
* In the video4linux2 output device, log an error description in case ofStefano Sabatini2011-01-041-1/+1
| | | | | | ioctl failure in mmap_release_buffer(). Originally committed as revision 26214 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow to set the frame rate in v4l2 devicesJosé Miguel Gonçalves2010-09-231-0/+27
| | | | | | Patch by José Miguel Gonçalves (jose DOT goncalves AT inov DOT pt) Originally committed as revision 25159 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: simplify layout of fmt_conversion_table, make it shorterStefano Sabatini2010-09-121-75/+16
| | | | | | and more readable. Originally committed as revision 25108 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: apply minor style fixes.Stefano Sabatini2010-09-111-14/+14
| | | | Originally committed as revision 25106 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use new imgutils.h API names, fix deprecation warnings.Stefano Sabatini2010-09-071-1/+1
| | | | Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a mapping for the V4L2_PIX_FMT_NV12 format to PIX_FMT_NV12 forPete Eberlein2010-08-111-0/+5
| | | | | | | video4linux2 devices. This is used by Sensoray Model 2253 cards. Patch by Pete Eberlein (pete AT sensoray DOT com) Originally committed as revision 24759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove use of the deprecated function avcodec_check_dimensions(), useStefano Sabatini2010-08-061-1/+2
| | | | | | av_check_image_size() instead. Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make device_open() store the VIDIOC_QUERYCAP ioctl errno, and in caseStefano Sabatini2010-05-011-4/+4
| | | | | | | of failure return the stored value rather than the current errno, which may be overwritten by a following call to close(). Originally committed as revision 23001 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check the return value of device_try_init() immediately after calling such aLuca Abeni2010-04-281-3/+2
| | | | | | | | function. Avoids the following warning: libavdevice/v4l2.c: In function ‘v4l2_read_header’: libavdevice/v4l2.c:586: warning: ‘codec_id’ may be used uninitialized in this function Originally committed as revision 22986 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix weird brace placement.Stefano Sabatini2010-04-271-2/+1
| | | | Originally committed as revision 22982 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reduce the verbosity of the v4l2 input deviceLuca Abeni2010-04-271-3/+3
| | | | Originally committed as revision 22980 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify some output messages in the v4l2 input deviceLuca Abeni2010-04-271-3/+2
| | | | Originally committed as revision 22979 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement v4l2 input size autodetection in v4l2_read_header().Stefano Sabatini2010-04-261-8/+18
| | | | | | | | | Move check on frame size after the device is opened and after device_try_init() is attempted. If the provided size value is 0x0, perform a VIDIOC_G_FMT ioctl() on the device, which sets size to the current settings. Originally committed as revision 22971 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Return meaningful error codes, rather than always -1.Stefano Sabatini2010-04-261-17/+17
| | | | Originally committed as revision 22966 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unnecessary width and height variables from v4l2_read_header().Stefano Sabatini2010-04-251-10/+6
| | | | Originally committed as revision 22963 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-1/+1
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.Jai Menon2010-01-281-4/+4
| | | | Originally committed as revision 21511 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define device_try_init() as static in libavdevice/v4l2.c.Reinhard Tartler2010-01-031-5/+5
| | | | | | Patch by Reinhard Tartler (siretart AT tauware DOT de). Originally committed as revision 21004 to svn://svn.ffmpeg.org/ffmpeg/trunk