Wim Taymans
e15651816e
Merge branch 'master' into 0.11
2011-05-17 16:13:59 +02:00
Debarshi Ray
4df5d896f0
matroskaparse: calculate segment duration after parsing all the IDs
...
Since the segment duration is given in terms of the
GST_MATROSKA_ID_TIMECODESCALE we should only convert it into
nanoseconds when we are sure that any scale specified in the file has
been read.
https://bugzilla.gnome.org/show_bug.cgi?id=650258
2011-05-17 09:03:50 +02:00
Wim Taymans
cf1248e566
Merge branch 'master' into 0.11
...
Conflicts:
configure.ac
2011-05-16 17:52:11 +02:00
Mark Nauwelaerts
8b910885ec
matroskademux: additional lock safety
...
Fixes #619590 .
2011-05-16 13:30:10 +02:00
Debarshi Ray
bdc464a778
matroskademux: calculate segment duration after parsing all the IDs
...
Since the segment duration is given in terms of the
GST_MATROSKA_ID_TIMECODESCALE we should only convert it into
nanoseconds when we are sure that any scale specified in the file has
been read.
https://bugzilla.gnome.org/show_bug.cgi?id=650258
2011-05-16 08:56:06 +02:00
Mark Nauwelaerts
fc94b78fe1
matroskamux: avoid building index when streamable
...
... as it will not be written anyway.
Fixes #648937 (?).
2011-05-04 13:12:16 +02:00
Wim Taymans
a1894ed363
Merge branch 'master' into 0.11
2011-04-25 11:38:28 +02:00
David Schleef
bddac50961
avimux,matroskamux: Add stream-format to h264 caps
...
Fixes #606662 .
2011-04-24 18:56:02 -07:00
Wim Taymans
7555d0949f
Merge branch 'master' into 0.11
...
Conflicts:
android/apetag.mk
android/avi.mk
android/flv.mk
android/icydemux.mk
android/id3demux.mk
android/qtdemux.mk
android/rtp.mk
android/rtpmanager.mk
android/rtsp.mk
android/soup.mk
android/udp.mk
android/wavenc.mk
android/wavparse.mk
configure.ac
2011-04-18 10:23:45 +02:00
Tim-Philipp Müller
c2bc6327cd
deinterlace, matroska: fix two variable-may-be-used-uninitialized compiler warnings
...
We use -DG_DISABLE_ASSERT for the pre-releases, which makes these
warnings pop up in cases that were previously covered by g_assert_not_reached()
and the like:
tvtime/greedyh.c:801:14: warning: 'scanline' may be used uninitialized in this function
matroska-mux.c:501:19: warning: 'context' may be used uninitialized in this function
2011-04-16 16:51:32 +01:00
Robert Swain
d596c2e926
matroska: Remove unused but set variables
...
GCC 4.6.x spits warnings about such variable usage.
2011-04-16 12:40:53 +01:00
David Schleef
41f3b30010
matroskademux: Better calculation of framerate
...
https://bugzilla.gnome.org/show_bug.cgi?id=647833
2011-04-15 12:27:57 +01:00
Sebastian Dröge
54349be39f
matroskaparse: Allow webm and matroska caps and don't leak caps
2011-04-14 13:27:27 +02:00
Tim-Philipp Müller
d3a24dc842
matroskademux: set stream-format=byte-stream on h264 caps if there's no codec data
...
https://bugzilla.gnome.org/show_bug.cgi?id=606662
2011-04-13 16:47:05 +01:00
Thibault Saunier
b541208b77
android: Make it ready for androgenizer
...
Remove the android/ top dir
Fixe the Makefile.am to be androgenized
To build gstreamer for android we are now using androgenizer which generates the needed Android.mk files.
Androgenizer can be found here: http://git.collabora.co.uk/?p=user/derek/androgenizer.git
2011-04-11 01:20:11 +02:00
Sebastian Dröge
cea556b75c
matroskamux: Add support for A-Law and µ-Law
...
Fixes bug #646567 .
2011-04-05 14:29:59 +02:00
Mark Nauwelaerts
dd19a7edad
matroskamux: use running time for synchronization
...
Fixes #432612 .
2011-03-22 20:55:37 +01:00
Sebastian Dröge
5b977c4fec
matroska: Mark tag mapping tables as static const
2011-03-16 09:39:20 +01:00
Sebastian Dröge
7db758164d
matroskamux: Use ARTIST instead of AUTHOR for GST_TAG_ARTIST
2011-03-16 09:39:20 +01:00
Sebastian Dröge
52aa27f997
matroskademux: Use ARTIST Matroska tag instead of AUTHOR for GST_TAG_ARTIST
...
AUTHOR only existed in an old version of the spec and ARTIST is
the new replacement for this. We are still reading both to still
be compatible with old files.
Fixes bug #644875 .
2011-03-16 09:39:20 +01:00
Andoni Morales Alastruey
0ed0174ea9
matroskamux: return TRUE from sink pad event function for tag events, which are handled
...
https://bugzilla.gnome.org/show_bug.cgi?id=644730
2011-03-14 17:08:46 +00:00
Edward Hervey
6e1c701502
Revert "Check that collectpads exists before removing pad"
...
This reverts commit 8e6b876e76
.
Depends on a core commit that was reverted
2011-02-21 12:25:19 +01:00
David Schleef
8e6b876e76
Check that collectpads exists before removing pad
...
The core now calls release pad from finalize, at which point
the collectpads might have already been freed.
2011-02-20 23:46:01 -08:00
David Schleef
e017e14847
matroskaparse: New element
...
Copied from demux. Duplicates much code, also some dead code
remaining.
2011-02-17 18:05:43 -08:00
David Schleef
eab982ce60
matroskademux: Earlier debug category initialization
2011-02-17 18:05:43 -08:00
Stefan Kost
8d5be2e8a4
matroskamux: rework _request_new_pad to handle explict req-pad-names
...
Don't ignore explicit pad-names.
2011-02-16 17:15:28 +02:00
Mark Nauwelaerts
d466f07def
matroskademux: avoid sorting NULL array of cluster positions
2011-02-14 17:57:33 +01:00
Mark Nauwelaerts
b70f4b6ffa
matroskademux: store cluster positions provided by SeekHead
...
... and use those, if available, to locate a cluster rather than scanning.
2011-02-10 18:17:31 +01:00
Mark Nauwelaerts
9de84b45bc
matroskademux: properly resume cluster scanning
...
... rather than getting offset tracking messed up, and then likely
failing a subsequent assert.
2011-02-09 16:27:00 +01:00
Ognyan Tonchev
0add79cbf1
matroskamux: don't leak ebml writer caps when re-using matroskamux
...
https://bugzilla.gnome.org/show_bug.cgi?id=640542
2011-01-26 08:51:04 +00:00
Mark Nauwelaerts
68fc03fd76
matroskademux: pull mode should always report seekable
...
... as it no longer requires an index, but can seek by scanning as well.
2011-01-24 22:24:28 +01:00
Mark Nauwelaerts
0124302b58
matroskamux: avoid creating caps from string when possible
...
Fixes #639516 .
2011-01-14 16:25:14 +01:00
Tim-Philipp Müller
68fa8f3417
matroska: don't put essential function calls into g_assert()
...
g_assert() will expand to NOOPs if -DG_DISABLE_ASSERT is passed.
2011-01-07 02:06:51 +00:00
Stefan Kost
a570310cdc
matroska-demux: remove unused variables when debug-logging disabled
2011-01-03 20:17:47 +02:00
Tim-Philipp Müller
3a66829087
matroska-demux: increase allowed max. block size for push mode from 10M to 15M
...
It was an arbitrary limit from the start, meant as a basic sanity check,
so may just as well increase it a little. Would be good to provide
progress reporting while completing the block in any case..
https://bugzilla.gnome.org/show_bug.cgi?id=637060
2010-12-29 23:38:18 +00:00
Tim-Philipp Müller
c8fc90fd37
matroska-demux: assume matroska if no doctype is specified
...
https://bugzilla.gnome.org/show_bug.cgi?id=638019
2010-12-29 23:09:04 +00:00
Rob Clark
02cb1dd7b5
matroska-demux: add stream-format and alignment properties for h264
2010-12-23 16:12:51 -06:00
Sebastian Dröge
1d74f568a3
matroskademux: Don't use gst_pad_alloc_buffer()
...
Using this in a demuxer will cause deadlocks if there's
a pad with a pending pad-block downstream, no matter if
there is a queue between the pad or not. Queues pass
bufferalloc downstream from the same thread and only
act as a thread boundary for events and buffers.
2010-12-22 20:01:16 +01:00
Tim-Philipp Müller
331bcfbdfc
matroskamux: fix subtitle pad template, we only handle kate for now
2010-12-22 14:14:08 +00:00
Tim-Philipp Müller
d73440cb97
matroska-demux: put unrecognised RIFF format IDs into the unknown caps
...
Extra info can't hurt. Field names aren't necessarily consistent with
what's used elsewhere though (e.g. avidemux), but then neither are the
caps.
https://bugzilla.gnome.org/show_bug.cgi?id=623178
2010-12-11 14:53:28 +00:00
Andoni Morales Alastruey
fd6bc949c8
matroskamux: try to write timestamps in all the outgoing buffers
...
Fixes #632654 .
2010-12-06 13:01:17 +01:00
Mark Nauwelaerts
b9048fd953
matroskademux: minor cleanups in setting streamheader on caps
2010-12-03 15:50:30 +01:00
Mark Nauwelaerts
7be2ee8710
matroskademux: normalize empty Cues to no Cues
...
... to trigger indexless seeking.
2010-12-03 15:50:30 +01:00
Sebastian Dröge
d9a1f3d628
matroskamux: Add support for E-AC3
2010-12-02 19:18:02 +01:00
Sebastian Dröge
01c4117037
matroskamux: Add support for DTS
2010-12-02 19:18:02 +01:00
Philip Jägenstedt
7fcd7d8cf2
matroskademux: Remove useless clearing of send_xiph_headers for Dirac
...
This looks like a mistake when copy-pasting the Theora code.
https://bugzilla.gnome.org/show_bug.cgi?id=632682
2010-10-23 16:10:14 +01:00
Philip Jägenstedt
6cf398cdf3
matroskademux: don't crash if vorbis/theora codec data is missing
...
Error out properly in this case instead of crashing.
https://bugzilla.gnome.org/show_bug.cgi?id=632682
2010-10-23 14:05:46 +01:00
Mark Nauwelaerts
4085f12058
ac3: demuxers provide framed output
2010-10-14 17:29:26 +02:00
Tim-Philipp Müller
7a8ebc4a79
matroskamux: reduce newsegment event spam and set discont flag where needed
...
Only send newsegment events with new positions downstream when actually
needed, instead of sending multiple newsegment events with new seek
positions in a row. Also set the discont flag on buffers after a
discontinuity.
2010-10-14 14:00:59 +01:00
Tim-Philipp Müller
84e47e579b
matroskamux: set correct buffer offsets after seeks
...
Re-use the existing 'pos' field maintained by ebml writer to set
buffer offsets. This also makes sure that we set the right offsets
on buffers after a seek (e.g. when writing an index at the end).
2010-10-14 12:48:33 +01:00
Tim-Philipp Müller
6ff3dfe946
matroskamux: don't forward tag events downstream
...
Don't forward stream-specific tag events downstream (esp. not
before any newsegment event).x
2010-10-14 12:48:00 +01:00
Stefan Kost
d8167e3071
various (gst): add a missing G_PARAM_STATIC_STRINGS flags
2010-10-13 18:00:28 +03:00
Zaheer Abbas Merali
6f0030f701
matroskamux: make buffer offsets a byte count rather than a buffer count
2010-10-13 07:17:24 +01:00
Zaheer Abbas Merali
f012ab67cc
matroskamux: set offsets on outgoing buffers
2010-10-10 14:44:43 +01:00
Mark Nauwelaerts
bb9a8a9b7d
matroskademux: only unref buffer when no longer needed for cluster scanning
...
Fixes #629047 .
2010-10-05 16:03:10 +02:00
Mark Nauwelaerts
e0d11f0644
matroskademux: avoid infinite cluster scanning
2010-10-05 16:03:08 +02:00
Arun Raghavan
9e786de9c8
matroskademux: Use pbutils for H.264 profile/level extraction
...
The functions used to extract this data have been moved to gstpbutils to
facilitate reuse.
https://bugzilla.gnome.org/show_bug.cgi?id=617318
2010-10-01 16:58:46 +01:00
Mark Nauwelaerts
91a60245b7
matroskademux: QoS handling logic only applies to forward playback
...
Fixes #628894 .
2010-09-08 17:51:34 +02:00
Mark Nauwelaerts
13b553bce7
matroskademux: attempt more resync upon (cluster) parse error
...
That is, if parse error occurs in state requiring to move to next cluster,
and doing so to the expected next position of cluster fails, then scan for a
next cluster from present position and resume from there.
Fixes #620790 .
2010-09-06 14:45:40 +02:00
Mark Nauwelaerts
4d9c1e99f2
matroskademux: not so fatal error handling
...
If some bits out of place in block(group) parsing, forego and move to next.
Also skip large blocks in pull mode, but need to give up in push mode.
Fixes #626463 .
Improves #620790 .
2010-09-06 14:45:37 +02:00
Mark Nauwelaerts
680eb51b68
matroskademux: additional parse recovery
...
In particular, upon parse failure in one cluster, we may forego remaining
content and try resuming from next cluster onwards.
Fixes #620790 .
2010-09-06 14:45:30 +02:00
Pavel Kostyuchenko
6940559c46
matroskademux: Relax parsing of date tags
...
Before we required a complete date in matroskademux but in
id3demux for example only the year or year and month was possible too.
Fixes bug #628454 .
2010-09-04 14:52:11 +02:00
Sebastian Dröge
e8743b3789
matroskademux: Don't use GST_FLOW_IS_FATAL()
2010-09-04 14:52:09 +02:00
Mark Nauwelaerts
8419df627b
matroskademux: proper handling of streaming upstream without duration
...
Fixes #625371 .
2010-07-28 14:45:25 +02:00
Tim-Philipp Müller
a0de5e8a4f
matroskademux: initialize some variables to fix compiler warnings on OSX build bot
2010-07-26 18:33:09 +02:00
Mark Nauwelaerts
c626e90fda
matroskademux: pull mode non-cue seeking
...
That is, in files that have no index (Cue), perform seek by scanning for
nearest cluster with timecode before requested position. Scanning is done
as a combination of interpolation and sequential scan.
Fixes #617368 .
2010-07-22 12:18:14 +02:00
Mark Nauwelaerts
4b76e95abe
matroskamux: streamable files need no _finish
...
Fixes #624455 .
2010-07-22 12:18:11 +02:00
Tim-Philipp Müller
819fb47b78
matroskamux: demote WARNING message to LOG level
...
It's not a warning.
2010-07-20 16:12:21 +01:00
Mark Nauwelaerts
fd959ca77f
matroskademux: add missing argument in debug message
2010-07-16 18:05:21 +02:00
Mark Nauwelaerts
39268f10d3
matroskademux: remove bogus UNLOCK
2010-07-16 14:00:40 +02:00
Mark Nauwelaerts
16b57b49c9
matroskademux: handle bogus files storing ADTS AAC data
2010-07-16 13:59:22 +02:00
Mark Nauwelaerts
18f37ffc9a
matroskademux: do not error out on a block with unknown tracknumber
2010-07-16 13:58:39 +02:00
Sebastian Dröge
8172c478aa
matroskamux: Fix leaking of the streamheader buffers
...
gst_value_set_buffer() increases the refcount and doesn't
take ownership of the buffer.
2010-06-25 19:40:06 +02:00
Tim-Philipp Müller
19216e7218
matroska, videobox, videofilter: fix compiler warnings when debugging is disabled in gstreamer
...
Fixes unused variable warnings when GStreamer's debugging system has been disabled.
2010-06-24 16:34:03 +01:00
Sebastian Dröge
968ce701a7
matroskademux: Fix an uninitialized variable compiler warning
2010-06-17 10:44:33 +02:00
Sebastian Dröge
f44e5e630b
ebml-read: Zero-sized ints/uints/floats have a value of 0 according to the EBML spec
2010-06-16 21:02:13 +02:00
Sebastian Dröge
e4a5f0911e
matroskademux: Fix possible NULL pointer dereference and assertion that could be caused by invalid files
2010-06-16 20:02:58 +02:00
Sebastian Dröge
20b9022289
matroskademux: Clean up/fix some minor error handling bugs
2010-06-16 19:50:34 +02:00
Edward Hervey
342543325b
matroska: Fix unitialized variable
2010-06-15 17:20:20 +02:00
Zaheer Abbas Merali
e49c31fd25
matroskamux: revert change that set a reserved flag on the Block.
...
So matroska's Block structure has no keyframe flag, only the SimpleBlock has it.
To detect keyframes in Blocks, it is just the BlockGroup container that needs
to have a ReferenceBlock attached if it is a delta frame in video.
2010-06-14 14:28:53 +01:00
Zaheer Abbas Merali
823a514161
matroskamux: some non-delta buffers were not marked as keyframes
2010-06-10 01:32:15 +02:00
Zaheer Abbas Merali
45f711044f
matroskamux: change 2 second limit per cluster
...
Start cluster at every keyframe or when we would overflow the previous
cluster's relative timestamp field. This would avoid as much as possible
starting clusters at non-keyframes.
2010-06-10 01:32:15 +02:00
Zaheer Abbas Merali
f22c7d0f7c
matroskamux: change indexed property to streamable
...
The property streamable has reverse semantics to indexed.
2010-06-09 15:42:19 +02:00
Philip Jägenstedt
21c84e23e8
matroskademux: refactor delta unit handling
...
This allows us to skip delta units earlier and is a bit clearer in my
opinion. It also makes only video buffers ever be delta units, not
just for SimpleBlock as before.
2010-06-06 15:38:00 +02:00
Philip Jägenstedt
b2ff8042d3
matroskademux: Ignore keyframe flag for non-video streams
...
When the keyframe bit of SimpleBlock Flags wasn't set, the buffer was being
marked with GST_BUFFER_FLAG_DELTA_UNIT, causing all buffers to be skipped
after a seek. This may be a problem with the Sorenson Squish encoder, but
arguably the keyframe bit should only be applied to video.
Fixes bug #620358 .
2010-06-06 14:59:29 +02:00
Zaheer Abbas Merali
bfaeffcfd0
matroskamux: Remove more unneeded warnings
2010-06-01 16:56:32 +01:00
Zaheer Abbas Merali
7fc21317af
matroskamux: remove unneeded warning
2010-06-01 16:54:03 +01:00
Zaheer Abbas Merali
d73cecd8c0
matroskamux: remove unneeded debug statement
2010-06-01 16:49:14 +01:00
Zaheer Abbas Merali
8c165b49a7
matroskamux: change is-live property to indexed
2010-06-01 16:43:04 +01:00
Zaheer Abbas Merali
3d876d2b16
matroska: use the uint64 scaling functions
...
In demuxer and muxer use the gst_util_uint64 scaling functions rather than
standard integer division. Add warnings (to be changed to debug) for debugging
the timestamp and duration.
2010-06-01 16:43:04 +01:00
Zaheer Abbas Merali
ec23b22d29
matroskamux: set delta unit on all buffers except cluster start ones
2010-06-01 16:43:04 +01:00
Zaheer Abbas Merali
d3daa12473
matroskamux: store caps and set on buffers rather than using pad caps
2010-06-01 16:43:03 +01:00
Zaheer Abbas Merali
b4e6fcd051
matroskamux: make sure pads caps are set before any buffers pushed.
2010-06-01 16:43:03 +01:00
Zaheer Abbas Merali
7c402d5866
matroskamux: add streamheaders
2010-06-01 16:43:03 +01:00
Zaheer Abbas Merali
d0bf310876
matroskamux: no need to set cache twice
2010-06-01 16:43:03 +01:00
Xavier Queralt
40eda471a1
Do not create a SeekHeader, Cues, .. when doing live
2010-06-01 16:43:03 +01:00
Xavier Queralt
032d9b90ff
Add is-live property
2010-06-01 16:43:02 +01:00
Mark Nauwelaerts
44fa95d5cb
matroskademux: improve reverse playback
...
Slightly modify approach to also handle cases where cue entries do not reliably
lead to initial keyframes.
Fixes #619817 .
2010-06-01 15:56:34 +02:00
Mark Nauwelaerts
b8fd1a91f1
matroskamux: use write caching also when writing buffer data
...
Specifically, this reduces pushing several small buffers for each
data buffer and also avoids a seek for each buffer altogether
(though a seek is still needed for each cluster).
Fixes #619273 .
2010-06-01 15:54:35 +02:00
Mark Nauwelaerts
81bf657aa7
matroskamux: fix ebml write caching with bytewriter implementation
...
Also cache a bit more during header writing.
Fixes #619273 .
2010-06-01 15:53:43 +02:00