8e2976860f
lavd/x11grab: reindent after last commit.
2014-07-17 18:28:58 +02:00
1d12df1ad7
lavd/x11grab: add an option to disable MIT-SHM.
...
With remote displays supporting the MIT-SHM extension,
the extension is detected and used, but attaching fails
asynchronously.
2014-07-17 18:12:15 +02:00
16c6795465
lavd/x11grab: check 32-bits color masks.
...
The X11 servers by VNC, at 32-bits depths, has the following masks:
R:0x000007ff G:0x003ff800 B:0xffc00000
This is not compatible with AV_PIX_FMT_0RGB32, and the result
is success with completely wrong colors.
2014-07-17 18:11:56 +02:00
36fbe3c789
lavd/x11grab: change error code for unsupported visuals.
2014-07-17 18:11:55 +02:00
a65c0a3fe8
lavd/x11grab: disable drawing mouse without XFixes.
...
Fix a segfault if the XFixes extension is not available on
the X11 server.
Can be reproduced using the VNC server.
2014-07-17 18:11:55 +02:00
04980dbee8
avdevice/avfoundation: kCVPixelFormatType_OneComponent8 only exists from 10.8 onward
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16 00:40:32 +02:00
9514472904
avutil & avdevice: remove av_bprint_fd_contents()
...
MSVC does not allow passing file pointers between libs
This API can thus not work with MSVC and as it was very recently added
and its it was in no release its removial should not cause any problems
A better API will be implemented, but its not finished yet, this revert is
to avoid potentially blocking the release
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-15 21:49:56 +02:00
98eab98159
avdevice/pulse_audio_dec: reimplement using the non simple API
...
This fixes timestamps
Based-on: code from pulseaudio
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 01:36:01 +02:00
eee6ad38f9
avdevice/lavfi: add io.h, should fix msvc build
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 20:29:59 +02:00
0dbcecc8dc
avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h>
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 02:48:51 +02:00
0ebcf87803
protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches
...
Should fix build failure on MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 01:54:30 +02:00
2229a6dfe6
avdevice/lavfi: allow non-mmappable files for graph_file
...
Use av_bprint_fd_contents() instead of av_file_map()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07 21:28:25 +02:00
33f6ba9c4e
avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 13:05:58 +02:00
9efa7f82ce
avdevice/xv: fix missing {
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30 21:32:19 +02:00
e5c806fd67
lavd/xv: handle delete window message
...
User may close X11 window by close button on tray.
FFmpeg leaves in graceless way.
This commit detects it and return EPIPE error.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30 19:20:32 +02:00
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
3a10bf93b5
avdevice/lavfi: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 15:04:50 +02:00
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
124c94a1c8
avdevice/v4l2: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-22 15:08:12 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
68c3e6025f
Fix convertion typos
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 00:09:08 +02:00
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
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
0bfb1e9238
avdevice/jack_audio: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-23 21:13:31 +02:00
8cbf0827e1
Various small spelling fixes.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-04-22 20:44:31 +02:00
de705e52d4
lavd/xv: implement repaint message
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-19 02:18:45 +02:00
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
5053897b6a
lavd/xv: keep aspect ratio
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-19 02:18:45 +02:00
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
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
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
4c0f36412a
lavd/avdevice: add volume messages
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-18 02:15:56 +02:00
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
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
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
10627e7e10
lavd/pulse_audio_enc: cosmetics
2014-04-18 01:42:17 +02:00
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
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
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
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
defb87eef4
lavd/qtkit: add device category
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-12 19:50:09 +02:00
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
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
d2417061ef
Add AVFoundation input device.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-11 17:51:33 +02:00
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
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
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
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
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
0cc8a62a78
dshow: fixup some COM objects, based on patches from Don Moir
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 23:11:35 +02:00
d5c0036d4a
lavd/qtkit: Fix non-constant initializer element for some clang compilers.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 22:21:07 +02:00
234f0bcb0c
lavd: Add QTKit input device.
...
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-30 20:45:07 +02:00
3937b40e87
lavd/pulse_audio_enc: implement get_device_list callback
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-29 09:54:16 +01:00
255cf03af8
lavd/pulse_audio_dec: implement get_device_list callback
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-29 09:54:09 +01:00
85ed32d2ed
lavd/pulse_audio_common: add device detecting code
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-29 09:48:56 +01:00
27256e69ab
lavd/pulse_audio_enc: implement write_uncoded_frame callback
...
Provided implementation doesn't support planar formats yet.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-29 09:26:10 +01:00
773eb74bab
dshow: show device name when outputting buffer overflow log message
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 00:22:55 +01:00
10056bc964
dshow: log error and continue if unable to set audio buffer
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25 17:32:39 +01:00
6abc56e892
dshow: use distinct buffers per stream.
...
Basically sometimes if you start dropping video packets, you also drop audio packets. Now they each have separate buffers to avoid this unexpected behavior.
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 03:46:10 +01:00
b28c371567
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavf/concatdec: reindent after last commit.
lavf/concatdec: more reliable test for absolute URLs.
lavf: add subfile protocol.
lavfi/af_atempo: clear references before returning error.
lavd/xv: take aspect ratio into account.
lavc/pthread: copy packet side data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-08 15:00:36 +01:00
24e2a82f75
Make 32bit RGB dshow input opaque.
2014-03-08 13:46:05 +01:00
6208bb965d
Set codec_tag in dshow device, needed to distinguish between YUV and YVU.
...
Fixes ticket #3447 .
2014-03-08 13:42:47 +01:00
c37bbe54f4
lavd/xv: take aspect ratio into account.
2014-03-08 12:29:32 +01:00
99b4da73c8
lavd/Makefile: Add fbdev_common.h to SKIPHEADERS
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 15:42:15 +01:00
2475fdbd04
lavd/avdevice: always free detected devices on error
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-06 00:34:50 +01:00
9deecdf85f
Fix pthread-related compile errors in iec61883.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05 22:19:33 +01:00
06fed44051
lavd/avdevice: add device iterators
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-03 23:39:07 +01:00
f607767d93
lavd: add categories to device implementations
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-03-03 23:34:46 +01:00
5642dd41cc
Add more Bayer colour spaces to the video4linux2 device wrapper.
2014-02-23 13:42:41 +01:00
dd5abb0bac
avdevice/v4l2: add V4L2_PIX_FMT_SRGGB8
2014-02-23 13:42:41 +01:00
a88dee8eea
Add decklink_enc.h to SKIPHEADERS.
...
Fixes make checkheaders without decklink headers.
2014-02-19 19:55:14 +01:00
81c3f81d6f
lavd: add list devices API
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-02-16 20:07:08 +01:00
d3cf9b24cf
lavd/opengl_enc_shaders: fix gray* shader
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-02-16 19:56:53 +01:00
1e5cb426c6
lavd/avdevice: add param to create window buffer message
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-14 05:13:33 +01:00
db4a704482
lavd/opengl_enc: implement uncoded frame callback
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-02-13 23:33:05 +01:00
db403023c0
lavd/opengl_enc: add gray8/16 formats
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-02-13 23:33:05 +01:00
edc7e67669
lavf/lavd: version bump and APIchanges for uncoded frames.
2014-02-11 10:34:32 +01:00
d201a0f0f8
lavd/xv: preliminary support of uncoded frame.
2014-02-11 10:29:02 +01:00
62106fcc23
lavd/alsa: preliminary support of uncoded frame.
2014-02-11 10:29:02 +01:00
5965adeb20
lavd: add decklink output device
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-09 17:15:19 +01:00
20fe316e47
lavd/sdl: reset context variables after destroy
...
SDL device reports double free or hangs when quiting.
Reseting variables solves the issue.
The issue is caused by double call of write_trailer callback.
It is called for the first time in write_packet when quit flag is set.
Second call comes from ffmpeg.c or may come from other client application.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08 12:27:00 +01:00
18c3313e65
lavd/sdl: make waiting spurious wakeup aware
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08 12:27:00 +01:00
c81a9d13f4
lavd/opengl_enc: fix parentheses in if condition
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-02 22:14:34 +01:00
5059d8dfe3
lavd/opengl_enc: remove inlines
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2014-02-02 02:26:02 +01:00
Nicolas George
Hanspeter Niederstrasser
Michael Niedermayer
Andrey Utkin
Lukasz Marek
sfan5
Lou Logan
Olivier Langlois
Janne Grunau
Reimar Döffinger
Matt Oliver
Thilo Borgmann
Lukasz Marek
Calvin Walton
Thilo Borgmann
rogerdpack
Vadim Kalinsky
Don Moir
Carl Eugen Hoyos
James Almer
Andrey Myznikov
Peter Ross
Ramiro Polla