virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
84,548 Commits 37 Branches 400 Tags 467 MiB
d84c2298e2
Commit Graph

1267 Commits

Author SHA1 Message Date
Clément Bœsch
b7336faa39 Merge commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f' 
* commit '3a165c187da7d74f46f6c1778294e8c5a3a7151f':
  v4l2: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 17:55:18 +01:00
Matthias Hunstock
b3a2adaac6 avdevice/decklink: new option 'format_code' to set video format by fourCC 
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-03-22 02:07:50 +01:00
Matthias Hunstock
607bffbed2 avdevice/decklink: add format_code of display mode to list_format output 
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-03-22 02:07:47 +01:00
Clément Bœsch
b2c5f5054b Merge commit '93fed46a92bab8be176d3e67be4354189a8dbe7f' 
* commit '93fed46a92bab8be176d3e67be4354189a8dbe7f':
  timefilter: test: Drop some disabled debug cruft

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-19 16:08:27 +01:00
Clément Bœsch
f6d61eb6f9 Merge commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688' 
* commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688':
  x11grab: Rename internal component to "xcbgrab"

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 22:19:56 +01:00
Clément Bœsch
4a9c5f6bc5 Merge commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c' 
* commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c':
  Remove the legacy X11 screen grabber

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 22:07:47 +01:00
Muhammad Faiz
776f289c0f avdevice/alldevices: make avdevice_register_all thread safe 
use ff_thread_once

Suggested-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
 2017-03-07 20:34:44 +07:00
Marton Balint
80b644c6ee avdevice/decklink_dec: remove AVFMT_RAWPICTURE 
It has no effect for input devices.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-26 22:47:33 +01:00
Marton Balint
418ce91507 avdevice/decklink_enc: convert AVFMT_RAWPICTURE to AV_CODEC_ID_WRAPPED_AVFRAME 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-26 22:47:33 +01:00
Marton Balint
48f8ad3290 avdevice/decklink_enc: add support to specify field order 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-26 22:47:33 +01:00
Marton Balint
e0eb0bdab9 avdevice/decklink_enc: convert to codecpar 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-26 22:47:33 +01:00
Carl Eugen Hoyos
6a22d2459d lavd/opengl_enc: Fix a typo. 2017-02-23 00:11:43 +01:00
Carl Eugen Hoyos
2ac381088d lavd/opengl_enc: Support BGR48. 2017-02-22 00:10:25 +01:00
Marton Balint
4556dad2b7 avdevice/iec61883: free packet on buffer allocation error 
Fixes Coverity CID 1396416.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2017-02-19 16:41:43 +01:00
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
Anton Khirnov
3a165c187d v4l2: convert to stdatomic 2016-10-02 19:34:57 +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
Josh de Kock
bc7399934d libdc1394: Distinguish between enumeration errors and no cameras found 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-09-15 17:22:38 +02: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
Diego Biurrun
93fed46a92 timefilter: test: Drop some disabled debug cruft 2016-08-17 12:16:42 +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
Diego Biurrun
5ed4644d6d x11grab: Rename internal component to "xcbgrab" 2016-07-29 19:03:10 +02:00
Diego Biurrun
4fef648d10 Remove the legacy X11 screen grabber 
The XCB screen grabber is a drop-in replacement and not under GPL.
 2016-07-29 19:03:10 +02: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