Tim-Philipp Müller
fb6d09055a
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
ext/alsa/gstalsadeviceprobe.c
ext/alsa/gstalsamixer.c
ext/pango/gsttextoverlay.c
ext/pango/gsttextoverlay.h
gst-libs/gst/audio/gstaudiobasesink.c
gst-libs/gst/audio/gstaudioringbuffer.c
gst-libs/gst/audio/gstaudiosrc.c
gst-libs/gst/video/Makefile.am
gst-libs/gst/video/video.c
gst/encoding/gststreamcombiner.c
gst/encoding/gststreamsplitter.c
gst/playback/gstplaybasebin.c
gst/playback/gststreamsynchronizer.c
gst/playback/gstsubtitleoverlay.c
gst/playback/gsturidecodebin.c
sys/xvimage/xvimagesink.c
tests/examples/Makefile.am
win32/common/libgstvideo.def
Video overlay composition disabled for now, needs
porting to buffer meta.
2011-12-08 01:19:03 +00:00
Tim-Philipp Müller
0d98aa25b8
Work around deprecated thread API in glib master
...
Add private replacements for deprecated functions such as
g_mutex_new(), g_mutex_free(), g_cond_new() etc., mostly
to avoid the deprecation warnings. We'll change these
over to the new API once we depend on glib >= 2.32.
Replace g_thread_create() with g_thread_try_new().
2011-12-04 17:16:30 +00:00
Wim Taymans
1225aa9a78
update for basesink event handler changes
2011-12-02 22:24:43 +01:00
Tim-Philipp Müller
177525f89f
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
gst-libs/gst/netbuffer/gstnetbuffer.c
gst/ffmpegcolorspace/avcodec.h
gst/ffmpegcolorspace/gstffmpegcodecmap.c
gst/ffmpegcolorspace/imgconvert.c
gst/ffmpegcolorspace/imgconvert_template.h
gst/ffmpegcolorspace/mem.c
gst/playback/README
gst/playback/gstplaybasebin.c
gst/playback/gstplaybasebin.h
gst/playback/gstplaybin.c
sys/v4l/v4lmjpegsrc_calls.c
sys/v4l/videodev_mjpeg.h
tests/check/elements/gnomevfssink.c
2011-12-02 11:10:17 +00:00
Piotr Fusik
14644457b0
various: typo fixes
...
Fix typos in code and docs. Fixes. #658984
2011-12-02 12:03:27 +01:00
Wim Taymans
871b306fce
video: move some interfaces
...
Move some interfaces to the video library
2011-11-29 19:10:01 +01:00
Vincent Penquerc'h
96374054ac
various: fix pad template leaks
...
https://bugzilla.gnome.org/show_bug.cgi?id=662664
2011-11-28 13:09:02 +00:00
Edward Hervey
15687f381b
xvimagebufferpool: Use the default ::free_buffer() implementation
...
Which does exactly the same thing
2011-11-21 13:04:12 +01:00
Wim Taymans
e067e67923
rename meta* -> *meta
2011-11-02 09:04:27 +01:00
Wim Taymans
016d036137
Merge branch 'master' into 0.11
...
Conflicts:
configure.ac
gst-libs/gst/audio/gstbaseaudiosink.c
gst/audioconvert/channelmixtest.c
gst/playback/gstplaybasebin.c
gst/playback/gstsubtitleoverlay.c
tests/examples/Makefile.am
tests/examples/audio/Makefile.am
2011-10-27 15:44:58 +02:00
Stefan Sauer
53d7d2e966
interfaces: clean up the use of iface and class/klass
2011-10-21 14:46:48 +02:00
Stefan Sauer
b4803361c6
x(v)imagesink: make it more clean that "synchronous" props are not for avsync
2011-10-19 10:42:22 +02:00
Wim Taymans
82d82203f6
base: fix for allocation methods rename
2011-08-26 14:26:37 +02:00
Wim Taymans
3dd31cce39
xvimagesink: fix compiler warning
2011-08-17 10:57:13 +02:00
Wim Taymans
515d4a9a6d
xvimage: avoid caps intersection
...
Store the video format in the XvImage format list so that we can quickly map
between the two.
2011-08-15 18:39:09 +02:00
Tim-Philipp Müller
7f11e9bc30
ximagesink, xvimagesink: update for GstXOverlay -> GstVideoOverlay
2011-08-08 14:12:15 +01:00
Wim Taymans
2e00a6d169
xvimagepool: cleanups
2011-08-05 12:48:07 +02:00
Wim Taymans
a7d88b0898
x11: remove useless alignment
2011-08-04 15:18:14 +02:00
Wim Taymans
66142747bd
xv: apply cropping on padded images
...
Store the dimensions of the unpadded image in the metadata and use that info to
display the valid region of the image.
2011-08-01 18:36:33 +02:00
Wim Taymans
27e622b99e
xvimage: add suport for video alignment
...
Add support for the VideoAlignment option in the bufferpool. The extra
configuration options can be used to request special padding and alignment
requirements for the video buffers.
2011-08-01 17:10:10 +02:00
Wim Taymans
5a85e1d75f
base: update for new bufferpool API
2011-07-29 17:15:39 +02:00
Wim Taymans
b0c64a10f8
x11: relax bufferpool checks
...
Check if the metadata belongs to us instead of checking the current bufferpool.
The bufferpool can change at any time when upstream wants to renegotiate.
2011-07-29 12:25:13 +02:00
Wim Taymans
d013481d8e
x11: let old pool drain
...
Let the old pool drain without deactivating it, some elements might still be
using it.
2011-07-26 14:10:33 +02:00
Wim Taymans
662c1f4b6c
x11: use new setup_allocation vmethod
2011-07-26 13:17:20 +02:00
Wim Taymans
084eac3a77
x11: call parent set_config
...
Call the parent set_config method to make it aware of the current config so that
its default methods can do preallocation.
2011-07-18 18:46:01 +02:00
Wim Taymans
8750aea364
x11: improve allocation parameters
...
Set the min-buffers to 2 because our base class will hold on to 1 buffer for the
last-buffer property.
2011-07-18 16:48:25 +02:00
Wim Taymans
e461ab46d4
X11: also check the bufferpool
...
Don't just check the availability of the metadata but also if the buffer is
really from our bufferpool.
2011-07-15 16:35:44 +02:00
Wim Taymans
ddce68a5c2
video: More video helper library improvements
...
Make a new GstVideoFormatinfo structure that contains the specific information
related to a format such as the number of planes, components, subsampling,
pixel stride etc. The result is that we are now able to introduce the concept of
components again in the API.
Use tables to specify the formats and its properties.
Use macros to get information about the video format description.
Move code to set strides, offsets and size into one function.
Remove methods that are not handled with the structures.
Add methods to retrieve pointers and strides to the components in the video.
2011-07-04 16:01:14 +02:00
Tim-Philipp Müller
8cede4ae6a
gst, sys: remove GstImplementsInterface usage
2011-06-26 23:16:08 +01:00
Wim Taymans
dd7e605fec
x11: let upstream know we support cropping
2011-06-23 16:31:21 +02:00
Wim Taymans
df94f2da81
x11: add image cropping
...
Use the cropping metadata to crop the image.
Remove deprecated display-region property to set a clipping rectangle.
2011-06-23 12:55:13 +02:00
Wim Taymans
1a5d88b68c
xvimagesink: handle unknown formats
2011-06-22 19:35:16 +02:00
Wim Taymans
aa73f69f2d
x11: use frame copy functions
2011-06-22 15:38:24 +02:00
Wim Taymans
8fbdac9fc6
x11: delay pool activation
...
don't activate the pool we return in the ALLOCATION query because upstream might
still want to configure it
2011-06-20 17:39:05 +02:00
Wim Taymans
cf91192668
x11: handle new bufferpool metadata api
...
Provide a method to list the supported metadata apis.
Activate the video metadata on buffers when a downstream element configured the
bufferpool to support that api.
2011-06-20 13:28:12 +02:00
Wim Taymans
5eeb468c75
x11: use GstVideoInfo to parse caps
...
Use GstVideoInfo to keep track of the configured format.
Add GstMetaVideo to buffers, disabled by default for now until we can have it
enabled with a property on the bufferpool configuration.
2011-06-17 17:54:52 +02:00
Wim Taymans
0d75dc5a0b
x11: make function static
...
Don't export buffer creation function, we need to use the bufferpool
now.
2011-06-17 17:27:22 +02:00
Wim Taymans
d93129d8da
-base: port to GstVideoFrame API
2011-06-17 15:41:31 +02:00
Wim Taymans
d06f599193
-base: port elements to new video caps
2011-06-16 12:52:13 +02:00
Wim Taymans
9c54ca5254
-base: update for buffer API change
2011-06-13 16:32:56 +02:00
Wim Taymans
a8971beee0
ximage: fix alignment and size
...
Set the right alignment and size in the bufferpool.
2011-06-11 20:47:01 +02:00
Wim Taymans
1c8324a0d1
update for bufferpool api change
2011-06-11 18:54:44 +02:00
Sebastian Dröge
bf08ca7020
Merge branch 'master' into 0.11
2011-05-26 13:54:09 +02:00
Sebastian Dröge
7716358d04
xvimagesink: Fallback to non-XShm mode if allocating the XShm image failed
...
Fixes bug #630442 .
2011-05-26 12:33:08 +02:00
Sreerenj Balachandran
2f6d9e55cc
xvimagesink: Remove the g_assert from interface query
2011-05-26 09:05:55 +02:00
Stefan Kost
b229b8f3f9
xvimagesink: run gst-indent
2011-05-25 12:30:51 +03:00
Stefan Kost
3f642f3635
xvimagesink: remove unneded !=NULL checks
...
We check for matching_attr!=NULL right before already.
2011-05-25 12:29:21 +03:00
Wim Taymans
453091137e
x11: free bufferpool whe activation fails
2011-05-24 09:45:39 +02:00
Wim Taymans
f66c6ced56
xvimagesink: improve allocation query
...
If the allocation query contains the same caps as the current allocator, we can
return that one instead of making a new one.
2011-05-19 15:55:53 +02:00
Sebastian Dröge
6392dfc072
sys: Update for caps/pad template related API changes
2011-05-17 13:06:01 +02:00
Sebastian Dröge
318ed07598
Revert "-base_port to new query API"
...
This reverts commit c9f4e0676b
.
2011-05-17 11:25:31 +02:00
Sebastian Dröge
8d6e2c8a89
xvimagesink: Update for negotiation related API changes
2011-05-16 15:35:41 +02:00
Sreerenj Balachandran
cf3cc57ca7
xvimagesink: Use GST_BOILERPLATE
2011-05-14 11:42:32 +02:00
Wim Taymans
c81b1b8019
-base: remove metadata (des)serialize functions
2011-05-11 19:12:42 +02:00
Wim Taymans
c9f4e0676b
-base_port to new query API
2011-05-10 18:39:07 +02:00
Wim Taymans
abcbef287d
plugins: fix for allocation query API change
2011-05-02 11:11:33 +02:00
Wim Taymans
86a4771f8e
remove buffer_alloc
2011-04-29 13:28:17 +02:00
Wim Taymans
c952567bb6
xvimagesink: implement ALLOCATION query
2011-04-29 12:09:38 +02:00
Sebastian Dröge
8336e2027d
sys: Use G_DEFINE_TYPE instead of GST_BOILERPLATE
2011-04-19 11:44:14 +02:00
Sebastian Dröge
0759ce8533
Merge branch 'master' into 0.11
2011-04-18 13:23:32 +02:00
Sebastian Dröge
75c337c726
x(v)imagesink: If NULL caps are passed to buffer_alloc() do fallback allocation
...
Fixes bug #647857 .
2011-04-18 11:24:57 +02:00
Wim Taymans
c8fee4a4b3
ximage: don't share the memory
...
We can't share the memory on the buffer with other buffers because the metadata
X(v)Image points to it and we don't want it to go away.
2011-04-07 16:07:57 +02:00
Wim Taymans
1999e73759
xvimagesink: make the show_frame function prettier
2011-04-06 19:21:02 +02:00
Wim Taymans
1ae67927cc
ximage: more fixes
2011-04-06 17:54:28 +02:00
Wim Taymans
4007076b55
Merge branch 'master' into 0.11
...
Conflicts:
ext/theora/gsttheoraenc.c
2011-04-06 16:33:56 +02:00
Wim Taymans
518ededd16
ximage: more fixes
2011-04-06 16:26:12 +02:00
benjamin gaignard
15c49a4d63
xvimagesink: use bufferpool
...
Improve bufferpool handling in ximagesink.
Implement bufferpool handling on xvimagesink.
Based on patches from benjamin gaignard <benjamin.gaignard@linaro.org>
2011-04-06 12:28:46 +02:00
Stefan Kost
38aba7853e
xvimagesink: don't paint the window black when going to NULL
...
Leave dealing with the appearance of the window when we are not playing to the
applications. We anyway want to go to NULL as quickly as possible.
Fixes #635800
2011-04-05 11:37:01 +03:00
Wim Taymans
5244770775
plugins: fix for new memory API
2011-03-27 17:16:10 +02:00
Wim Taymans
f246c0e97d
meta: update for new API
2011-03-08 17:01:41 +00:00
Wim Taymans
c7c8f3e13d
meta: fix for new API
2011-02-28 11:50:04 +01:00
Wim Taymans
a1a237d0ea
ximage: fix macros
2011-02-28 11:50:04 +01:00
Wim Taymans
08bfcad434
ximage: reimplement buffer pooling with metadata
...
Use the buffer metadata to get back to the extra info we can use to optimize the
video rendering.
2011-02-28 11:50:04 +01:00
Wim Taymans
55c9ca592f
metadata: implement extra buffer data with metadata
...
Use buffer metadata to attach arbitrary extra data to buffers.
2011-02-28 11:50:04 +01:00
Wim Taymans
e78903e662
X11: port imagesinks to new miniobjects
...
Remove the subbuffer from X11 sinks and use the private pointer to store a
single buffer metadata with the extra info.
2011-02-28 11:50:04 +01:00
Gavin Stark
b00f8a5b36
xvimagesink: Use gst_caps_can_intersect() instead of gst_caps_intersect()
...
Fixes a memory leak and bug #636827 .
2010-12-09 08:40:25 +01:00
Sebastian Dröge
28da26e670
xvimagesink: Add docs for the new property
...
Including Since markers
2010-12-02 19:04:28 +01:00
Sebastian Dröge
f8f1aa2160
xvimagesink: Use PROP_ instead of ARG_ for the property enums
2010-12-02 19:04:28 +01:00
Andrea Sebastianutti
72d6f7f4d6
xvimagesink: Add read-only properties window-width and window-height
2010-12-02 19:04:27 +01:00
Sebastian Dröge
96006aded8
xvimagesink: Make sure that the caps for upstream negotiation are simple caps
...
Fixes bug #631774 .
2010-10-10 18:35:54 +02:00
René Stadler
578a7ef950
xvimagesink: allow render rectangle coordinates to be negative
...
Useful for cropped zooming.
2010-09-28 15:20:37 +03:00
David Schleef
6dc02137fb
xoverlay: Add guintptr versions of functions
...
And deprecate the gulong versions. This is to support platforms
where sizeof(unsigned long) < sizeof(void *). Fixes #627565 .
API: Add gst_x_overlay_set_window_handle()
API: Deprecate: gst_x_overlay_set_xwindow_id()
API: Add gst_x_overlay_got_window_handle()
API: Deprecate: gst_x_overlay_got_xwindow_id()
API: Add GstXOverlay::set_window_handle()
API: Deprecate: GstXOverlay::set_xwindow_id()
2010-09-15 00:10:23 -07:00
Sebastian Dröge
59ba05a95d
xvimagesink: Suggest caps with different width/height if bufferalloc is called with impossible width/height
2010-08-11 18:10:45 +02:00
Sebastian Dröge
2a08bcc53f
xvimagesink: It's not a bad thing if the preferred video format needs less bytes per frame
2010-08-11 18:10:44 +02:00
Stefan Kost
f5469d42de
x(v)imagesink: use gst_caps_can_intersect() more
...
In place where we just need to know whether caps intersect, we can use this
quicker function.
2010-05-06 08:22:36 +03:00
Stefan Kost
6c51803dc8
x(v)imagesink: gracefully handle ximagesink>xwindow == NULL
...
Expose could be called before we have set the xwindow. Handle this gracefully
like we do in image_put.
Fixes #615789
2010-04-16 15:52:26 +03:00
Stefan Kost
3ec87ee221
xvimagesink: init geometry when setting new xid
...
Don't rely on expose event to query geomentry after new xid is set.
Fixes #615647 .
2010-04-14 15:19:19 +01:00
Tim-Philipp Müller
37d000d175
xoverlay: change new set_render_rectangle() vfunc to take four arguments so we don't depend on libgstvideo
...
Don't make libgstinterfaces (and thus libgstaudio etc.) indirectly depend
on libgstvideo by using the GstVideoRectangle helper structure in the API,
which causes undesirable dependencies, esp. with the gobject-introspection
(people will point and laugh at us if they find out that libgstaudio
depends on libgstvideo). Instead, pass the x, y, width and height parameters
directly to the function.
Re-fixes #610249 .
2010-03-28 20:21:10 +01:00
Benjamin Otte
3bd4aa26ff
Add -Wwrite-strings to configure
...
Fixes for the code included
2010-03-16 17:41:51 +01:00
Benjamin Otte
5e21fa5e0e
gst_element_class_set_details => gst_element_class_set_details_simple
...
Also change my email from the old university one to the current one.
2010-03-16 17:41:50 +01:00
Stefan Kost
a982dc0480
xvimagesink: implement set_render_rectangle
...
Previously we hardcoded the target rectangle passes to Xv(Shm)PutImage. Extend
the implementation to use a full rectangle and don't assume 0,0 for top,left.
2010-03-11 10:24:57 +02:00
Stefan Kost
7b13aeee32
x(v)imagesink: take new size from event thread and do not poll for every frame
...
We can update the geometry in ConfigureNotify (unless we disable event-
handling). If event handling is disabled, one should use _expose() to trigger a
redraw and update the geometry.
2010-03-11 10:23:19 +02:00
Stefan Kost
99b4483b8c
xvimagesink: only start event thread if needed
...
The event thread is doing 20 wakeups per second to poll the events. If one runs
xvimagesink with handle-events=false and handle-expose=false then we can avoid
the extra thread.
2009-10-07 11:18:09 +03:00
Tim-Philipp Müller
78b0413c5f
ximagesink, xvimagesink: use new GstVideoSink::show_frame() vfunc
2009-09-08 18:20:11 +01:00
René Stadler
a533ae303b
xvimagesink: fix small memory leak when setting window title
2009-09-06 01:44:23 +03:00
Stefan Kost
8e5a0000dc
xvimagesink: use core performance log category
2009-07-06 09:42:12 +01:00
Stefan Kost
8b0da4bfe8
x(v)imagesink: pass the xwindow along to not look at the yet unset var.
...
When we call this from xwindow_new, x(v)imagesink->xwindow is not yet set.
2009-06-22 16:17:10 +03:00
Stefan Kost
8946be1f0b
x(v)imagesink: catch tags and show title in own window
...
Refactor the code that sets the window title. Catch tag-events and use title
metadata for the window title.
2009-06-22 11:40:33 +03:00
Stefan Kost
483a955e89
xvimagesink: appname might be NULL
...
Don't set title if appname is unknown.
2009-06-18 18:13:22 +03:00
Stefan Kost
192efaf1d0
xvimagesink: set window title from application name
2009-06-18 17:58:06 +03:00