Commit graph

556 commits

Author SHA1 Message Date
Stéphane Loeuillet
f49587b477 dummy change to make build bots compile ffmpeg
Original commit message from CVS:
dummy change to make build bots compile ffmpeg
2004-05-14 16:49:48 +00:00
Ronald S. Bultje
028d9567da ext/ffmpeg/: Fix up demuxer. Works now for all my files that I tried, even quicktime. I basically hack around the sup...
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_event),
(gst_ffmpegdemux_src_query), (gst_ffmpegdemux_src_convert),
(gst_ffmpegdemux_open), (gst_ffmpegdemux_loop):
* ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_open),
(gst_ffmpegdata_read), (gst_ffmpegdata_write),
(gst_ffmpegdata_seek):
Fix up demuxer. Works now for all my files that I tried, even
quicktime. I basically hack around the super-oversimplistic file
I/O handling in ffmpeg in several ways together, and I also hack
around the fairly annoying EOS-will-pause-the-source-element in
GStreamer itself.
This code is not pretty.
2004-05-14 14:11:00 +00:00
Jeremy Simon
f9536f9af1 ext/ffmpeg/gstffmpegcodecmap.c: block_align and bitrate caps property were lost for wma use codec_data instead of fla...
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_with_codecid):
block_align and bitrate caps property were lost for wma
use codec_data instead of flag1 and flag2
2004-05-11 16:07:14 +00:00
Benjamin Otte
c0e70cc4bc ext/ffmpeg/gstffmpegcodecmap.c: it's audio/x-wav, not video/x-wav
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_to_caps):
it's audio/x-wav, not video/x-wav
2004-05-11 01:54:59 +00:00
Stéphane Loeuillet
de518b6888 ext/ffmpeg/gstffmpegdec.c ext/ffmpeg/gstffmpegenc.c change plugins category to meet our new naming standard :
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c
* ext/ffmpeg/gstffmpegenc.c
change plugins category to meet our new naming standard :
Codec/Encoder|Decoder/Audio|Video
suggested by bilboed, approved by Company
2004-05-09 22:15:29 +00:00
Thomas Vander Stichele
e402f62bc6 require am17
Original commit message from CVS:
require am17
2004-05-04 16:49:31 +00:00
Thomas Vander Stichele
9bcee66929 ext/ffmpeg/gstffmpegcolorspace.c: revert previous patch
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_getcaps):
revert previous patch
2004-04-30 12:18:46 +00:00
Thomas Vander Stichele
acdea61ebc use GST_PAD_CAPS if they exist
Original commit message from CVS:
use GST_PAD_CAPS if they exist
2004-04-29 17:38:07 +00:00
Ronald S. Bultje
72333e34f6 ext/ffmpeg/gstffmpegcodecmap.c: WAV/IMA-ADPCM -> DVI ADPCM.
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_with_codecid), (gst_ffmpeg_caps_to_codecid):
WAV/IMA-ADPCM -> DVI ADPCM.
2004-04-23 00:49:10 +00:00
Benjamin Otte
16f5300aba ext/ffmpeg/gstffmpegcolorspace.c: use gst_caps_do_simplify
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcolorspace.c:
(gst_ffmpegcsp_caps_remove_format_info):
use gst_caps_do_simplify
2004-04-22 03:43:58 +00:00
Benjamin Otte
73c5b14aa7 ext/ffmpeg/gstffmpegdemux.c: reduce maximum probability in typefinding to POSSIBLE. prevents misidentification of my ...
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find):
reduce maximum probability in typefinding to POSSIBLE. prevents
misidentification of my mp3s as video/mpeg
2004-04-19 02:08:23 +00:00
Ronald S. Bultje
c5ebf6847f ext/ffmpeg/gstffmpegcolorspace.c: NULL -> (NULL) inside GST_ELEMENT_ERROR().
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_chain):
NULL -> (NULL) inside GST_ELEMENT_ERROR().
2004-04-16 02:06:23 +00:00
Ronald S. Bultje
d8f7d245f4 ext/ffmpeg/gstffmpegcodecmap.*: Change some function names to reflect that they don't really _return_ something, but ...
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_get_palette),
(gst_ffmpeg_set_palette), (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_pixfmt_to_caps), (gst_ffmpeg_caps_to_smpfmt),
(gst_ffmpeg_caps_to_pixfmt), (gst_ffmpeg_caps_with_codectype),
(gst_ffmpeg_caps_with_codecid), (gst_ffmpeg_caps_to_codecid):
* ext/ffmpeg/gstffmpegcodecmap.h:
Change some function names to reflect that they don't really
_return_ something, but rather _use_ something to fill a
AVCodecContext. s/to/with/. Restructure the extradata handling,
it's now not picking up the type from the caps but rather
using the type as provided in the function. This is a lot
cleaner. Implement MS RLE palette pickup.
* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_pad_link):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect):
Sync with the above function name changes.
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_close),
(gst_ffmpegdec_open), (gst_ffmpegdec_connect),
(gst_ffmpegdec_chain), (gst_ffmpegdec_change_state):
Add some hacks to convert palette-based raw image formats to
RGBA32. Ugly, but I don't know how else to handle palette-based
RGB, since img_convert() (and thus ffcolorspace) doesn't accept
a palette as argument.
2004-04-16 01:28:36 +00:00
Thomas Vander Stichele
5ce7edc931 updated snapshot
Original commit message from CVS:
updated snapshot
2004-04-14 15:27:20 +00:00
Ronald S. Bultje
009ca0c1f5 ext/ffmpeg/gstffmpegcodecmap.c: Add MS Video v1 (video/x-msvideocodec, CODEC_ID_MSVIDEO1).
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
Add MS Video v1 (video/x-msvideocodec, CODEC_ID_MSVIDEO1).
2004-04-11 21:40:01 +00:00
David Schleef
a4981be0fe ext/ffmpeg/gstffmpegcodecmap.c: Change variadic macro to ISO form. (bug #139460)
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
Change variadic macro to ISO form.  (bug #139460)
2004-04-09 06:20:31 +00:00
Benjamin Otte
50a9ae3608 ext/ffmpeg/: fix memleaks
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
fix memleaks
2004-04-06 18:25:55 +00:00
Benjamin Otte
825e3102bd configure.ac: fix --export-symblos-regex to a working regex.
Original commit message from CVS:
* configure.ac:
fix --export-symblos-regex to a working regex.
2004-04-04 23:31:07 +00:00
David Schleef
9d13ff6b53 ext/ffmpeg/gstffmpegdemux.c: Fix memleaks (bug #138985)
Original commit message from CVS:
reviewed by: David Schleef  <ds@schleef.org>
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):  Fix
memleaks (bug #138985)
2004-04-03 22:35:30 +00:00
Thomas Vander Stichele
7383aa1baa indent
Original commit message from CVS:
indent
2004-03-29 16:39:18 +00:00
Ronald S. Bultje
d5cfdabbd8 ext/ffmpeg/: Fix category.
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_base_init):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_base_init):
Fix category.
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_class_init),
(gst_ffmpegdemux_init), (gst_ffmpegdemux_close):
Slightly rewrite the init function, old one was ugly. Also remove
dispose function since it's obsolete, the change_state function
cleans up already. Also fixes segfault in test-app
gstreamer/tests/instantiate/create
2004-03-25 05:14:10 +00:00
Benjamin Otte
c9305d90a3 configure.ac: only export gst* symbols
Original commit message from CVS:
* configure.ac:
only export gst* symbols
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_chain):
change g_warning to debugging message, that wasn't a programming
error
2004-03-24 21:36:50 +00:00
Thomas Vander Stichele
0fc9489042 don't critical (#137588)
Original commit message from CVS:
don't critical (#137588)
2004-03-18 12:55:38 +00:00
Thomas Vander Stichele
3f060f82c6 bump nano to 1
Original commit message from CVS:
bump nano to 1
2004-03-16 13:15:07 +00:00
Thomas Vander Stichele
4e6f057f1e releasing
Original commit message from CVS:
releasing
2004-03-16 13:09:23 +00:00
Thomas Vander Stichele
db7d4a1d43 work on ppc
Original commit message from CVS:
work on ppc
2004-03-15 17:36:22 +00:00
Thomas Vander Stichele
879d56abc1 change static name
Original commit message from CVS:
change static name
2004-03-15 15:42:44 +00:00
Thomas Vander Stichele
b9d7a877e9 fix aclocal; ignore configure
Original commit message from CVS:
fix aclocal; ignore configure
2004-03-15 12:41:17 +00:00
Thomas Vander Stichele
44172d9f61 adding vorbis.m4
Original commit message from CVS:
adding vorbis.m4
2004-03-15 12:36:34 +00:00
Thomas Vander Stichele
4a3c767b58 commiting ogg.m4 to autotools.patch
Original commit message from CVS:
commiting ogg.m4 to autotools.patch
2004-03-15 12:29:18 +00:00
Thomas Vander Stichele
61896fa668 make sure -I m4 gets done correctly
Original commit message from CVS:
make sure -I m4 gets done correctly
2004-03-15 12:00:17 +00:00
Thomas Vander Stichele
792fc0a7a8 fix underquotedness, add freetype2.m4
Original commit message from CVS:
fix underquotedness, add freetype2.m4
2004-03-15 11:53:51 +00:00
Thomas Vander Stichele
636bd75cd7 adding sdl.m4 and imlib.m4 to autotools.patch
Original commit message from CVS:
adding sdl.m4 and imlib.m4 to autotools.patch
2004-03-15 11:43:15 +00:00
Thomas Vander Stichele
c2db5540c7 fixing autotools and noinst-programs patches
Original commit message from CVS:
fixing autotools and noinst-programs patches
2004-03-15 11:37:37 +00:00
Ronald S. Bultje
91b5e3f532 ext/ffmpeg/: Add encode property to codec mapper, so we can get better-fitting caps. Also use this everywhere. ;). La...
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
* ext/ffmpeg/gstffmpegcodecmap.h:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_chain),
(gst_ffmpegdec_register):
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_add),
(gst_ffmpegdemux_register):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect),
(gst_ffmpegenc_register):
* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_register):
Add encode property to codec mapper, so we can get better-fitting
caps. Also use this everywhere. ;). Lastly, add some new codecIDs
to our list of recognized ones.
2004-03-15 00:01:03 +00:00
Thomas Vander Stichele
97e285290b don't install programs
Original commit message from CVS:
don't install programs
2004-03-12 18:53:26 +00:00
Thomas Vander Stichele
64ac4e14e1 add m4 dir
Original commit message from CVS:
add m4 dir
2004-03-12 10:45:41 +00:00
Thomas Vander Stichele
75e99be355 remove imlib
Original commit message from CVS:
remove imlib
2004-03-12 10:35:59 +00:00
Thomas Vander Stichele
b51bb8f341 add hacking notes
Original commit message from CVS:
add hacking notes
2004-03-12 10:18:31 +00:00
Thomas Vander Stichele
87324f82f0 alright ! ready to test.
Original commit message from CVS:
alright ! ready to test.
need to write up how to manage the source now though
2004-03-11 18:21:34 +00:00
David Schleef
d83150b709 gst-libs/ext/ffmpeg/patch/asm.diff: Add a patch that decreases register usage. (bug #136658)
Original commit message from CVS:
* gst-libs/ext/ffmpeg/patch/asm.diff:  Add a patch that
decreases register usage.  (bug #136658)
2004-03-10 20:39:27 +00:00
David Schleef
79c332c4ba configure.ac: bump gstreamer API number to 0.8
Original commit message from CVS:
* configure.ac: bump gstreamer API number to 0.8
2004-03-10 18:52:29 +00:00
Ronald S. Bultje
1b37818530 ext/ffmpeg/Makefile.am: Prevent more symbol conflicts...
Original commit message from CVS:
* ext/ffmpeg/Makefile.am:
Prevent more symbol conflicts...
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
Up priority/rank for MPEG-4 decoder. Reason is simple: it's well-
tested and by far outperforms xviddec/divxdec. They'll get some
other, slightly lower, rank.
* gst-libs/ext/ffmpeg/patch/autotools.diff:
Tweaking...
* gst-libs/ext/ffmpeg/patch/disableinstalllibs.diff:
Prevent more symbol conflicts. I changed this (to pass 'make
distcheck') in the one patch, so need to change it here too.
* gst-libs/ext/ffmpeg/patch/disablemmx.diff:
Re-enable MMX. :).
* gst-libs/ext/ffmpeg/patch/functions.diff:
Bla.
2004-03-09 07:56:40 +00:00
Ronald S. Bultje
9399a4b087 configure.ac: Patch properly. Update version.
Original commit message from CVS:
* configure.ac:
Patch properly. Update version.
* gst-libs/ext/ffmpeg/Makefile.am:
Comment out patching - all handled by configure.
* gst-libs/ext/ffmpeg/Tag:
Update version.
* gst-libs/ext/ffmpeg/patch/autotools.diff:
Some small updates to improve compiling.
* gst-libs/ext/ffmpeg/patch/functions.diff:
Update date.
* gst-libs/ext/ffmpeg/patch/matroska.diff:
Newer patch - see ffmpeg-devel mailinglists.
* gst-libs/ext/ffmpeg/patch/function.patch:
Remove old cruft.
* gst-libs/ext/ffmpeg/patch/disabletools.diff:
Now handled by --disable-... in configure.
2004-03-09 06:15:35 +00:00
David Schleef
dde8754a27 ext/ffmpeg/gstffmpegcodecmap.c: Add cinepak format. (bug #136470)
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps):
Add cinepak format.  (bug #136470)
2004-03-07 22:02:15 +00:00
David Schleef
926a3caea2 configure.ac: Call ffmpeg's configure with --disable-v4l,
Original commit message from CVS:
* configure.ac:  Call ffmpeg's configure with --disable-v4l,
--disable-oss-audio, --disable-dv1394 (bug #127873)
2004-03-06 04:30:22 +00:00
Ronald S. Bultje
8800cd993d ext/ffmpeg/gstffmpegcodecmap.c: Fix quicktime type recognition in ffmpeg. We returned a bogus caps, which caused ffde...
Original commit message from CVS:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_to_caps):
Fix quicktime type recognition in ffmpeg. We returned a bogus
caps, which caused ffdemux_quicktime to be chosen over qtdemux.
This fixes that.
2004-03-05 02:40:34 +00:00
Ronald S. Bultje
c9b89b2fec configure.ac: Brackets cause autoconf errors. So remove them.
Original commit message from CVS:
* configure.ac:
Brackets cause autoconf errors. So remove them.
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_add):
Actually use the event/convert/query functions. D'oh.
2004-03-04 13:21:53 +00:00
Ronald S. Bultje
a8e810391f Slightly change the way we set this up. Ugly, but now it works again. This baby is looking for a proper fix.
Original commit message from CVS:
* configure.ac:
* gst-libs/ext/ffmpeg/Makefile.am:
Slightly change the way we set this up. Ugly, but now it works
again. This baby is looking for a proper fix.
* gst-libs/ext/ffmpeg/Tag:
Apparently CVS and me disagree on the tag... Ohwell, CVS wins.
* gst-libs/ext/ffmpeg/patch/autotools.diff:
* gst-libs/ext/ffmpeg/patch/disableinstalllibs.diff:
Slight nag on a link between lavf/lavc in ffmpeg. Not really
important for us since the code is the same in the end, but this
is actually correct from a per-patch point-of-view...
2004-03-03 01:54:18 +00:00
Ronald S. Bultje
094595c837 gst-libs/ext/ffmpeg/Makefile.am: Fix patching.
Original commit message from CVS:
* gst-libs/ext/ffmpeg/Makefile.am:
Fix patching.
2004-03-03 01:21:16 +00:00
Ronald S. Bultje
1abaeb885c ext/ffmpeg/gstffmpegdec.c: Fix B-frame DivX5/XviD display by removing the truncated flag when not needed.
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_connect):
Fix B-frame DivX5/XviD display by removing the truncated flag when
not needed.
* gst-libs/ext/ffmpeg/patch/autotools.diff:
Remove link to libavcodec - it causes symbol conflicts (why?).
2004-03-02 02:30:04 +00:00
Ronald S. Bultje
7b63c14e2b HACKING: Add some basic documentation on how our wrapping works.
Original commit message from CVS:
* HACKING:
Add some basic documentation on how our wrapping works.
* TODO:
Add a list of things that could be worked on or that need doing.
* configure.ac:
Update snapshot.
* ext/ffmpeg/Makefile.am:
Changne .la links. See below (autotools patch).
* ext/ffmpeg/gstffmpeg.c: (plugin_init):
Enable demuxers. See below (gstffmpegdemux.c).
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_to_caps):
Realmedia caused a crash - fix that.
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_averror),
(gst_ffmpegdemux_base_init), (gst_ffmpegdemux_init),
(gst_ffmpegdemux_close), (gst_ffmpegdemux_dispose),
(gst_ffmpegdemux_stream_from_pad),
(gst_ffmpegdemux_src_event_mask), (gst_ffmpegdemux_src_event),
(gst_ffmpegdemux_src_format_list),
(gst_ffmpegdemux_src_query_list), (gst_ffmpegdemux_src_query),
(gst_ffmpegdemux_src_convert), (gst_ffmpegdemux_add),
(gst_ffmpegdemux_open), (gst_ffmpegdemux_loop),
(gst_ffmpegdemux_change_state), (gst_ffmpegdemux_register):
Right. OK, so I fixed up the demuxing and have it basically-working,
and the best way to get some more people to test it is to actually
enable it. I'm not sure if we want this for 0.8.0, but we can at
least give it a try. I've tested avi, matroska and mpeg, all appear
to work. The cool thing is that this gives us instant support for
several exotic formats that we'd never care about ourselves. Again,
this needs more testing for it to still be enabled in 0.8.0, but I
want to give it a try...
* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_base_init),
(gst_ffmpegmux_init), (gst_ffmpegmux_request_new_pad),
(gst_ffmpegmux_connect), (gst_ffmpegmux_loop),
(gst_ffmpegmux_register):
Add some fixups that I use locally. Make it work in the case of
MPEG encoding, but the muxer is still not in shape to be enabled.
* ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_open),
(gst_ffmpegdata_read), (gst_ffmpegdata_write),
(gst_ffmpegdata_seek), (gst_ffmpegdata_close):
Some small fixups that crept into it while it was disabled for the
last few years. Basically works.
* gst-libs/ext/ffmpeg/Makefile.am:
Instead of having our local-autotoolized version, I patch the ffmpeg
source to be fully autotoolized. That means a simple SUBDIRS here
is now enough.
* gst-libs/ext/ffmpeg/Tag:
Version update.
* gst-libs/ext/ffmpeg/patch/autotools.diff:
Autotoolize ffmpeg. Needs to be sent to ffmpeg-devel@...
* gst-libs/ext/ffmpeg/patch/disableinstalllibs.diff:
Don't install their libs.
* gst-libs/ext/ffmpeg/patch/disablemmx.diff:
Don't use MMX. It cannot ocmpile using PIC.
* gst-libs/ext/ffmpeg/patch/disabletools.diff:
Don't compile/install their tools, we don't use them.
* gst-libs/ext/ffmpeg/patch/functions.diff:
Prevent symbol conflicts.
* gst-libs/ext/ffmpeg/patch/matroska.diff:
Add a matroska demuxer. Needs to be sent to ffmpeg-devel@...
2004-03-01 04:59:17 +00:00
Thomas Vander Stichele
8e7deaab80 releasing
Original commit message from CVS:
releasing
2004-02-26 18:21:44 +00:00
Thomas Vander Stichele
c1aac95ee4 fix spec file
Original commit message from CVS:
fix spec file
2004-02-14 14:01:15 +00:00
Christian Schaller
cd8c7deace adding spec file
Original commit message from CVS:
adding spec file
2004-02-14 11:46:48 +00:00
Thomas Vander Stichele
21f40a9a2f sandbox to get ffmpeg to play nicely in all cases
Original commit message from CVS:
sandbox to get ffmpeg to play nicely in all cases
2003-12-09 15:59:48 +00:00