Commit graph

10594 commits

Author SHA1 Message Date
Tim-Philipp Müller
6630236af4 video: add video overlay composition API for subtitles
Basic API to attach overlay rectangles to buffers,
or blend them directly onto raw video buffers.

To be used primarily for things like subtitles or
logo overlays, not meant to replace videomixer.

Allows us to associate subtitle overlays with
non-raw video surface buffers, so that subtitles
are not lost and can instead be rendered later
when those surfaces are displayed or converted,
whilst re-using all the existing overlay plugins
and not having to teach them about our special
video surfaces. Could also have been made part
of the surface buffer abstraction of course, but
a secondary goal was to consolidate the blending
code for raw video into libgstvideo, and this
kind of API allows us to do both in a way that's
minimally invasive to existing elements, and at
the same time is fairly intuitive.

More features and extensions like the ability to
pass the source data or text/markup directly will
be added later.

https://bugzilla.gnome.org/show_bug.cgi?id=665080

API: gst_video_buffer_get_overlay_composition()
API: gst_video_buffer_set_overlay_composition()

API: gst_video_overlay_composition_new()
API: gst_video_overlay_composition_add_rectangle()
API: gst_video_overlay_composition_n_rectangles()
API: gst_video_overlay_composition_get_rectangle()
API: gst_video_overlay_composition_make_writable()
API: gst_video_overlay_composition_copy()
API: gst_video_overlay_composition_ref()
API: gst_video_overlay_composition_unref()

API: gst_video_overlay_composition_blend()

API: gst_video_overlay_rectangle_new_argb()
API: gst_video_overlay_rectangle_get_pixels_argb()
API: gst_video_overlay_rectangle_get_pixels_unscaled_argb()
API: gst_video_overlay_rectangle_get_render_rectangle()
API: gst_video_overlay_rectangle_set_render_rectangle()
API: gst_video_overlay_rectangle_copy()
API: gst_video_overlay_rectangle_ref()
API: gst_video_overlay_rectangle_unref()
2011-12-05 15:37:02 +00:00
Tim-Philipp Müller
a7a3f969b3 video: hide private video-blend.[ch] from gobject-introspection
And remove unused fields from helper structure.
2011-12-05 15:37:02 +00:00
Tim-Philipp Müller
b0ff1d22e9 video: add fallbacks for compilation without orc 2011-12-05 15:36:56 +00:00
Thibault Saunier
80054a3b1e video: add some internal helper functions for image blending
This could be improved if we decide we don't need it to
be this generic/flexible.
2011-12-05 15:03:47 +00:00
Sebastian Dröge
b0f4085f22 xoverlay: Fix mistakes in the sample code
Fixes bug #665430.
2011-12-05 09:39:08 +01:00
Matej Knopp
f89d7ee7eb Appsink fixes 2011-12-05 09:34:50 +01:00
Tim-Philipp Müller
5440ae3c18 Suppress deprecation warnings in selected files, for g_static_rec_mutex_* mostly
GStaticRecMutex is part of our API/ABI, not much we can do here
in 0.10 for most of these.
2011-12-04 20:50:25 +00:00
Tim-Philipp Müller
4828234639 alsamixer: use GRectMutext instead of GStaticRecMutex with newer glib versions 2011-12-04 20:38:19 +00:00
Tim-Philipp Müller
9c307bccc5 alsamixer: embed static mutexes into the mixer structure
instead of allocating them dynamically
2011-12-04 20:21:26 +00:00
Tim-Philipp Müller
ff6cc8af82 tools, tests: g_thread_init() is deprecated in glib master
It's not needed any longer.
2011-12-04 17:16:36 +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
Tim-Philipp Müller
6098442bd0 xmpwriter: update for thread API deprecations in glib master 2011-12-04 15:23:21 +00:00
Stefan Sauer
5398950012 fft-example: re-add Makefile.am 2011-12-04 13:43:06 +01:00
Stefan Sauer
f4213c5e85 configure: trim trailing whitespace 2011-12-02 23:35:50 +01:00
Stefan Sauer
3fb41e2cc3 tests: add a test for fft result value-ranges
Add a small example that uses ffts of various types and parameters and check the
result value ranges.
2011-12-02 23:34:47 +01: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
Tim-Philipp Müller
ec0d3566bf Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
	ext/alsa/gstalsasrc.c
	ext/alsa/gstalsasrc.h
	gst/adder/gstadder.c
	gst/playback/gstplaybin2.c
	gst/playback/gstplaysinkconvertbin.c
	win32/common/libgstvideo.def
2011-12-02 00:07:39 +00:00
Tim-Philipp Müller
a7c44ea877 Add {audio,video}-marshal.[ch] to .gitignore 2011-12-01 23:26:36 +00:00
Wim Taymans
3deaa582d9 tags: make the tag functions return GstSample
gst_tag_image_data_to_image_buffer() ->
   gst_tag_image_data_to_image_sample() And make it return a GstSample.
Store the image-type into the extra sample info.
Remove a deprecated tag
2011-12-01 18:51:51 +01:00
Wim Taymans
59113af604 Use the new GstSample for snapshots
Make appsink return a GstSample. Remove the pull_buffer_list method because it
is not very useful anymore.
Pass GstSample to the conversion function.
Update playbin2 and examples
2011-12-01 16:53:11 +01:00
Wim Taymans
66d7151787 update marshal list 2011-12-01 15:54:49 +01:00
Wim Taymans
892716e076 videoconvert: fix the transform_size function
The output size of a buffer does not depend on the input size but simply on the
caps of the output buffers. Don't let the base implementation deal with
unit_sizes, because input buffers might not be a multiple of that when they have
padding or non-default strides. instead, implement a transform size function
that simply calculate the natural size of an output buffer based on the caps.
2011-12-01 15:47:16 +01:00
Wim Taymans
92ac25bdb3 videometa: add copy functions
Without copy functions, the metadata is lost when we make a buffer copy such as
when we make a buffer writable.
2011-12-01 15:45:28 +01:00
Wim Taymans
e064f9dbf6 appsrc: fix negotiation
Remove old useless caps code.
Make a negotiate function and use the configured caps as the caps on the appsrc
pad. If nothing was configured, fall back to the parent implementation.
2011-12-01 15:38:10 +01:00
Stefan Sauer
0cce8ab97d adder: be more graceful in the clipfunction
Doing dynamic pipelines is hard in 0.10. As we don't have the sticky events in
0.10 and sending such events in special elements like adder and tee was outvoted
on last attempt, be graceful to the misbehaviour instead.
2011-12-01 12:03:17 +01:00
Tim-Philipp Müller
3c87d7dc77 tests: fix caps leak in audioresample tests 2011-12-01 01:22:19 +00:00
Tim-Philipp Müller
c58d4f54d6 tests: fix memory leak in basetime test 2011-12-01 01:07:26 +00:00
Tim-Philipp Müller
1bf8fa1e5f playbin2: tone down debug message about file URIs with spaces
Complain a bit less loudly about URIs that have not been
escaped properly.
2011-11-30 23:58:19 +00:00
Tim-Philipp Müller
e88e47cd24 Revert "alsasrc: Improve timestamp accuracy"
This reverts commit 0b774e0b7c.
2011-11-30 23:15:35 +00:00
Tim-Philipp Müller
e5ae553850 Revert "alsasrc: Fix some compilation errors"
This reverts commit 2b84f5bd74.
2011-11-30 23:15:22 +00:00
Tim-Philipp Müller
4cc8920db4 Revert "alsa: Remove unused but set variable"
This reverts commit e9aed7f31c.
2011-11-30 23:15:12 +00:00
Tim-Philipp Müller
1290f7de0e Revert "alsasrc: fail gracefully when ALSA does not give timestamps"
This reverts commit c7282a5718.
2011-11-30 23:15:03 +00:00
Tim-Philipp Müller
d11849114c Revert "alsasrc: handle the case where the drivers don't supply timestamps"
This reverts commit 8154b69112.
2011-11-30 23:14:54 +00:00
Stefan Sauer
6d167abdfa Revert "alsasrc: style fix"
This reverts commit f70ca6d4cb.
2011-11-30 23:14:44 +00:00
Sebastian Dröge
21b252727d playsinkconvertbin: Don't send undefined NEWSEGMENT events to the internal elements
This happens when the internal elements are added before any NEWSEGMENT
event arrived and in that case we shouldn't send a NEWSEGMENT event
to the internal elements at all. They will get the NEWSEGMENT event
from upstream later.
2011-11-30 14:25:11 +01:00
Edward Hervey
8274abcb69 tests: More fixes for moved interfaces 2011-11-30 11:34:23 +01:00
Edward Hervey
06fb926ff1 win32: update for API changes 2011-11-30 11:34:04 +01:00
Edward Hervey
e44db979f9 audio: Add audio-marshal.list to dist-ed files 2011-11-30 11:33:41 +01:00
Wim Taymans
47cbb230e9 audio: move audio interfaces
Move the audio related interfaces to the audio library.
2011-11-30 07:57:02 +01:00
Wim Taymans
552e825b4f fix includes for moved interfaces 2011-11-30 07:23:47 +01:00
Wim Taymans
4fb0f98bb9 encoding-profile: small cleanup in docs 2011-11-30 07:23:07 +01:00
Edward Hervey
5bc6ffcd8b video: Don't forget to install moved header files 2011-11-29 19:49:50 +01:00
Edward Hervey
a3b272f0a3 tests: More fixes for moved interfaces 2011-11-29 19:31:55 +01:00
Wim Taymans
871b306fce video: move some interfaces
Move some interfaces to the video library
2011-11-29 19:10:01 +01:00
Stefan Sauer
089c760993 adder: fill the audio-info that we use and not some random other one 2011-11-29 14:47:37 +01:00
Stefan Sauer
1cea9c851c adder: unbreak adder
There was one line too much removed when porting.
2011-11-29 14:22:19 +01:00
Sebastian Dröge
e7853d3a3d playbin2: Fix decoder-sink compatibility check for raw audio/video formats
If the sink supports raw audio/video, we first check
if the decoder could output any raw audio/video format
and assume it is compatible with the sink then. We don't
do a complete compatibility check here if converters
are plugged between the decoder and the sink because
the converters will convert between raw formats and
even if the decoder format is not supported by the decoder
a converter will convert it.

We assume here that the converters can convert between
any raw format.

Fixes bug #665120.
2011-11-29 14:15:45 +01:00
Stefan Sauer
9debd13665 adder: fix deadly setcaps recursion
Use a flag to avoid calling setcaps until our stack is exhausted. I don't see how this would be useful.
2011-11-29 10:42:16 +01:00