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. --- gst-libs/ext/mplex/INSTRUCT | 67 --------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 gst-libs/ext/mplex/INSTRUCT (limited to 'gst-libs/ext/mplex/INSTRUCT') diff --git a/gst-libs/ext/mplex/INSTRUCT b/gst-libs/ext/mplex/INSTRUCT deleted file mode 100644 index e75d4cfa..00000000 --- a/gst-libs/ext/mplex/INSTRUCT +++ /dev/null @@ -1,67 +0,0 @@ -////////////////////////////////////////////////////////////////////////// -// // -// INSTRUCTIONS FOR MPLEX - THE MPEG1/SYSTEMS MULTIPLEXER // -// // -////////////////////////////////////////////////////////////////////////// - - -Please note that I do not have a comprehensive instruction manual for this -release. I suggest you try the program out with some default values and -learn something more about ISO/IEC 11172-1 (aka MPEG1/Systems). - -For those of you that can read *German*, you can download a postscript -paper discussing implementation and problems of this software, with -introductions to MPEG1/Audio, MPEG1/Video and MPEG1/Systems. -You should find the paper with the same distribution you got this -program from. - -If not, you should find the postscript version of this 40-page paper -on - -ftp.informatik.tu-muenchen.de in /pub/comp/graphics/mpeg/mplex - -(121822 bytes, Jun 30 , 1994 , mpeg_systems_paper_0.99.ps.gz) - -If you have any questions you cannot figure out by running the -program, feel free to ask me. - --------------------------------------------------------------------------- - -One more thing that might save me many emails: - -when asked about the startup packet delay, try something like -half the video buffer size divided by your sector size. Say you -have a 40 kByte video buffer and a 2324 Byte Sector size, then -a startup delay of 8 sectors will work just fine. - -What does the above parameter mean? - -Normally, the Decoding/Presentation Time Stamp of the first access -unit is set to the clock value that will happen exactly after the last -packet containig data from this first unit arrives into the system -target decoder. This works fine if the video/audio streams are of -*very perfectly constant* or the packet size are *very* small -(ideally: the size of one access unit, that would mean variable -packet length). -Anyway: this parameter allows you to say that the System Target -Decoder should start decoding the first access unit after he -gets (startup_packet_delay + size_of_first_access_units[av]) -packets of data. -This guarantees that the buffers are conveniently filled up. -Note that both the video stream offset and audio stream offset (ms) -add up even more bytes to this startup delay, but you can -tell conveniently that audio should start so many ms after video, -for example. - -Sorry for no further doc, enjoy multiplexing A/V :) - -Christoph. - -moar@heaven.zfe.siemens.de -+---------------------------------------+--------------------------------+ -| http://www.informatik.tu-muenchen.de/ | Christoph Moar | -| cgi-bin/nph-gateway/hphalle6/~moar/ | Kaulbachstr.29a | -| index.html | 80539 Munich | -| email:moar@informatik.tu-muenchen.de | voice: ++49 - 89 - 23862874 | -+---------------------------------------+--------------------------------+ - -- cgit v1.2.1