Commit Graph

26 Commits

Author SHA1 Message Date
Ramiro Polla
cc58300e30 implement new grabbing interface, as described here:
ttp://thread.gmane.org/gmane.comp.video.ffmpeg.devel/42920
patch by Ramiro Polla % ramiro A lisha P ufsc P br %
Original thread:
Date: Jan 31, 2007 8:56 PM
Subject: [Ffmpeg-devel] [PATCH] New grabbing interface

Originally committed as revision 7983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-14 17:01:32 +00:00
François Revol
8fa36ae09d This fixes error handling for BeOS, removing the need for some ifdefs.
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.

Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-13 18:26:14 +00:00
Diego Biurrun
71e445fca3 Replace deprecated PIX_FMT names by the newer variants.
Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-07 01:48:09 +00:00
Panagiotis Issaris
ca4544409e Make x11grab output its warning that it couldn't find the mouse pointer only
once. This prevents flooding of the terminal when grabbing from a different
X-screen.

Originally committed as revision 7808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-02 17:54:50 +00:00
Diego Biurrun
6187b8bde3 typo: pallete --> palette
Originally committed as revision 7444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 04:19:45 +00:00
Panagiotis Issaris
0cd4faf977 Allow provision of displaynumber, screennumber, x-offset and y-offset parameters
to the x11grab device.

Originally committed as revision 7320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-15 13:19:03 +00:00
Baptiste Coudurier
7224e89638 dont segv is ap->device is not set, display error message
Originally committed as revision 7312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 10:18:38 +00:00
Baptiste Coudurier
ba78f9d486 fix compilation, use the standard INT64_C macro
Originally committed as revision 7311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 10:08:27 +00:00
Guillaume Poirier
05f3b6ab06 remove trailing whitespace left over
Originally committed as revision 7310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 09:14:30 +00:00
Edouard Gomez
bd8393387f Feedback from Karl H. Beckers about mouse cursor
(patch by Edouard Gomez)

Originally committed as revision 7309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:51:01 +00:00
Edouard Gomez
6e71a18eda RFC 6: Overall cleanups again.
- License should be fixed now (finally)
- Added doxygen comments
- Cleaned up the X11Grab structure
- Renamed X11Grab structure to x11_grab_s
- Changed some Java stylish named functions to more C'stylish ones
- Changed order of some parameters so they are more libc alike with
  destination as first parameter
- Use AVRational where relevant
- Fixed time calculation
- Cleaned up a few little tiny things around the sources
  + removed a goto
  + removed unused vars
  + etc...
(Patch by Edouard Gomez)

Originally committed as revision 7308 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:50:30 +00:00
Edouard Gomez
0235a3116e RFC 5: Mouse cursor painting reduc and more cleanups
- License is for FFmpeg, not "this program"
- Rewrite mouse cursor painting functions
- Cosmetic on 2 function declarations
(patch by Edouard Gomez)

Originally committed as revision 7307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:49:34 +00:00
Edouard Gomez
aac105fcd1 RFC 3&4 stage: FFmpeg style aint't my style
- Tabs are 4 width
- No tabs allowed
(patch by Edouard Gomez)

Originally committed as revision 7306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:48:56 +00:00
Edouard Gomez
ef84bf0404 RFC 2 stage: First feedback from review comments
- License is GPL, simplify the license header to make it clear
- Add myself to license header, clarify who did what
- Use 64 bit PTS
- Move mouse bitmaps to the mouse cursor painting function. Make them
  const again
  - Properly detach X11 from the shared memory segment on close
  - Destroy X11 image on close
(patch by Edouard Gomez)

Originally committed as revision 7305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:48:13 +00:00
Edouard Gomez
65a1c656d7 RFC 1 stage: Improve maintainability of the cursoir painting code
- Turned the mouse cursor painting code into a macro for more
  maintainability
  - Dropped mouse cursor painting in 8bit mode
  - Removed log when dropping frames
  - Free the shared memory segment on close
(patch by Edouard Gomez)

Originally committed as revision 7304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:47:14 +00:00
Edouard Gomez
2909f17717 Adapt the patch to more recent FFmpeg habits
- Indentation
- Use av_log instead of fprintf
- Removed strdup of the device name. It was unused
- Cleaned things a bit
(patch by Edouard Gomez)

Originally committed as revision 7303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:46:31 +00:00
Guillaume Poirier
f58f4ce19d Original X11 device demuxer patch from Clemens Fruhwirth
- Build system integration is equivalent to RFC #6 patch
- Same rule applies to ffmpeg.c/allformats.[c|h]
- x11grab.c is from Clemens Fruhwirth except the x11 grab
  structure for libavformat registration is renamed to
    match build system integration.

Originally committed as revision 7302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 08:45:36 +00:00
Guillaume Poirier
83c547a4a1 revert broken commit of x11 device demuxer patch
Originally committed as revision 7301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-13 00:06:33 +00:00
Guillaume Poirier
77e5024c1c Feedback from Karl H. Beckers about mouse cursor
Reverse direction of the mouse cursor pointer

Originally committed as revision 7300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:14 +00:00
Guillaume Poirier
bfac8d3ae7 RFC 6: Overall cleanups again.
- License should be fixed now (finally)
- Added doxygen comments
- Cleaned up the X11Grab structure
- Renamed X11Grab structure to x11_grab_s
- Changed some Java stylish named functions to more C'stylish ones
- Changed order of some parameters so they are more libc alike with
  destination as first parameter
- Use AVRational where relevant
- Fixed time calculation
- Cleaned up a few little tiny things around the sources
  + removed a goto
  + removed unused vars
  + etc...

Originally committed as revision 7299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:12 +00:00
Guillaume Poirier
86904e836a RFC 5: Mouse cursor painting reduc and more cleanups
- License is for FFmpeg, not "this program"
- Rewrite mouse cursor painting functions
- Cosmetic on 2 function declarations

Originally committed as revision 7298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:10 +00:00
Guillaume Poirier
9b91c1e265 RFC 3&4 stage: FFmpeg style aint't my style
- Tabs are 4 width
- No tabs allowed

Originally committed as revision 7297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:08 +00:00
Guillaume Poirier
04b01de857 RFC 2 stage: First feedback from review comments
- License is GPL, simplify the license header to make it clear
- Add myself to license header, clarify who did what
- Use 64 bit PTS
- Move mouse bitmaps to the mouse cursor painting function. Make them
  const again
- Properly detach X11 from the shared memory segment on close
- Destroy X11 image on close

Originally committed as revision 7296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:06 +00:00
Guillaume Poirier
d797fdf493 RFC 1 stage: Improve maintainability of the cursoir painting code
- Turned the mouse cursor painting code into a macro for more
  maintainability
- Dropped mouse cursor painting in 8bit mode
- Removed log when dropping frames
- Free the shared memory segment on close

Originally committed as revision 7295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:04 +00:00
Guillaume Poirier
b9255fb98a Adapt the patch to more recent FFmpeg habits
- Indentation
- Use av_log instead of fprintf
- Removed strdup of the device name. It was unused
- Cleaned things a bit

Originally committed as revision 7294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:32:02 +00:00
Guillaume Poirier
e519b02c10 Original X11 device demuxer patch from Clemens Fruhwirth
- Build system integration is equivalent to RFC #6 patch
- Same rule applies to ffmpeg.c/allformats.[c|h]
- x11grab.c is from Clemens Fruhwirth except the x11 grab
  structure for libavformat registration is renamed to
  match build system integration.

Originally committed as revision 7293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 22:31:46 +00:00