Mark Nauwelaerts
3a1a140e2d
avidemux: add some check and standardized seek event handling in push mode
2010-03-10 11:48:07 +01:00
Mark Nauwelaerts
d90aed1857
avidemux: fix offset handling in push mode seeking
...
Push mode seeking uses same index data as pull mode, and stores
offset to data in chunk, whereas push mode operates in chunks,
and as such needs offset consistently corresponding to chunk headers.
Also fix determining best matching stream for incoming newsegment event,
as well as setting some stream state accordingly.
2010-03-10 11:48:07 +01:00
Mark Nauwelaerts
172c0c6a6a
avidemux: reset some more stream state after seek
...
In particular, fixes non-flushing seek.
2010-02-16 15:03:59 +01:00
Robert Swain
dd23397b4f
avidemux: Drop video frames up to the desired keyframe after a seek
...
The audio packets in AVI are generally muxed ~0.5s before the
corresponding video packet. This changes causes downstream to only
receive packets with roughly corresponding timestamps.
2010-02-12 15:56:18 +01:00
Wim Taymans
1175d0698c
avidemux: more DISCONT handling
...
Add some debug in the DISCONT handling code.
When we receive a DISCONT in push mode, mark all streams as DISCONT.
2010-02-12 15:56:18 +01:00
Robert Swain
0011c9b0da
avidemux: Fix _handle_seek_push () and new segement behaviour
2010-02-12 15:56:18 +01:00
Wim Taymans
2ce79998a1
avidemux: cleanups
...
Make sure we reset the demuxer correctly wrt parsing the index.
Don't leak pending seek events.
Rename some methods to reflect what they do and to avoid confusion with similar
method names.
Try to make the seeking threadsafe by protecting the setup code with a lock.
Make sure we post errors when a seek fails.
2010-02-12 15:56:18 +01:00
Wim Taymans
e6cc145352
avidemux: rename some variables
...
seek_event -> seg_event
event_seek -> seek_event
2010-02-12 15:56:18 +01:00
Wim Taymans
784d888cb2
avidemux: take fallback duration from avih
...
When we have not parsed any indexes yet, we don't know the length of the streams
and we must take the length given in the avih as a fallback.
Avoid some typechecking.
2010-02-12 15:56:18 +01:00
Robert Swain
3e1ed0c727
avidemux: Push mode seeking support
2010-02-12 15:56:18 +01:00
Stefan Kost
ef343d8ad9
avi,wav: also handle JUNQ chunk in addition to JUNK
2010-02-12 15:35:30 +02:00
Wim Taymans
01f0a5ce32
avidemux: ignore streams that finished
...
When we receive an UNEXPECTED from a stream, move to the next stream and only go
EOS when all streams are EOS. When selecting a stream to push, ignore streams
that went EOS.
Fixes #607949
2010-01-26 11:22:56 +01:00
Wim Taymans
7d39f8e5bb
avidemux: don't parse NULL indexes
...
for some streams we might fail to fetch the index offsets. Don't try to parse
NULL indexes in those cases.
2010-01-21 17:59:25 +01:00
Wim Taymans
afc3c674c0
avidemux: skip RIFF and index in push mode
...
When we are in push mode, we can encounter RIFF and idx tags in the data chunk
when we are dealing with ODML files. In these cases, simply skip the chunks and
continue streaming instead of going EOS.
2010-01-20 11:47:04 +01:00
Wim Taymans
570319822a
avidemux: more DISCONT handling
...
Add some debug in the DISCONT handling code.
When we receive a DISCONT in push mode, mark all streams as DISCONT.
2010-01-20 11:47:04 +01:00
Wim Taymans
40e3b0189a
avidemux: reset on flush events
...
When we receive a flush event on the sinkpad, reset the EOS state and the
flowreturn of all streams. Also mark the streams with a DISCONT.
2010-01-20 11:47:03 +01:00
Wim Taymans
183d450113
avidemux: rename some variable
...
Rename the seek_event variable to seg_event because it really contains the
newsegment event that needs to be pushed.
2010-01-20 11:47:03 +01:00
Wim Taymans
fb716a6250
avidemux: avoid some typecasting
2010-01-15 18:15:14 +01:00
Wim Taymans
592b440911
avidemux: avoid some type checks
2010-01-15 18:13:24 +01:00
Wim Taymans
d4301d900f
avidemux: fallback to avih duration
...
when we have not yet parsed the indexes (in push mode, for example) use
the duration as given in the avih header instead of -1.
2010-01-15 18:09:15 +01:00
Stefan Kost
7e3783cbac
avi: add missing include for sscanf
2010-01-13 16:44:58 +02:00
Thiago Santos
5975b01b01
avimux: matroskamux: rename aac's stream-format to raw
...
AAC's none stream-format has been renamed to raw, rename
on avimux and matroskamux as well
2010-01-11 13:26:32 -03:00
Thiago Santos
bacd350483
avimux: Only accept raw aac
...
makes avimux reject aac streams that are not
in raw format (stream-format=none)
Fixes #598350
2010-01-11 12:32:27 -03:00
Thiago Santos
8e84d457b2
avidemux: Use more glib and be safer
...
Be safer on sscanf by limiting string format sizes.
Remove useless parameter and use g_strndup.
2010-01-08 11:33:02 -03:00
Thiago Santos
c0e184641a
avidemux: Simplifying code
...
Greatly simplify the IDIT chunk handling by using sscanf
instead of 'manually' parsing. Also replaces strncasecmp and
is_alpha/is_digit with glib versions.
2010-01-08 10:51:17 -03:00
Thiago Santos
7024ce14cf
avidemux: it's feb for february
...
Fix typo in last commit.
2010-01-08 10:18:30 -03:00
Thiago Santos
a5197a94ee
avidemux: Parse and post IDIT dates
...
Parses and post date tags contained in IDIT chunks.
Fixes #503582
2010-01-08 09:17:22 -03:00
Stefan Kost
fd9530d2d5
avimux: fix typo in warning message
2010-01-05 00:12:44 +02:00
Tim-Philipp Müller
1b786258c2
avidemux: minor debug message changes
...
Fix up a few debug messages so that it's clearer what they mean.
2009-12-13 12:51:13 +00:00
Wim Taymans
ee6d7fd2db
avidemux: init current_entry in push mode
...
Set the current_entry to 0 (instead of -1) in push mode so that we correctly
calculate the current frame number and timestamp.
Add some more debug info and fic the duration debug.
2009-12-04 13:52:49 +01:00
Thiago Santos
b59dc3e5fb
avimux: also set the suggested buf size for audio
...
We were only setting the suggested buf size for video,
we can set it for audio as well.
This and 195e14529d80ef318ce3a778c1995efb11f266cd
fix an issue that prevented seeking on large avi files
on WMP (non-recent versions).
2009-11-24 12:44:57 -03:00
Thiago Santos
831b1e958a
avimux: fix indx duration for PCM audio
...
GstBuffers for PCM audio usually contains more than
1 sample, we need to get the total number of samples to set
the indx duration.
2009-11-24 12:44:56 -03:00
Thiago Santos
8dd78015f1
avimux: Audio buffers should be picked earlier
...
Adds a 0.5s advantage for audio buffers to being
picked earlier for muxing.
2009-11-24 12:44:56 -03:00
Thiago Santos
feed8c2af3
avimux: do not write empty INFO list
...
avoid writing an empty INFO list chunk, both because
it is useless and because vlc refuses to play the
resulting file.
2009-11-05 12:31:56 -03:00
Wim Taymans
0c12f585e3
avidemux: use segment_full when we can
...
Use segment_full so that we can pass the applied rate to the segment values. We
will change the applied rate when we implement skip mode.
2009-10-27 18:07:18 +01:00
Michael Smith
b0b54d9324
Add dependencies of gstriff to things that link to gstriff, needed on Win32.
2009-10-23 18:09:43 -07:00
Tim-Philipp Müller
457ac565ba
avidemux: fix compilation with debugging disabled
...
total_idx is always evaluated.
2009-10-22 02:09:08 +01:00
Edward Hervey
683f2a02fb
avidemux: Stop scanning at the last entry... and not the one before :)
...
This ensures we actually push out everything
2009-10-20 18:23:28 +02:00
Edward Hervey
024f1bae0c
avidemux: MEMDUMP the junk blobs
...
It will only actually pull the junk blobs from upstream if the memdump
level is activated
2009-10-18 16:16:43 +02:00
Edward Hervey
1f5ace4de1
avidemux: Some avi files have INFO lists in the headers.
2009-10-18 16:16:43 +02:00
Edward Hervey
6e849f84fc
avidemux: Don't seek on empty streams
2009-10-18 16:16:43 +02:00
Edward Hervey
a6ed612f42
avidemux: Ensure _calculate_durations_from_index only uses valid streams
2009-10-18 16:15:08 +02:00
Edward Hervey
1936d6ed26
avidemux: Only call convert function if we have strf.auds
2009-10-18 16:15:08 +02:00
Edward Hervey
af99a4a1de
avidemux: Use first indexed stream for seeking.
...
In the future, main_stream can be adjusted to contain the optimal stream
as mentionned in the FIXME line 3440
2009-10-18 16:15:05 +02:00
Edward Hervey
2110cbe556
avidemux: Only expose streams that actually have something in it.
...
This guarantees that in pull-mode, all streams have a valid index to
work with.
2009-10-18 16:14:40 +02:00
Edward Hervey
546aa4c4dd
avidemux: Properly mark presence of index.
...
Instead of blindly saying we have an index, only do so if we have a
non-empty index.
2009-10-18 15:40:37 +02:00
Mark Nauwelaerts
8f2beb5e51
avimux: support (some) VBR audio muxing
...
AVI format can handle VBR audio provided audio chunks are of fixed duration
(cfr fixed duration video frames). Apply this approach to (always) parsed
raw AAC and (if parsed) to MPEG-1/2 audio.
See #368681 .
2009-10-16 17:31:02 +02:00
Mark Nauwelaerts
7ceeb14834
avidemux: adjust flow return aggregation to updated loop_data
...
In particular, each stream is now treated separately, and one stream's
EOS should not lead to overall EOS.
2009-10-15 21:32:08 +02:00
Mark Nauwelaerts
f071ff6993
avidemux: add missing argument in debug message
2009-10-15 11:26:09 +02:00
Mark Nauwelaerts
0141934eec
avidemux: use GstIndex for (limited) seeking in push mode
...
... but disable this for now. Although it basically works fine,
user experience might be shaky (depending on taste), since there
is no keyframe info in push mode.
2009-10-14 13:15:09 +02:00
Mark Nauwelaerts
35dc28d69a
avidemux: add GstIndex support
2009-10-14 13:15:06 +02:00
Mark Nauwelaerts
92dd51e511
avidemux: also determine duration in push mode
2009-10-14 13:15:04 +02:00
Wim Taymans
daa6d8f206
avidemux: demote some warnings to debug
2009-10-13 18:19:32 +02:00
Wim Taymans
9aa151a661
avi: add new avi flag we might want to use
2009-10-13 17:48:51 +02:00
Wim Taymans
df0335e65b
avimux: calculate suggested buffer size
...
Calculate the suggested buffer size based on the largest chunk in the file.
See #597847
2009-10-13 17:48:51 +02:00
Wim Taymans
b134ca31fa
avimux: add jpeg2000 to allowed caps
2009-10-13 17:48:51 +02:00
Wim Taymans
aea78a75ac
avidemux: add debug for the superindex offsets
2009-10-13 17:48:50 +02:00
Wim Taymans
50110d022d
avi: lower max file size
...
Make a constant of the max file size and lower the value to what ffmpeg does,
hopefully improving compatibility with windows media player.
See #597847
2009-10-13 13:08:33 +02:00
Josep Torra
28ccc40bab
avidemux: fix warning in macosx making the format portable
2009-10-09 11:43:44 +02:00
Jan Schmidt
cdb0b68e21
avi/wav: Fix some compiler warnings about incompatible pointers.
2009-10-08 10:20:09 +01:00
Robert Swain
c45c304a7e
Fix printf formats to avoid warnings in avidemux. Fixes #597214
...
https://bugzilla.gnome.org/show_bug.cgi?id=597214
2009-10-03 17:25:19 +02:00
Stefan Kost
458cd4dcdc
avi: don't misues perf-category and remove unused ext category
...
The performance category is meant to be used to audit codepaths that lead to bad
performance (e.g. copies, conversion that can be avoided).
Remove the event category which is not used.
2009-10-01 10:57:42 +03:00
Wim Taymans
3f263edbbf
avi: small cleanups
2009-09-28 22:18:25 +02:00
Wim Taymans
217315c20b
avi: fix timestamping in some audio streams
...
For vbr audio streams we need to use the number of blocks to calculate the
timestamps.
When the allocation of additional index memory fails, don't throw away what
we had before.
Various cleanups.
2009-09-28 22:17:02 +02:00
Wim Taymans
7b9b8343ba
avi: add support for ODML indexes again
2009-09-28 22:17:00 +02:00
Wim Taymans
ceb7d66e25
avi: implement index scanning
...
Implement scanning of the file when we can parse the index.
Some refactoring of common code.
Cleanups and comments.
Remove some reimplemented code.
Remove index massage code and put a FIXME where we should do something
equivalent later.
2009-09-28 22:16:57 +02:00
Wim Taymans
8aa3830852
avi: fix reverse playback
2009-09-28 22:16:55 +02:00
Wim Taymans
3338f91cfe
avi: fix prev keyframe search and cleanups
2009-09-28 22:16:53 +02:00
Wim Taymans
1b325945e5
avi: remove code that got converted
2009-09-28 22:16:50 +02:00
Wim Taymans
c199b1d039
avi: more cleanups
...
Remove some duplicate counters.
Be smarter when updateing the current the timestamp and offset in the stream
because we can reuse previously calculated values when simply go forward one
step.
Correctly set metadata on outgoing buffers.
2009-09-28 22:16:48 +02:00
Wim Taymans
0d70fe30a8
avidemux: small cleanups
2009-09-28 22:16:46 +02:00
Wim Taymans
b4a490655a
avi: fix read offset and cleanups
2009-09-28 22:16:43 +02:00
Wim Taymans
9c37611dfa
avi: rewrite index playback
...
disable code, start on reimplementing loop based operation.
Rewrite the index handling so that all streams use their own index for decoding
media.
2009-09-28 22:16:41 +02:00
Wim Taymans
89bcbbbe7c
avidemux: add new index parsing code
...
Add a new function and datastructure to parse and hold the index entries on a
per stream base. Also avoid doing too much work trying to figure out the
timestamps and durations as we can trivially do that later.
Less information in the entries makes them 2 times smaller and not doing too
much work makes this code about 12 times faster than the regular case.
Hook in the new function alongside the existing function for comparison until
the rest of the code is updated to handle the new index datastructure.
2009-09-28 22:16:38 +02:00
Alessandro Decina
195883b30a
Fix compile warnings with gcc 4.0.1.
2009-09-22 15:04:36 +02:00
Wim Taymans
10eb1a0ff4
avi: fix timestamps in push mode
2009-09-21 18:10:12 +02:00
Wim Taymans
2f26ee4285
avi: add some performance measurements
...
Measure the performance of various index and header parsing steps to the
PERFORMANCE debug category.
2009-09-21 12:32:51 +02:00
Stefan Kost
0868ddf30f
avidemux: some logging cleanup to help understanding the index parsing overhead
2009-09-18 14:27:45 +03:00
David Schleef
55d2754098
Remove Ronald Bultje from Authors field
...
Replaced with "GStreamer maintainers
<gstreamer-devel@lists.sourceforge.net>" or just removed,
depending on the number of other authors.
2009-09-05 20:53:10 -07:00
Mark Nauwelaerts
bb2b02c5b7
avidemux: push mode; cater for unusual chunk sizes
2009-08-31 16:50:00 +02:00
Mark Nauwelaerts
96e72522fc
avidemux: push mode; cater for chunk padding
2009-08-10 14:41:52 +02:00
Mark Nauwelaerts
f67db2a089
avidemux: only use stream's pad after having checked it exists
2009-08-10 14:41:34 +02:00
Mark Nauwelaerts
4249f52c6c
avidemux: sprinkle some more GST_DEBUG_FUNCPTR
2009-08-10 14:41:29 +02:00
Mark Nauwelaerts
6d26594eef
avidemux: post error message if no pads to push EOS event on
2009-08-10 14:41:27 +02:00
Mark Nauwelaerts
b0a0c06155
avidemux: fix typo in warning message
2009-08-10 14:41:23 +02:00
Mark Nauwelaerts
7750173244
avidemux: fix some buffer ref handling
2009-08-10 14:41:19 +02:00
Mark Nauwelaerts
5b0f7f04e7
avidemux: do not exceed maximum number of supported streams
2009-08-10 14:41:16 +02:00
Mark Nauwelaerts
effa7b4660
avidemux: prevent double unref; gst_avi_demux_parse_avih already unrefs
2009-08-10 14:41:14 +02:00
Mark Nauwelaerts
42bc085d95
avidemux: verify size of INFO LIST to satisfy subsequent expectations
2009-08-10 14:41:12 +02:00
Mark Nauwelaerts
f4f8e8532c
avidemux: check video stream framerate against avi header frame duration
...
The former might be bogus in silly cases, and the latter seems to
carry more weight.
2009-08-10 14:41:09 +02:00
Mark Nauwelaerts
3863871100
avidemux: streamline stream duration calculation
2009-08-10 14:41:07 +02:00
Sebastian Dröge
22d712786c
avidemux: Fix last commit and improve readability
2009-07-29 14:31:48 +02:00
Руслан Ижбулатов
3702fcdb80
Fixed the fix for TIME->DEFAULT conversion.
...
Fixes bug #578052 again.
2009-07-29 13:58:33 +02:00
Thiago Santos
52482a3741
avimux: adds support to wma
2009-07-28 00:30:43 -03:00
Thiago Santos
f43b442cf9
avimux: adds support to wmv
2009-07-28 00:07:15 -03:00
Sebastian Dröge
63115fe72c
avi: Don't forward NEWSEGMENT events from upstream
...
New ones are generated later and simply forwarding them can
result in NEWSEGMENT events of different format going downstream.
Fixes bug #587983 .
2009-07-09 07:14:23 +02:00
Philip Jgenstedt
0ebff2d14c
avidemux: Replace deprecated GST_DISABLE_DEBUG with correct macro. Fixes #587826
2009-07-06 10:40:31 +02:00
Edward Hervey
ff3730fb7b
avidemux: Removed unused variable
2009-06-25 08:09:57 +02:00
Tim-Philipp Müller
632bb7818a
avidemux: short-circuit gst_avi_demux_src_convert() when parsing the index
...
Don't call gst_avi_demux_src_convert() for each single index entry. Not
only do we already have the pointer to the stream context, we also know
the formats we want to convert from and to already, so we may just as
well use optimised conversion routines that bypass some of the checks
and lookups made in gst_avi_demux_src_convert().
2009-06-24 13:04:01 +01:00
Edward Hervey
4e6808bc52
avidemux: Sprinkle branch likeliness macros over the code.
2009-06-24 12:37:39 +02:00