virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
64,072 Commits 37 Branches 400 Tags 462 MiB
e7fc5d53a0
Commit Graph

871 Commits

Author SHA1 Message Date
sfan5
ffe6ecc418 lavd/avfoundation: Support user selected pixel formats and pixel format autoselection. 
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-12 21:31:25 +02:00
Michael Niedermayer
3a10bf93b5 avdevice/lavfi: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-07 15:04:50 +02:00
Lou Logan
88f2586adb fix various typos 
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-03 10:58:19 -08:00
Michael Niedermayer
124c94a1c8 avdevice/v4l2: Use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-22 15:08:12 +02:00
Lukasz Marek
51bad41a13 lavd/jack_audio: use av_fifo_alloc_array 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-20 00:00:44 +02:00
Olivier Langlois
0a15067047 lavd: Use av_gettime_relative() 
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.

Since v4l2 is compiled only on Linux where av_gettime_relative()
is monotonic, a small wrapper function av_gettime_monotonic() is used
(should be inlined the compiler) to put emphasis on that fact.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-18 16:10:12 +02:00
Michael Niedermayer
3d7218d932 Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
  build: handle library dependencies in configure

Conflicts:
	common.mak
	configure
	libavdevice/Makefile
	libavfilter/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-13 22:40:32 +02:00
Janne Grunau
449511740f build: handle library dependencies in configure 
Instead of setting FFLIBS in each library Makefile configure
exports FFLIBS-$library in config.mak.
 2014-05-13 20:02:01 +02:00
Lukasz Marek
75a19f5eec lavd/jack_audio: use av_fifo_freep 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-07 23:39:47 +02:00
Lukasz Marek
fa4f7b17bc lavd/xv: reident after previous commits 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-02 18:04:05 +02:00
Lukasz Marek
db4b03146c lavd/opengl_enc: fix window size correction code 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-02 18:04:05 +02:00
Lukasz Marek
45601854b1 lavd/opengl_enc: add window size param 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-02 18:03:52 +02:00
Lukasz Marek
41e4c6d8c5 lavd/opengl_enc: use flag to mark inited context 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-05-02 17:46:37 +02:00
Lukasz Marek
8ff72924cf lavd/opengl_enc: fix pixel data alignment 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-30 22:03:32 +02:00
Lukasz Marek
5bef4878d3 lavd/pulse_audio_enc: respect minreq while checking buffer fullness 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:36:14 +02:00
Lukasz Marek
f817d55049 lavd/pulse_audio_enc: signal that buffer is still writable after write 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:36:06 +02:00
Lukasz Marek
a1e5be5c1a lavd/pulse_audio_enc: add pointer checks 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Lukasz Marek
954a8f4483 lavd/pulse_audio_enc: add more buffer attributes 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Lukasz Marek
e2ebaa0933 lavd/fbdev_dec: implement fbdev_get_device_list callback 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Lukasz Marek
279ff8d2f6 lavd/fbdev_enc: move list device code to fbdev_common 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Lukasz Marek
3050e53f2b lavd/fbdev_enc: remove redundant assignments 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-30 00:35:42 +02:00
Michael Niedermayer
68c3e6025f Fix convertion typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-29 00:09:08 +02:00
Lukasz Marek
4930e529bf lavd/fbdev_enc: fix not closed handles 
Fixes CID 1206651

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 16:36:29 +02:00
Michael Niedermayer
31f2357fd0 avdevice/qtkit: fix include 
Fixes: Ticket 3588

Found-by: jeremyhu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-24 05:12:07 +02:00
Michael Niedermayer
0bfb1e9238 avdevice/jack_audio: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-23 21:13:31 +02:00
Reimar Döffinger
8cbf0827e1 Various small spelling fixes. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-22 20:44:31 +02:00
Lukasz Marek
de705e52d4 lavd/xv: implement repaint message 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-19 02:18:45 +02:00
Lukasz Marek
9fcdfac894 lavd/xv: add window id param 
Device is able to use existing window, that can be a
part of existing GUI - instead of newly created one.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-19 02:18:45 +02:00
Lukasz Marek
5053897b6a lavd/xv: keep aspect ratio 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-19 02:18:45 +02:00
Michael Niedermayer
a614f892a6 Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  lavd/pulse_audio_enc: implement pause messages
  lavd/pulse_audio_enc: implement volume messages
  lavd/avdevice: add volume messages
  lavd/pulse_audio_enc: add buffer fullness messages
  lavd/pulse_audio_enc: add nonblocking mode
  lavd/pulse_audio_enc: replace simple API with async API
  lavd/pulse_audio_enc: cosmetics
  lavd/pulse_audio_common: add context helper functions
  lavd/pulse_audio_common: rename variables and enums

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-18 04:57:23 +02:00
Lukasz Marek
35bf7a491e lavd/pulse_audio_enc: implement pause messages 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-18 02:15:56 +02:00
Lukasz Marek
eb9136a7d6 lavd/pulse_audio_enc: implement volume messages 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-18 02:15:56 +02:00
Lukasz Marek
4c0f36412a lavd/avdevice: add volume messages 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-18 02:15:56 +02:00
Lukasz Marek
cef1180329 lavd/pulse_audio_enc: add buffer fullness messages 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-18 02:15:50 +02:00
Lukasz Marek
bc31a57902 lavd/pulse_audio_enc: add nonblocking mode 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-18 01:42:18 +02:00
Lukasz Marek
eb9dee2d0d lavd/pulse_audio_enc: replace simple API with async API 
Async API allows to use full capabilites of PulseAudio.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-18 01:42:18 +02:00
Lukasz Marek
10627e7e10 lavd/pulse_audio_enc: cosmetics 2014-04-18 01:42:17 +02:00
Lukasz Marek
176046d2b5 lavd/pulse_audio_common: add context helper functions 
Functions allow to connect and disconnect from server.
Helpfull to implement utility functions with nested loops.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-18 01:42:17 +02:00
Lukasz Marek
24e5f5cd3e lavd/pulse_audio_common: rename variables and enums 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-18 01:42:17 +02:00
Matt Oliver
27f184ef40 Fix OpenGL device compilation with msvc gl.h 
Reveiwed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 18:05:40 +02:00
Lukasz Marek
88c4e5a049 lavd/avdevice: fix buildbreak when included to C++ code 
class is reserved keyword in C++ and compilator complains about that variable.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 04:59:35 +02:00
Lukasz Marek
defb87eef4 lavd/qtkit: add device category 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-12 19:50:09 +02:00
Lukasz Marek
afc898e7ce lavd/fbdev_enc: implement get_device_list 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-12 19:47:58 +02:00
Lukasz Marek
c1c3c3611e lavd: no default device unless explicitly set 
AVDeviceInfoList was allocated with first device set as default
even though there is no device after allocation.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-12 19:14:57 +02:00
Thilo Borgmann
d2417061ef Add AVFoundation input device. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-11 17:51:33 +02:00
Lukasz Marek
c02e3dca2d lavd: add control message enums 
Adds messages that allows to control (audio) buffer and play/pause state.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-04-11 15:37:56 +02:00
Lukasz Marek
6db42a2b6b lavd: add device capabilities API 
Provides API to query device capabilities.
Each device must implement callbacks to benefit from this API.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-04-11 15:37:43 +02:00
Reimar Döffinger
57d10a28f4 pulseaudio: move NULL check up before dereference. 
Fixes CID 1197068.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-04-06 19:38:51 +02:00
Calvin Walton
08909fb56b Add Win32 GDI-based screen grabbing 
Based on original code by Christophe Gisquet in 2010, updated to work
with current ffmpeg APIs.

Supports grabbing a single window or an area of the screen, including
support for multiple monitors (Windows does funky stuff with negative
coordinates here).

I've moved most of the configuration to AVOptions; the input file name
is now only the string "desktop", or "title=<windowname>" to select a
single window. The AVOptions are the same as x11grab where possible.

Code has been added to support a "show_region" mode, like x11grab, which
will draw a rectangle on the screen around the area being captured.

Instead of duplicating code for paletted image handling, I make use of
the GDI API's ability to output DIB (BMP) images, which can be run
through ffmpeg's existing BMP decoder.

Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-03 00:41:45 +02:00
Thilo Borgmann
4654774aaf lavd/qtkit: Support choosing the input device by index or by name. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-02 22:40:32 +02:00