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/buffer.cc | 122 ------------------------------------------- 1 file changed, 122 deletions(-) delete mode 100644 gst-libs/ext/mplex/buffer.cc (limited to 'gst-libs/ext/mplex/buffer.cc') diff --git a/gst-libs/ext/mplex/buffer.cc b/gst-libs/ext/mplex/buffer.cc deleted file mode 100644 index 24f5fd24..00000000 --- a/gst-libs/ext/mplex/buffer.cc +++ /dev/null @@ -1,122 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "buffer.hh" -#include - -/****************************************************************** - * Remove entries from FIFO buffer list, if their DTS is less than - * actual SCR. These packet data have been already decoded and have - * been removed from the system target decoder's elementary stream - * buffer. - *****************************************************************/ - -void -BufferModel::Cleaned (clockticks SCR) -{ - BufferQueue *pointer; - - while ((first != NULL) && first->DTS < SCR) { - pointer = first; - first = first->next; - delete pointer; - } -} - -/****************************************************************** - * Return the SCR when there will next be some change in the - * buffer. - * If the buffer is empty return a zero timestamp. - *****************************************************************/ - -clockticks -BufferModel::NextChange () -{ - if (first == NULL) - return static_cast < clockticks > (0); - else - return first->DTS; -} - - -/****************************************************************** - * - * Remove all entries from FIFO buffer list, if their DTS is less - * than actual SCR. These packet data have been already decoded and - * have been removed from the system target decoder's elementary - * stream buffer. - *****************************************************************/ - -void -BufferModel::Flushed () -{ - BufferQueue *pointer; - - while (first != NULL) { - pointer = first; - first = first->next; - delete pointer; - } -} - -/****************************************************************** - BufferModel::Space - - returns free space in the buffer -******************************************************************/ - -unsigned int -BufferModel::Space () -{ - unsigned int used_bytes; - BufferQueue *pointer; - - pointer = first; - used_bytes = 0; - - while (pointer != NULL) { - used_bytes += pointer->size; - pointer = pointer->next; - } - - return (max_size - used_bytes); - -} - -/****************************************************************** - Queue_Buffer - - adds entry into the buffer FIFO queue -******************************************************************/ - -void -BufferModel::Queued (unsigned int bytes, clockticks TS) -{ - BufferQueue *pointer; - - pointer = first; - if (pointer == NULL) { - first = new BufferQueue; - first->size = bytes; - first->next = NULL; - first->DTS = TS; - } else { - while ((pointer->next) != NULL) { - pointer = pointer->next; - } - - pointer->next = (BufferQueue *) malloc (sizeof (BufferQueue)); - pointer->next->size = bytes; - pointer->next->next = NULL; - pointer->next->DTS = TS; - } -} - - -void -BufferModel::Init (unsigned int size) -{ - max_size = size; - first = 0; -} -- cgit v1.2.1