From 9003ed34ba8e694b44433597c890affac369c368 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 1 Jan 2004 22:45:57 +0000 Subject: configure.ac: Fix configure check for mpeg2enc. We need 1.6.1.93 instead of 1.6.1.92, since the pkg-config file of 1.... Original commit message from CVS: 2004-01-01 Ronald Bultje * configure.ac: Fix configure check for mpeg2enc. We need 1.6.1.93 instead of 1.6.1.92, since the pkg-config file of 1.6.1.92 is borked and it therefore uses the wrong include paths. Too bad... Note that 1.6.1.93 is not release yet. ;). Also add a check for mplex, which is now using the lib'ified mplex from mjpegtools, too. * ext/ffmpeg/gstffmpegcodecmap.c: Add codec_tag for 3ivx/xvid. For xvid, this should fix playback issues. I don't think ffmpeg handles 3ivx correctly, so this probably won't work. But it won't hurt either. * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_connect), (gst_ffmpegdec_chain): * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect), (gst_ffmpegenc_chain_audio): Fix memleak in audio encoding. Close codec if open fails, this calls the cleanup routines so we can re-use the context. * ext/mpeg2enc/gstmpeg2enc.cc: Fix pad template names/types, fix memory issue with getcaps(). * ext/mpeg2enc/gstmpeg2encoder.cc: * ext/mpeg2enc/gstmpeg2encoder.hh: Fix compile issue with new caps system (const thingy). * ext/mpeg2enc/gstmpeg2encpicturereader.cc: * ext/mpeg2enc/gstmpeg2encpicturereader.hh: We read a first frame right on initing, so that we have a caps when we init the output. This caps is cached in padprivate and read as first frame. * ext/mplex/Makefile.am: * ext/mplex/gstmplex.cc: * ext/mplex/gstmplex.h: * ext/mplex/gstmplex.hh: * ext/mplex/gstmplexibitstream.cc: * ext/mplex/gstmplexibitstream.hh: * ext/mplex/gstmplexjob.cc: * ext/mplex/gstmplexjob.hh: * ext/mplex/gstmplexoutputstream.cc: * ext/mplex/gstmplexoutputstream.hh: We wrap mjpegtools mplex. So I rewrote the plugin. The old plugin had issues, didn't do capsnego, supported only a subset of the mplex features and required a mplex fork in our local CVS. Plus that it worked agaist a very old mplex version. Rewriting was faster than updating it. * gst-libs/ext/Makefile.am: * gst-libs/ext/mplex/INSTRUCT: * gst-libs/ext/mplex/Makefile.am: * gst-libs/ext/mplex/README: * gst-libs/ext/mplex/TODO: * gst-libs/ext/mplex/ac3strm_in.cc: * gst-libs/ext/mplex/audiostrm.hh: * gst-libs/ext/mplex/audiostrm_out.cc: * gst-libs/ext/mplex/aunit.hh: * gst-libs/ext/mplex/bits.cc: * gst-libs/ext/mplex/bits.hh: * gst-libs/ext/mplex/buffer.cc: * gst-libs/ext/mplex/buffer.hh: * gst-libs/ext/mplex/fastintfns.h: * gst-libs/ext/mplex/format_codes.h: * gst-libs/ext/mplex/inputstrm.cc: * gst-libs/ext/mplex/inputstrm.hh: * gst-libs/ext/mplex/lpcmstrm_in.cc: * gst-libs/ext/mplex/mjpeg_logging.cc: * gst-libs/ext/mplex/mjpeg_logging.h: * gst-libs/ext/mplex/mjpeg_types.h: * gst-libs/ext/mplex/mpastrm_in.cc: * gst-libs/ext/mplex/mpegconsts.cc: * gst-libs/ext/mplex/mpegconsts.h: * gst-libs/ext/mplex/mplexconsts.hh: * gst-libs/ext/mplex/multplex.cc: * gst-libs/ext/mplex/outputstream.hh: * gst-libs/ext/mplex/padstrm.cc: * gst-libs/ext/mplex/padstrm.hh: * gst-libs/ext/mplex/stillsstream.cc: * gst-libs/ext/mplex/stillsstream.hh: * gst-libs/ext/mplex/systems.cc: * gst-libs/ext/mplex/systems.hh: * gst-libs/ext/mplex/vector.cc: * gst-libs/ext/mplex/vector.hh: * gst-libs/ext/mplex/videostrm.hh: * gst-libs/ext/mplex/videostrm_in.cc: * gst-libs/ext/mplex/videostrm_out.cc: * gst-libs/ext/mplex/yuv4mpeg.cc: * gst-libs/ext/mplex/yuv4mpeg.h: * gst-libs/ext/mplex/yuv4mpeg_intern.h: * gst-libs/ext/mplex/yuv4mpeg_ratio.cc: We don't fork mjpegtools' mplex in our CVS anymore. * gst/avi/gstavidemux.c: (gst_avi_demux_src_getcaps), (gst_avi_demux_add_stream): * gst/avi/gstavidemux.h: Add getcaps() function for proper caps nego. This makes some parts of AVI playback/reading work. * sys/ximage/ximagesink.c: (gst_ximagesink_sinkconnect): Resize window on new capsnego. This is probably wrong, but I'm still committing it because with current capsnego, the first successfull capsnego is auto-fixated, therefore rounded down to the lowest values in the caps. this results in a 16x16 XWindow that is not reized when real capsnego finishes. Dave, I see more cases of this, do you know a proper solution? * tools/gst-launch-ext.in: Fix MPEG-4 AAC (Apple iPod/iTunes) file commandline. --- ext/mpeg2enc/gstmpeg2enc.cc | 18 ++++++++++++------ ext/mpeg2enc/gstmpeg2encoder.cc | 2 +- ext/mpeg2enc/gstmpeg2encoder.hh | 2 +- ext/mpeg2enc/gstmpeg2encpicturereader.cc | 9 ++++++--- ext/mpeg2enc/gstmpeg2encpicturereader.hh | 2 +- 5 files changed, 21 insertions(+), 12 deletions(-) (limited to 'ext/mpeg2enc') diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc index 71a41ade..bee6a9b0 100644 --- a/ext/mpeg2enc/gstmpeg2enc.cc +++ b/ext/mpeg2enc/gstmpeg2enc.cc @@ -89,7 +89,7 @@ src_templ (void) NULL); add_fps (caps); - templ = gst_pad_template_new ("sink", GST_PAD_SINK, + templ = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS, caps); } @@ -205,14 +205,15 @@ static void gst_mpeg2enc_init (GstMpeg2enc *enc) { GstElement *element = GST_ELEMENT (enc); + GstElementClass *klass = GST_ELEMENT_GET_CLASS (element); enc->sinkpad = gst_pad_new_from_template ( - gst_element_get_pad_template (element, "sink"), "sink"); + gst_element_class_get_pad_template (klass, "sink"), "sink"); gst_pad_set_link_function (enc->sinkpad, gst_mpeg2enc_sink_link); gst_element_add_pad (element, enc->sinkpad); enc->srcpad = gst_pad_new_from_template ( - gst_element_get_pad_template (element, "src"), "src"); + gst_element_class_get_pad_template (klass, "src"), "src"); gst_pad_set_getcaps_function (enc->srcpad, gst_mpeg2enc_src_getcaps); gst_element_add_pad (element, enc->srcpad); @@ -229,7 +230,12 @@ gst_mpeg2enc_loop (GstElement *element) GstMpeg2enc *enc = GST_MPEG2ENC (element); if (!enc->encoder) { - GstCaps *caps; + const GstCaps *caps; + GstData *data; + + /* make sure we've had data */ + data = gst_pad_pull (enc->sinkpad); + gst_pad_set_element_private (enc->sinkpad, data); if (!(caps = GST_PAD_CAPS (enc->sinkpad))) { gst_element_error (element, @@ -281,8 +287,8 @@ gst_mpeg2enc_src_getcaps (GstPad *pad) return enc->encoder->getFormat (); } - return (GstCaps* ) gst_pad_template_get_caps ( - gst_element_get_pad_template (gst_pad_get_parent (pad), "src")); + return gst_caps_copy (gst_pad_template_get_caps ( + gst_element_get_pad_template (gst_pad_get_parent (pad), "src"))); } static void diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc index b1c2b8ef..f5b2ee4b 100644 --- a/ext/mpeg2enc/gstmpeg2encoder.cc +++ b/ext/mpeg2enc/gstmpeg2encoder.cc @@ -37,7 +37,7 @@ GstMpeg2Encoder::GstMpeg2Encoder (GstMpeg2EncOptions *options, GstPad *sinkpad, - GstCaps *caps, + const GstCaps *caps, GstPad *srcpad) : MPEG2Encoder (*options) { diff --git a/ext/mpeg2enc/gstmpeg2encoder.hh b/ext/mpeg2enc/gstmpeg2encoder.hh index ebe29692..df034e6b 100644 --- a/ext/mpeg2enc/gstmpeg2encoder.hh +++ b/ext/mpeg2enc/gstmpeg2encoder.hh @@ -31,7 +31,7 @@ class GstMpeg2Encoder : public MPEG2Encoder { public: GstMpeg2Encoder (GstMpeg2EncOptions *options, GstPad *sinkpad, - GstCaps *caps, + const GstCaps *caps, GstPad *srcpad); /* one image */ diff --git a/ext/mpeg2enc/gstmpeg2encpicturereader.cc b/ext/mpeg2enc/gstmpeg2encpicturereader.cc index 1c8e9f4c..004495e7 100644 --- a/ext/mpeg2enc/gstmpeg2encpicturereader.cc +++ b/ext/mpeg2enc/gstmpeg2encpicturereader.cc @@ -32,7 +32,7 @@ */ GstMpeg2EncPictureReader::GstMpeg2EncPictureReader (GstPad *in_pad, - GstCaps *in_caps, + const GstCaps *in_caps, EncoderParams *params) : PictureReader (*params) { @@ -91,9 +91,12 @@ GstMpeg2EncPictureReader::LoadFrame () guint8 *frame; do { - if (!(data = gst_pad_pull (pad))) { + if ((data = (GstData *) gst_pad_get_element_private (pad))) { + gst_pad_set_element_private (pad, NULL); + } else if (!(data = gst_pad_pull (pad))) { return true; - } else if (GST_IS_EVENT (data)) { + } + if (GST_IS_EVENT (data)) { if (GST_EVENT_TYPE (data) == GST_EVENT_EOS) { gst_pad_event_default (pad, GST_EVENT (data)); return true; diff --git a/ext/mpeg2enc/gstmpeg2encpicturereader.hh b/ext/mpeg2enc/gstmpeg2encpicturereader.hh index 93ed8bdc..92d01f6d 100644 --- a/ext/mpeg2enc/gstmpeg2encpicturereader.hh +++ b/ext/mpeg2enc/gstmpeg2encpicturereader.hh @@ -30,7 +30,7 @@ class GstMpeg2EncPictureReader : public PictureReader { public: GstMpeg2EncPictureReader (GstPad *pad, - GstCaps *caps, + const GstCaps *caps, EncoderParams *params); ~GstMpeg2EncPictureReader (); -- cgit v1.2.1