Wim Taymans
4f9dea137f
Merge branch 'master' into 0.11
2011-10-28 11:34:37 +02:00
Thiago Santos
136f5b2690
oggmux: port to gstcollectpads2
2011-10-28 10:06:16 +02:00
Wim Taymans
f1088ed647
update for UNEXPECTED -> EOS flowreturn
2011-10-10 11:39:52 +02:00
Wim Taymans
e1287b97ab
Merge branch 'master' into 0.11
...
Conflicts:
ext/ogg/gstoggmux.c
gst-libs/gst/audio/audio.c
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/multichannel.h
gst-libs/gst/pbutils/Makefile.am
gst-libs/gst/pbutils/gstdiscoverer.c
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstplaysinkvideoconvert.c
win32/common/libgstaudio.def
2011-08-29 11:37:36 +02:00
Vincent Penquerc'h
fd218c4ec2
oggmux: fix leaks in skeleton writing
...
https://bugzilla.gnome.org/show_bug.cgi?id=563251
2011-08-25 08:32:26 +02:00
Vincent Penquerc'h
29038283bc
oggmux: generate message headers from received tags
...
Some message headers can be deduced from tags (eg, "Language").
https://bugzilla.gnome.org/show_bug.cgi?id=563251
2011-08-25 08:32:20 +02:00
Wim Taymans
232a5a3d0a
Merge branch 'master' into 0.11
...
Conflicts:
ext/ogg/gstoggmux.c
ext/vorbis/gstvorbisenc.c
2011-08-24 11:04:53 +02:00
Vincent Penquerc'h
2301f1806f
oggmux: add skeleton write support
...
Version written is 3.0
Base times are left empty for now.
Content-Type should be the MIME type of the stream. It is set to
the GStreamer media type for now, which is probably the same for
the streams oggmux supports.
https://bugzilla.gnome.org/show_bug.cgi?id=563251
2011-08-24 08:21:34 +02:00
Wim Taymans
5f359600ce
oggmux: fix compilation
2011-08-22 12:21:08 +02:00
Wim Taymans
ba41bb5ca7
Merge branch 'master' into 0.11
...
Conflicts:
ext/ogg/gstoggmux.c
gst/playback/gstplaysink.c
2011-08-18 19:36:50 +02:00
Vincent Penquerc'h
8304b7b40d
ogg: move the "always flush page" to oggstream
...
It avoids checking for specific media types in the muxer.
https://bugzilla.gnome.org/show_bug.cgi?id=656775
2011-08-18 11:16:50 +02:00
Vincent Penquerc'h
fd8434fc74
oggmux: use oggstream to decide which BOS packets to place first
...
Ogg recommends video BOS packets to be first.
Use the "is_video" flag in oggstream to select those, rather than
check for known mime types.
https://bugzilla.gnome.org/show_bug.cgi?id=656775
2011-08-18 11:16:19 +02:00
Vincent Penquerc'h
5bbf7109ec
ogg: rationalize serialno type to guint32
...
It is a 32 bit unsigned number.
Sure, the libogg API uses a long, but that's an unfortunate oversight.
https://bugzilla.gnome.org/show_bug.cgi?id=656775
2011-08-18 11:15:51 +02:00
Vincent Penquerc'h
684b90ba74
oggmux: factor the header packet creation code
...
https://bugzilla.gnome.org/show_bug.cgi?id=656775
2011-08-18 11:13:59 +02:00
Vincent Penquerc'h
3fe42b8e7e
oggmux: headers should always have granpos 0
...
https://bugzilla.gnome.org/show_bug.cgi?id=656775
2011-08-18 11:13:47 +02:00
Wim Taymans
e904c529e3
fix for _negotiated_caps() change
2011-08-15 12:18:15 +02:00
Josep Torra
5629ed74b3
Fix debug statements
...
Fixes build on MacOSX
Signed-off-by: Edward Hervey <edward.hervey@collabora.co.uk>
2011-08-10 11:15:41 +02:00
Wim Taymans
376164ab08
Merge branch 'master' into 0.11
2011-07-10 13:49:14 +02:00
David Schleef
a5323107d4
oggmux: check for EOS on both current and best pad
...
Oops, need both. Fixes #654270 .
2011-07-09 18:33:38 -07:00
David Schleef
2fa9bf2be5
oggmux: check for EOS on current pad, not best
...
Fixes #654270 .
2011-07-09 18:24:26 -07:00
Tim-Philipp Müller
dd56714b14
ffmpegcolorspace -> videoconvert
2011-07-07 23:59:59 +01:00
Wim Taymans
d06f599193
-base: port elements to new video caps
2011-06-16 12:52:13 +02:00
Wim Taymans
40d567153a
Merge branch 'master' into 0.11
2011-06-13 19:09:05 +02:00
David Schleef
ea0d666d11
oggmux: refactor how EOS is determined
...
This decreases the number of buffers held on each pad by one,
eliminating next_buffer. Simplifies the logic by relying solely
on CollectPads to let us know when a pad is in EOS. As a side
benefit, the collect pads related code is structured more like
other CollectPad users.
The previous code would occasionally mark the wrong pad as EOS,
causing the code to get in a state where all the streams were
finished, but EOS hadn't been sent to the source pad.
2011-06-10 23:54:07 -07:00
Wim Taymans
c88ee10c9b
Merge branch 'master' into 0.11
...
Conflicts:
ext/theora/gsttheoraenc.c
2011-06-06 16:27:12 +02:00
Mark Nauwelaerts
99944a5a81
oggmux: determine granulepos metadata using stream mapper whenever possible
...
... which unfortunately is not the case for all types, but at least so for
most common ones.
2011-06-06 13:02:49 +02:00
Mark Nauwelaerts
de1f593537
oggmux: convert incoming buffer timestamp to running time
...
... so all subsequent manipulation can take place in the proper timeline
without further ado.
2011-06-06 13:02:47 +02:00
Mark Nauwelaerts
2e7eddd35e
oggmux: remove superfluous code
...
... since there is nothing in oggstream that cares (or even should)
about granulepos for what is being asked from it.
2011-06-06 13:02:43 +02:00
Edward Hervey
266a9be400
oggmux: Use the GstPad (and not the GstOggPadData for GstPad functions
...
For those willing, renaming that 'pad' variable to something more obvious
would be nice to avoid such bugs...
2011-06-03 19:28:32 +02:00
Sebastian Dröge
884213b8b8
base: Update for SEGMENT event parse API changes
2011-05-18 17:23:18 +02:00
Sebastian Dröge
bcbf0488bf
ogg: Update for negotiation related API changes
2011-05-16 15:35:41 +02:00
Wim Taymans
94dfe80f71
-base: port to new SEGMENT API
2011-05-16 13:48:11 +02:00
Wim Taymans
7cad11e912
-base: fix for now request pad API
2011-05-10 16:44:37 +02:00
Wim Taymans
816f4e791d
segment: fix for new core API
...
Fix for gst_*_segment_full rename.
2011-05-09 18:16:46 +02:00
Wim Taymans
ec57868488
-base: don't use buffer caps
...
Port to newest 0.11 core API, remove GST_PAD_CAPS and GST_BUFFER_CAPS.
2011-05-09 13:05:12 +02:00
Sebastian Dröge
353186aec8
ext: Use G_DEFINE_TYPE instead of GST_BOILERPLATE
2011-04-19 14:22:42 +02:00
Sebastian Dröge
c8792778f8
Merge branch 'master' into 0.11
2011-04-16 16:06:26 +02:00
Vincent Penquerc'h
55e767b632
oggmux: prefer headers from caps to determine stream type
...
Ogg mandates the first header packet must determine a stream's type.
However, some streams (such as VP8) do not include such a header
when muxed in other containers, and thus do not include this header
as a buffer, but only in caps. We thus use headers from caps when
available to determine a new stream's type.
https://bugzilla.gnome.org/show_bug.cgi?id=647856
2011-04-16 11:55:27 +01:00
Sebastian Dröge
352edd1dd9
Merge branch 'master' into 0.11
2011-04-16 09:12:31 +02:00
Tim-Philipp Müller
be59789664
ogg: fix unused-but-set-variable warnings with gcc 4.6
...
https://bugzilla.gnome.org/show_bug.cgi?id=647294
2011-04-13 23:57:56 +01:00
Tim-Philipp Müller
8f1d77bc3c
oggmux: fix uninitialised variable usage and element leak
...
gcc on OSX complains about ret being used uninitialized in
this function, and it is right. Don't leak element ref
when returning early because newsegment event is not in
TIME format.
2011-04-12 12:41:06 +01:00
Wim Taymans
da1c863711
Merge branch 'master' into 0.11
...
Conflicts:
gst-libs/gst/tag/gstvorbistag.c
2011-04-04 11:31:33 +02:00
Josep Torra
cd425d3787
oggmux: fix warning building in mac os x
2011-04-01 15:47:18 +02:00
Sebastian Dröge
1c475f10e1
oggmux: Store the segment directly inside the pad
...
Also initialize it always in TIME format. We require TIME segments
in oggmux anyway and drop newsegment events in other formats and
assume an open-ended segment starting at 0.
2011-04-01 11:00:38 +02:00
Sebastian Dröge
fc56c76773
oggmux: Reset the segment on flush-stop events and when going back to READY
2011-04-01 10:58:09 +02:00
Thiago Santos
d1c74779f9
oggmux: Use running time instead of timestamps
...
Theora and vorbis use running time (which is correct) for calculating
the granulepos for their ogg packets. Oggmux, however, used
timestamps to order the received buffers.
This patch makes it use the running time to compare buffer times
and also to timestamp pushed buffers.
Some bits of the code still use timestamps, but they are only
used to calculate durations, so it should be fine.
https://bugzilla.gnome.org/show_bug.cgi?id=643775
2011-04-01 10:56:16 +02:00
Thiago Santos
c3aae3dc17
oggmux: Keep track of pad's segments
...
https://bugzilla.gnome.org/show_bug.cgi?id=643775
2011-04-01 10:56:15 +02:00
Wim Taymans
f379a5dacb
plugins: more porting to new memory API
2011-03-27 18:30:24 +02:00
Sebastian Dröge
a38fd9f9ec
oggmux: Increase the seen header packets count when seeing a header packet
...
This fixes muxing of Speex content and possibly other formats where the
header detection works by counting the packets.
Fixes bug #644745 .
2011-03-14 19:44:41 +01:00
Sebastian Dröge
461d9f2f2c
oggmux: Don't handle GstCollectData as GstObject, use the pad instead
2011-02-24 16:22:53 +01:00