summaryrefslogtreecommitdiffstats
path: root/libavdevice
Commit message (Collapse)AuthorAgeFilesLines
* v4l2: try to fix build on BSDMichael Niedermayer2013-02-181-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add yvu410 as a supported v4l2 input format.Carl Eugen Hoyos2013-02-171-0/+3
|
* Add gray16 as a supported v4l2 input format.Carl Eugen Hoyos2013-02-171-0/+1
|
* dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.rogerdpack2013-02-151-3/+3
| | | | | | Also cleanup exported symbols Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/v4l2: fix error logic when enumerating standardsStefano Sabatini2013-02-101-2/+5
| | | | | | | Set ret to 0 before enumerating standards in v4l2_set_parameters(), avoid use of uninitialized variable. Regression introduced in 60950adc18fe145a235211e75da68ab07123fcaa.
* lavd/v4l2: implement consistent error handlingStefano Sabatini2013-02-101-86/+68
| | | | | In particular, avoid use of non-thread-safe strerror(), and store errno before calling av_log().
* dshow: allow for more codec ID'srogerdpack2013-01-161-15/+4
| | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* dshow: better error reportingrogerdpack2013-01-161-1/+1
| | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* dshow: fix log messagerogerdpack2013-01-161-2/+2
| | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* Merge remote-tracking branch 'origin/master' into combinedrogerdpack2013-01-153-91/+133
|\
| * lavd/alsa: simplify reordering functions definition.Nicolas George2013-02-021-46/+27
| |
| * lavd/v4l2: read the correct time per frame from devices that support a standardGiorgio Vazzana2013-01-311-44/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generally speaking, there are two types of v4l2 devices [1]: 1) devices that support a standard, like PAL or NTFS (tv cards, for example). For this class of devices the framerate is fixed by the standard (for example PAL uses 25 fps) and the v4l2 driver cannot usually negotiate a different framerate (unless it can skip frames on the driver side, to save I/O bandwidth). 2) devices for which the notion of standard does not make sense (webcams, for example). For these devices it is usually possibile to request a desidered framerate. In either case, the desidered frame rate can be requested when the VIDIOC_G_PARM ioctl returns the V4L2_CAP_TIMEPERFRAME flag in the capability field. Currently the code does not check for V4L2_CAP_TIMEPERFRAME and supports only the second category of devices, returning a time per frame of 0/0 for devices in the first group that do not permit to negotiate the framerate. This patch adds support to read the correct framerate in all cases. [1] http://linuxtv.org/downloads/v4l-dvb-apis/standard.html Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
| * lavd/v4l2: add list_standards optionGiorgio Vazzana2013-01-312-1/+34
| | | | | | | | | | | | | | Since the user is expected to choose the standard by name (with -standard option), add the possibility to list all the supported standards. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | hdyc colrogerdpack2013-01-151-0/+4
| | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | dshow: use standardized raw pixel format lookuprogerdpack2013-01-151-7/+2
|/ | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* lavd/v4l2: use avcodec_find_decoder in list_formatsStephan Hilb2013-01-281-1/+1
| | | | | | | | Because libavdevice/v4l2 is a demuxer, it makes sense to look for decoders instead of encoders when listing the formats supported by the device. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavd/v4l2: select input immediately after opening the deviceGiorgio Vazzana2013-01-271-17/+20
| | | | | | | | | | | | After opening the device, the first thing we should do is selecting the input. This is because the image formats (VIDIOC_ENUM_FMT ioctl) and the standards (VIDIOC_ENUMSTD ioctl) supported may depend on the selected input ([1] and [2]). [1] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enum-fmt.html [2] http://linuxtv.org/downloads/v4l-dvb-apis/vidioc-enumstd.html Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavd/v4l2: sanitize logic of device_try_init(), so that it properly signal ↵Stefano Sabatini2013-01-271-30/+39
| | | | | | | | | errors Make device_try_init() return an error value, and allow to properly report errors which are not due to a wrong pixel/codec configuration. In particular, report intelligible feedback in case of busy device.
* Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'Michael Niedermayer2013-01-181-0/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '80ac87c13dc8c6c063e26a464c5c542357c0583f': lavc: support ZenoXVID custom tag libcdio: support recent cdio-paranoia float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window theora: Skip zero-sized headers Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libcdio: support recent cdio-paranoiaLuca Barbato2013-01-171-0/+7
| | | | | | | | | | Upstream decided to split the paranoia interface and move the headers accordingly.
* | lavd/v4l2: init return value.Nicolas George2013-01-161-1/+1
| | | | | | | | Fix a warning and random failures.
* | lavd/v4l2: update broken link to v4l2 video capture exampleStephan Hilb2013-01-161-1/+1
| | | | | | | | Reviewed-by: Stefano Sabatini
* | lavd/v4l2: improve debug messageStephan Hilb2013-01-161-1/+2
| | | | | | | | Reviewed-by: Stefano Sabatini
* | lavd/v4l2: apply grammar/consistency fixes to options help fieldsStefano Sabatini2013-01-151-15/+18
| |
* | lavd/v4l2: return meaningful error code from device_init()Stefano Sabatini2013-01-151-2/+3
| | | | | | | | In particular, propagate errno value in case of device init failure.
* | lavd/v4l2: fix misc messagesStefano Sabatini2013-01-151-4/+4
| |
* | lavd/v4l2: extend error/debug feedback in case of invalid codec/pix_fmtStefano Sabatini2013-01-151-1/+7
| |
* | Merge commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1'Michael Niedermayer2013-01-141-6/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '90cfc084e3e6d37ab88fc96a95f0401d8e8b4cd1': avpacket: free side data in av_free_packet(). v4l2: do not assert on a value received from outside of Libav v4l2: set the average framerate instead of codec timebase. Conflicts: libavcodec/avpacket.c libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v4l2: do not assert on a value received from outside of LibavAnton Khirnov2013-01-131-1/+6
| |
| * v4l2: set the average framerate instead of codec timebase.Anton Khirnov2013-01-131-4/+4
| | | | | | | | Codec timebase is supposed to be set by decoders only.
* | Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'Michael Niedermayer2013-01-141-21/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '246da0b13551b1f80f067e4f258e5bd691f5ab33': v4l2: avoid pointless indirection. vdpau: Add VC-1 decoding via hwaccel infrastructure vdpau: Add H.264 decoding via hwaccel infrastructure Conflicts: configure libavcodec/Makefile libavcodec/version.h libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * v4l2: avoid pointless indirection.Anton Khirnov2013-01-131-22/+13
| | | | | | | | | | v4l2_read_header() does no cleanup, so it can return directly, without any need for goto.
* | Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'Michael Niedermayer2013-01-041-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8': aviobuf: Partial support for reading in read/write contexts build: Avoid detecting bogus components named 'x' Conflicts: libavcodec/allcodecs.c libavdevice/alldevices.c libavformat/allformats.c libavformat/aviobuf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Avoid detecting bogus components named 'x'Clément Bœsch2013-01-031-3/+1
| | | | | | | | | | | | | | | | | | | | The function find_things() in configure is confused by component registration calls as part of multiline macros defining combined component registration. Coalesce those macros into one line to work around the issue. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge back some registering macros in all*.c.Clément Bœsch2012-12-301-3/+2
| | | | | | | | | | | | | | This breaks the sed in configure:find_things(). Fixes regression from c73c87b. Fixes Ticket2079. Found-by: jamal
* | bktr: fix warning: missing braces around initializerMichael Niedermayer2012-12-291-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-291-27/+37
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: Prettyprint codec/format/filter registration files Conflicts: libavcodec/allcodecs.c libavdevice/alldevices.c libavfilter/allfilters.c libavformat/allformats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Prettyprint codec/format/filter registration filesDiego Biurrun2012-12-281-20/+30
| |
| * miscellaneous typo fixesDiego Biurrun2012-12-211-1/+1
| |
* | Support H264 over video4linux2.Carl Eugen Hoyos2012-12-211-0/+3
| | | | | | | | Tested-by: Val Malykh
* | dshow: call CoUninitialize() on dshow_read_close()Ramiro Polla2012-12-171-6/+7
| | | | | | | | | | | | Every call to CoInitialize should have a matching CoUnititalize. Based on patch by Don Moir <donmoir@comcast.net>.
* | dshow: handle events in graphRamiro Polla2012-12-172-11/+70
| | | | | | | | | | | | | | | | Handling DirectShow events prevents infinite loops when there is an error in the graph, such as a device being disconnected. This makes it possible for dshow to return an error to the caller and run the cleanup code. Based on patch by Don Moir <donmoir@comcast.net>.
* | lavd/dshow: rename dshow class namerogerdpack2012-12-151-1/+1
| | | | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | dshow: fix return code when opening deviceRamiro Polla2012-12-081-10/+8
| | | | | | | | | | | | | | | | | | Successfully opening a device altered the ret variable, making the function not cleanup properly and return an incorrect value for errors that happened afterwards. Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/lavfi: fix float.h include.Clément Bœsch2012-12-061-1/+1
| | | | | | | | float.h is a system header.
* | Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer2012-12-053-7/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove pointless #undefs of previously forbidden functions.Anton Khirnov2012-12-043-7/+0
| |
* | lavu/opt: allow to set sample and pixel format with av_opt_set_int()Stefano Sabatini2012-12-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | This change requires the user to specify min and max value, and makes possible to prevent the user to set AV_{SAMPLE,PIX}_FMT_NONE if forbidden. Add required ifdeffery in case of mixed libraries, when libavutil is updated but not the other libraries. This is a followup of 08d0969c1402ccec4dce44bd430128fb59d7b790.
* | lavu/opt: change the way default pixel and sample format value is setStefano Sabatini2012-11-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the i64 field rather than the string value. Using a string to set a default sample/pixel format is weird, also the new interface is more consistent with the rest of the API. This is technically an API break, but hopefully there are no applications using this feature outside of FFmpeg. In order to save backward compatibility with mixed libraries in case libavutil is updated but not the other libraries, some ifdeffery hacks are added. Note that the version check is only performed when class->version != 0, since if it is not defined then we assume that no version was defined and the class is not affected by the change. We will luckily get rid of the hack at the next major bump.
* | dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusionsAlexander Strasser2012-11-163-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Move the NO_DSHOW_STRSAFE macro definition in front of the dshow.h system header inclusion. This excludes the usage of the STRSAFE functions consistently. Further background on this can be found in the commit message of revision 05ee0db1 where the #define was initially introduced. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
OpenPOWER on IntegriCloud