virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
83,446 Commits 37 Branches 400 Tags 460 MiB
37de9ce713
Commit Graph

1248 Commits

Author SHA1 Message Date
Clément Bœsch
b9292a9698 Merge commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d' 
* commit '5d0f85f1b2469b60d0838330aabe5353fdd9ef1d':
  libdc1394: Fill in packet data directly

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-01-31 17:27:46 +01:00
Carl Eugen Hoyos
0b607228bf Cosmetics: Reindent after last commit. 2017-01-25 00:55:36 +01:00
Carl Eugen Hoyos
9d5141d1fb lavd/v4l2: Avoid setting frame_size to a negative value. 2017-01-25 00:54:10 +01:00
Nicolas George
063b1a42c6 lavd/lavfi: use buffersink accessors. 2017-01-12 14:06:16 +01:00
Marton Balint
a7946c8964 avdevice/decklink_enc: do not reference this after freeing it 
Fixes Coverity CID 1396863.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-12-27 01:11:59 +01:00
Marton Balint
89a1471a72 avdevice/decklink_dec: properly initialize no_video variable 
Fixes Coverity CID 1396859.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-12-27 01:11:59 +01:00
Hendrik Leppkes
d7d6f9c782 Merge commit '0b1bd1b2057d41fd0ccba7317911c484a50f9207' 
* commit '0b1bd1b2057d41fd0ccba7317911c484a50f9207':
  lavd: Drop unneeded av_init_packet()s

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-11-18 10:20:14 +01:00
Nicolas George
0bd1be65e8 lavd/xcbgrab: do not try to create refcounted packets. 
The framework will allocate a buffer and copy the data to it,
that takes time. But it avoids constently creating and
destroyng the shared memory segment, and that saves more time.

On my setup,
from ~200 to ~300 FPS at full screen (1920×1200),
from ~1400 to ~3300 at smaller size (640×480),
similar to legacy x11grab and confirmed by others.

Plus, shared memory segments are a scarce resource,
allocating potentially many is a bad idea.

Note: if the application were to drop all references to the
buffer before the next call to av_read_frame(), then passing
the shared memory segment as a refcounted buffer would be
even more efficient, but it is hard to guarantee, and it does
not happen with the ffmpeg command-line tool. Using a small
number of preallocated buffers and resorting to a copy when
the pool is exhausted would be a solution to get the better
of both worlds.
 2016-11-03 21:23:55 +01:00
Michael Niedermayer
1609935b6c Bump minor versions after 3.2 branchpoint to seperate release 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Michael Niedermayer
3f3025205f Bump minor versions for 3.2 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Marton Balint
dfc561a38e lavd/decklink_dec: fix indentation 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-10-21 20:24:12 +02:00
Marton Balint
2f3015c25a lavd/decklink_dec: add option to disable drawing bars on signal loss 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-10-21 20:24:12 +02:00
Marton Balint
fbf8ac7d2a lavd/openal: don't return zero sized packet if no samples are available 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-10-03 21:15:48 +02:00
Josh de Kock
21344991c0 lavd/sdl2: add sdl alias 
This commit also adds an sdl alias for the configure script.
 2016-09-25 18:08:06 +01:00
Josh de Kock
fbb1fcd4d0 lavd/sdl2: remove unused code 2016-09-25 18:08:06 +01:00
Carl Eugen Hoyos
159aa1275e lavd/sdl2: Fix 32bit rgb formats on little-endian hardware. 2016-09-24 18:56:40 +02:00
Carl Eugen Hoyos
1d92256d60 lavd/sdl2: Move unsupported formats SDL_PIXELFORMAT_xxx888 updwards. 
There is a paragraph for unsupported SDL formats.
 2016-09-24 18:35:15 +02:00
Josh de Kock
47ea6f5c9d lavd: drop SDL1 device and SDL1 support 
Signed-off-by: Josh de Kock <josh@itanimul.li>
 2016-09-24 16:52:40 +01:00
Lukasz Marek
645353829f lavd/opengl: use SDL2 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Josh de Kock <josh@itanimul.li>
 2016-09-24 16:50:40 +01:00
Josh de Kock
3877e3d8a8 lavd: Add SDL2 output device 
Acked-by: Michael Niedermayer
Signed-off-by: Josh de Kock <josh@itanimul.li>
 2016-09-24 16:50:40 +01:00
Roger Pack
18ce63a60e avdevice/dshow: satisfy alloc contract better 
prevent non-rgb24 crashes on windows 10 anniversary ed

Signed-off-by: Roger Pack <rogerpack2005@gmail.com>
 2016-08-20 12:06:50 +02:00
Matthias Hunstock
d8ee02a071 decklink: enhancement: format selection with AVRational v2 
When finding a video mode based on frame size and frame rate,
use AVRational methods instead of simple comparison. Add debug information.

Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-08-05 21:33:43 +02:00
Matthias Hunstock
8431a6e654 decklink: fix: set fps on video stream v2 
Provide the stream with the correct fps information when capturing.

Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-08-05 20:43:36 +02:00
Patrick Felt
e9659d1a0b decklink: Remove unneeded spaces in initializers 2016-08-02 22:46:28 -07:00
Timothy Gu
58c7bf789f doxygen: Standardize root-level modules 2016-08-02 22:15:25 -07:00
Patrick Felt
5469293758 cosmetics: Correct comments in decklink_dec 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2016-08-02 13:01:12 -07:00
Josh de Kock
c2fcf4fa0b avdev/jack: remove duplicated dispatch macros 
The macros were moved to compat/dispatch_semaphore/semaphore.h after a libav merge, and were never removed from jack.c
 2016-07-26 23:10:47 +01:00
Josh de Kock
384251daff lavd/libdc1394: distinguish between enumeration errors and no cameras found 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-07-25 19:39:13 +02:00
Vittorio Giovara
5d0f85f1b2 libdc1394: Fill in packet data directly 
Drop the packet embedded in the context.
 2016-07-20 17:13:10 +02:00
James Almer
d688f39dc4 cosmetics: fix some misspelled words 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-07-17 13:10:27 -03:00
Vittorio Giovara
0b1bd1b205 lavd: Drop unneeded av_init_packet()s 
The input packet is already unref'd by the calling function.
 2016-07-13 18:20:27 -04:00
Michael Niedermayer
c0cb53cd1f avdevice/decklink_common: Replace rare spelling of Succesfully by 500 times more common one 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-28 03:07:54 +02:00
Matthieu Bouron
0acc170aad Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24' 
* commit '535a742c2695a9e0c586b50d7fa76e318232ff24':
  build: Change structure of the linker version script templates

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
 2016-06-27 17:56:47 +02:00
Marton Balint
b18d6c5800 avdevice/decklink: fix mingw portability 
Fixes ticket #5669.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-27 02:12:07 +02:00
Marton Balint
cf0a05668b avdevice/decklink: add support for setting input packet timestamp source 
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-26 19:18:06 +02:00
Marton Balint
da89c6e37c avdevice/decklink: add support for audio and video input selection 
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-26 19:18:02 +02:00
Marton Balint
8f9fa49bd8 avdevice/decklink: add support for setting duplex mode 
This patch also makes BlackMagic drivers v10.6.1 a hard requirement.

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-26 19:17:56 +02:00
Marton Balint
e22760aafd avdevice/decklink: always free decklink resources on error 
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-26 19:17:52 +02:00
Marton Balint
38d75fe906 avdevice/decklink: factorize device finder function 
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-26 19:17:45 +02:00
Marton Balint
4ce0a77ec8 avdevice/decklink: remove unused itermode iterators 
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-26 19:17:40 +02:00
Marton Balint
1fc85d8511 avdevice/decklink: factorize cleanup function to common code 
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-26 19:17:37 +02:00
Marton Balint
340cea9f22 avdevice/decklink_dec: fix bitrate calculations 
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-06-26 19:17:29 +02:00
rogerdpack
bfbffbd7d8 dshow: avoid duplicate NULL check before free 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-23 03:18:16 +02:00
rogerdpack
9e907c040d dshow: don't add two instances of same device to graphs 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-23 03:18:16 +02:00
Clément Bœsch
a444a50510 Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f' 
* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
  Combine deprecation guards where appropriate

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 17:36:42 +02:00
Clément Bœsch
5d48e4eafa Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196' 
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
  tests: Move all test programs to a subdirectory

Merged-by: Clément Bœsch <clement@stupeflix.com>
 2016-06-22 13:44:34 +02:00
Clément Bœsch
a4403e49b9 Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376' 
* commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376':
  Reduce the scope of some variables

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:40:56 +02:00
Clément Bœsch
8df1dbd798 Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5' 
* commit '5afb94c817abffad030c6b94d7003dca8aace3d5':
  Mark read-only tables as static

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 22:09:35 +02:00
Clément Bœsch
8ef57a0d61 Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb' 
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes

Merged-by: Clément Bœsch <u@pkh.me>
 2016-06-21 21:55:34 +02:00
Niklas Söderlund
6fd4145a1e lavd/v4l2: allow devices not implementing VIDIOC_G_PARM 
Not all v4l2 devices implement the VIDIOC_G_PARM ioctl. This patch allow
ffmpeg to open such device and treat it the same as devices that do
implement the ioctl but returns that it do not implement the
V4L2_CAP_TIMEPERFRAME capability.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-06-16 16:27:35 +02:00