generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
49,453 Commits 24 Branches 241 Tags 173 MiB
91f359292a
Commit Graph

156 Commits

Author SHA1 Message Date
Anton Khirnov
a02fd06ab7 v4l2: add a private option for channel. 2011-05-25 15:55:47 +02:00
Anton Khirnov
fc68a8f703 lavf: deprecate AVFormatParameters.standard. 2011-05-25 15:55:47 +02:00
Anton Khirnov
b3da269211 v4l2: add a private option for video standard. 2011-05-25 15:55:46 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil 
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>
 2011-02-15 16:18:21 +01:00
Diego Elio Pettenò
66355be3c3 Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
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 c6610a216e)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
c6610a216e Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice. 
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.
 2011-01-26 22:10:09 +00:00
Stefano Sabatini
5d3d238f82 Factorize common code in v4l2_set_parameters(). 
Originally committed as revision 26225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 14:15:13 +00:00
Stefano Sabatini
8621a37d9f 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
 2011-01-05 14:15:11 +00:00
Stefano Sabatini
bd7d9e45a4 In the video4linux2 output device, log an error description in case of 
ioctl failure in mmap_release_buffer().

Originally committed as revision 26214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 18:18:01 +00:00
José Miguel Gonçalves
70f77361d8 Allow to set the frame rate in v4l2 devices 
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
 2010-09-23 09:16:05 +00:00
Stefano Sabatini
0105889358 Cosmetics: simplify layout of fmt_conversion_table, make it shorter 
and more readable.

Originally committed as revision 25108 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-12 19:44:45 +00:00
Stefano Sabatini
680861ca73 Cosmetics: apply minor style fixes. 
Originally committed as revision 25106 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-11 16:44:10 +00:00
Stefano Sabatini
e16f217ceb Use new imgutils.h API names, fix deprecation warnings. 
Originally committed as revision 25058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-07 19:15:29 +00:00
Pete Eberlein
b4f81b7429 Add a mapping for the V4L2_PIX_FMT_NV12 format to PIX_FMT_NV12 for 
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
 2010-08-11 07:34:33 +00:00
Stefano Sabatini
6ce9b4310c Remove use of the deprecated function avcodec_check_dimensions(), use 
av_check_image_size() instead.

Originally committed as revision 24711 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-06 09:37:04 +00:00
Stefano Sabatini
50f852186f Make device_open() store the VIDIOC_QUERYCAP ioctl errno, and in case 
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
 2010-05-01 08:24:24 +00:00
Luca Abeni
b01dba14f3 Check the return value of device_try_init() immediately after calling such a 
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
 2010-04-28 08:02:52 +00:00
Stefano Sabatini
6e25b78001 Fix weird brace placement. 
Originally committed as revision 22982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-27 22:45:27 +00:00
Luca Abeni
1ace15f58c Reduce the verbosity of the v4l2 input device 
Originally committed as revision 22980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-27 21:33:56 +00:00
Luca Abeni
4f54d924bc Simplify some output messages in the v4l2 input device 
Originally committed as revision 22979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-27 21:32:11 +00:00
Stefano Sabatini
932d775fa2 Implement v4l2 input size autodetection in v4l2_read_header(). 
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
 2010-04-26 22:07:15 +00:00
Stefano Sabatini
c57a8fefd9 Return meaningful error codes, rather than always -1. 
Originally committed as revision 22966 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-26 19:40:15 +00:00
Stefano Sabatini
18225025ff Remove unnecessary width and height variables from v4l2_read_header(). 
Originally committed as revision 22963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-25 18:47:40 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Jai Menon
90d0379f5e Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field. 
Originally committed as revision 21511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-28 15:45:21 +00:00
Reinhard Tartler
8040c3b250 Define device_try_init() as static in libavdevice/v4l2.c. 
Patch by Reinhard Tartler (siretart AT tauware DOT de).

Originally committed as revision 21004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-03 10:43:36 +00:00
Luca Abeni
3db77ccf38 Support compressed formats in the V4L2 input device. 
Patch by klchxbec AT freenet DOT de.

Originally committed as revision 20858 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 10:34:31 +00:00
Luca Abeni
9eb6e9d9d3 Add support for V4L2 compressed formats in the table used for converting 
between V4L2 formats and ffmpeg's formats/codecs.
Patch by klchxbec AT freenet DOT de.

Originally committed as revision 20857 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 10:33:24 +00:00
Luca Abeni
9202218e5d Use the correct type for the V4L2 format. 
Originally committed as revision 20856 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 10:31:29 +00:00
Luca Abeni
158aa9f2db Return pkt->size in v4l2_read_packet(). 
mmap_read_frame() takes care of ensuring that the packet size
is correct.

Originally committed as revision 20855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-14 10:30:37 +00:00
Luca Abeni
1c787b1043 Cast a __u64 variable to uint64_t so that it can be printed without warnings 
Originally committed as revision 17325 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 14:32:09 +00:00
Luca Abeni
5449a787c9 If AVPacket->data == NULL, the packet does not contain any buffer to 
be freed.
This fixes a double free on exit.

Originally committed as revision 16857 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 12:41:44 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Luca Abeni
e7b987dc2f Remove the frame rate from struct video_data, and allow using a variable 
frame rate for video4linux2 input

Originally committed as revision 16464 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 13:34:29 +00:00
Stefano Sabatini
5d91e92853 Use avcodec_check_dimensions() for checking the frame size validity. 
The v4l.c check is moved after the eventual automatic size detection,
so the check in that case is performed on the new set values.

Originally committed as revision 16370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 14:41:19 +00:00
Stefano Sabatini
df2a3f2714 Use more descriptive long_names for Video4Linux input devices. 
Originally committed as revision 16322 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-26 11:23:50 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate 
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-21 21:40:24 +00:00
Jens Rosenboom
3d0d9a5e3b The v4l2 driver can silently change the pixel format in the 
VIDIOC_S_FMT ioctl(). In this case, device_init() should fail so that
a different pixel format is tried.
Patch by Jens Rosenboom (jens DOT rosenboom AT eu DOT panasonic DOT com)

Originally committed as revision 15660 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-21 07:59:41 +00:00
Brad
1b6e8b734c V4L2 support for OpenBSD, patch by Brad, brad comstyle com 
Originally committed as revision 15376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-21 22:47:52 +00:00
Jean Delvare
92d04e765e Add support for the RGB32 pixel format in video4linux2 devices 
Patch by Jean Delvare (khali AT linux-fr DOT org)

Originally committed as revision 15219 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-05 20:40:50 +00:00
Jean Delvare
97a290efcb Add support for the PIX_FMT_RGB555 and PIX_FMT_RGB565 pixel formats in 
video4linux2 devices.
Patch by Jean Delvare (khali AT linux-fr DOT org)

Originally committed as revision 15218 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-05 20:36:42 +00:00
Michael Niedermayer
e9d4b8a533 Workaround bug in types.h that has typedef __u64 under #ifndef __STRICT_ANSI__. 
Originally committed as revision 14852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 21:20:39 +00:00
Aurelien Jacobs
ea452b54f0 strcasecmp() requires #include <strings.h> 
Originally committed as revision 14728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-13 17:22:53 +00:00
Stefano Sabatini
3241ec1d6f Cosmetics: make a v4l2 error message consistent with r14647. 
Originally committed as revision 14664 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-08 18:14:21 +00:00
Stefano Sabatini
99423fa0ee Distinguish the error reporting for the cases of wrong size and wrong 
timebase in the video4linux2 v4l2_read_header() function.

Originally committed as revision 14647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 18:21:35 +00:00
Stefano Sabatini
deaab5fc32 Make v4l2_read_header() don't free a stream in case of failure when 
reading its header. The stream will be freed later in
av_open_input_stream(). Fix a segmentation fault due to a double free
on the same pointer.

Originally committed as revision 14247 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-15 20:45:42 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL. 
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-03 16:20:54 +00:00
Carl Eugen Hoyos
eacced45c4 Replace some occurrences of -1 with PIX_FMT_NONE. 
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-11 22:28:43 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Diego Biurrun
0e58bf670d Remove #ifdef HAVE_SYS_MMAN_H around sys/mman.h #include. 
Without the #include compilation fails.

Originally committed as revision 12568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-24 10:54:01 +00:00
Diego Biurrun
b00675499c Only #include sys/mman.h if configure set HAVE_SYS_MMAN_H. 
Originally committed as revision 12521 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-20 19:07:24 +00:00
Michel Bardiaux
48f7e1aeee Clarify the error message when video width, height, or framerate are not 
specified.
Patch by Michel Bardiaux (mbardiaux AT mediaxim DOT be)

Originally committed as revision 11551 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-17 16:27:26 +00:00
Luca Abeni
c721d803cb Introduce libavdevice 
Originally committed as revision 11077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-22 16:10:02 +00:00