summaryrefslogtreecommitdiff
path: root/libavdevice
Commit message (Collapse)AuthorAgeFilesLines
...
* | lavd/v4l2: replace ioctl() with v4l2_ioctl()Giorgio Vazzana2013-03-281-2/+2
| | | | | | | | | | | | | | This is consistent with the rest of the file and makes listing of emulated formats possible when ffmpeg is compiled with libv4l2. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dshow_pin: dont return a value from a void functionMichael Niedermayer2013-03-251-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: honor previously selected input channelGiorgio Vazzana2013-03-231-8/+18
| | | | | | | | | | | | | | An input channel could have been previously set with another application, like v4l2-ctl, so if no input channel is specified use the previosly selected one. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/dshow: fix style and typo recently introduced.Clément Bœsch2013-03-191-3/+3
| |
* | libavdevice sdl: added window_fullscreen option to switch SDL output into ↵dronus2013-03-181-1/+4
| | | | | | | | fullscreen mode
* | sndio_dec: add missing #include for av_gettime()Paul B Mahol2013-03-171-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavd/v4l2: silence libv4l2 loggingGiorgio Vazzana2013-03-161-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/lavfi: upgrade to AVFrame.Nicolas George2013-03-151-21/+28
| | | | | | | | | | Fix a memory leak because the compat implementation of AV_BUFFERSINK_FLAG_PEEK is not identical to the previous one.
* | avdevice: bump majorMichael Niedermayer2013-03-141-2/+2
| | | | | | | | | | | | | | | | Our previous release (1.1) contained a version 54 libavdevice and this version here is not ABI compatible thus a bump is needed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bktr: add missing #include for av_gettime()Paul B Mahol2013-03-131-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Remove references to the "ff" variant of buffersink.Nicolas George2013-03-121-2/+2
| |
* | lavd/v4l2: fix bug in init_convert_timestamp()Giorgio Vazzana2013-03-121-2/+2
| | | | | | | | | | | | The current code returned a period=0, resulting in identical pts for all frames after time-filtering. This is because AV_TIME_BASE_Q={1, AV_TIME_BASE} and not {AV_TIME_BASE, 1}. With this patch the correct period in microseconds is computed.
* | Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'Michael Niedermayer2013-03-121-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111': Add the bumps and APIchanges entries for reference counted buffers changes. Conflicts: Changelog doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add the bumps and APIchanges entries for reference counted buffers changes.Anton Khirnov2013-03-081-2/+2
| |
* | avformat/avdevice: add missing time.h includesMichael Niedermayer2013-03-124-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: simplify codeGiorgio Vazzana2013-03-091-5/+2
| | | | | | | | | | | | | | struct buff_data contains a pointer to struct video_data, so passing the file descriptor again is redundant. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: correctly handle error conditions in mmap_read_frame()Giorgio Vazzana2013-03-091-5/+11
| | | | | | | | | | | | | | | | | | In particular: 1) save errno before it (possibly) gets overwritten by other calls 2) do not forget to enqueue the buffer again in case of error Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-081-72/+75
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-081-23/+67
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
* | v4l2: fix regression that caused ffmpeg to occasionally get stuckMichael Niedermayer2013-03-021-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: copy frames into normally allocated packets whenever there is ↵Giorgio Vazzana2013-03-021-23/+64
| | | | | | | | | | | | | | | | | | | | | | just one buffer left available This will avoid the possibility that we dequeue more buffers than we have obtained from the v4l2 driver. Fixes ticket #1570 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/lavfi: force probesize to cover at least 30 framesMichael Niedermayer2013-02-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that fps and other values are estimated correctly, the probesize also is intended to limit disk/protocol reads which does not apply to lavfi inputs at all. Fixes Ticket1051 Something similar could be usefull to other input devices Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
View Lorry Controller Status