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  <rbultje@ronald.bitfreak.net>

* 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.

1 files changed, 0 insertions, 167 deletions

diff --git a/gst-libs/ext/mplex/yuv4mpeg_ratio.cc b/gst-libs/ext/mplex/yuv4mpeg_ratio.cc
deleted file mode 100644
index e02be676..00000000
--- a/gst-libs/ext/mplex/yuv4mpeg_ratio.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- *  yuv4mpeg_ratio.c:  Functions for dealing with y4m_ratio_t datatype.
- *
- *  Copyright (C) 2001 Matthew J. Marjanovic <maddog@mir.com>
- *
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU General Public License
- *  as published by the Free Software Foundation; either version 2
- *  of the License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-
-#include <config.h>
-
-#include <string.h>
-#include "yuv4mpeg.h"
-#include "yuv4mpeg_intern.h"
-
-
-/* useful list of standard framerates */
-const y4m_ratio_t y4m_fps_UNKNOWN = Y4M_FPS_UNKNOWN;
-const y4m_ratio_t y4m_fps_NTSC_FILM = Y4M_FPS_NTSC_FILM;
-const y4m_ratio_t y4m_fps_FILM = Y4M_FPS_FILM;
-const y4m_ratio_t y4m_fps_PAL = Y4M_FPS_PAL;
-const y4m_ratio_t y4m_fps_NTSC = Y4M_FPS_NTSC;
-const y4m_ratio_t y4m_fps_30 = Y4M_FPS_30;
-const y4m_ratio_t y4m_fps_PAL_FIELD = Y4M_FPS_PAL_FIELD;
-const y4m_ratio_t y4m_fps_NTSC_FIELD = Y4M_FPS_NTSC_FIELD;
-const y4m_ratio_t y4m_fps_60 = Y4M_FPS_60;
-
-/* useful list of standard sample aspect ratios */
-const y4m_ratio_t y4m_sar_UNKNOWN = Y4M_SAR_UNKNOWN;
-const y4m_ratio_t y4m_sar_SQUARE = Y4M_SAR_SQUARE;
-const y4m_ratio_t y4m_sar_SQR_ANA_16_9 = Y4M_SAR_SQR_ANA_16_9;
-const y4m_ratio_t y4m_sar_NTSC_CCIR601 = Y4M_SAR_NTSC_CCIR601;
-const y4m_ratio_t y4m_sar_NTSC_16_9 = Y4M_SAR_NTSC_16_9;
-const y4m_ratio_t y4m_sar_NTSC_SVCD_4_3 = Y4M_SAR_NTSC_SVCD_4_3;
-const y4m_ratio_t y4m_sar_NTSC_SVCD_16_9 = Y4M_SAR_NTSC_SVCD_16_9;
-const y4m_ratio_t y4m_sar_PAL_CCIR601 = Y4M_SAR_PAL_CCIR601;
-const y4m_ratio_t y4m_sar_PAL_16_9 = Y4M_SAR_PAL_16_9;
-const y4m_ratio_t y4m_sar_PAL_SVCD_4_3 = Y4M_SAR_PAL_SVCD_4_3;
-const y4m_ratio_t y4m_sar_PAL_SVCD_16_9 = Y4M_SAR_PAL_SVCD_16_9;
-
-/* useful list of standard display aspect ratios */
-const y4m_ratio_t y4m_dar_4_3 = Y4M_DAR_4_3;
-const y4m_ratio_t y4m_dar_16_9 = Y4M_DAR_16_9;
-const y4m_ratio_t y4m_dar_221_100 = Y4M_DAR_221_100;
-
-/*
- *  Euler's algorithm for greatest common divisor
- */
-
-static int
-gcd (int a, int b)
-{
-  a = (a >= 0) ? a : -a;
-  b = (b >= 0) ? b : -b;
-
-  while (b > 0) {
-    int x = b;
-
-    b = a % b;
-    a = x;
-  }
-  return a;
-}
-
-
-/*************************************************************************
- *
- * Remove common factors from a ratio
- *
- *************************************************************************/
-
-
-void
-y4m_ratio_reduce (y4m_ratio_t * r)
-{
-  int d;
-
-  if ((r->n == 0) && (r->d == 0))
-    return;			/* "unknown" */
-  d = gcd (r->n, r->d);
-  r->n /= d;
-  r->d /= d;
-}
-
-
-
-/*************************************************************************
- *
- * Parse "nnn:ddd" into a ratio
- *
- * returns:         Y4M_OK  - success
- *           Y4M_ERR_RANGE  - range error 
- *
- *************************************************************************/
-
-int
-y4m_parse_ratio (y4m_ratio_t * r, const char *s)
-{
-  const char *t = strchr (s, ':');
-
-  if (t == NULL)
-    return Y4M_ERR_RANGE;
-  r->n = atoi (s);
-  r->d = atoi (t + 1);
-  if (r->d < 0)
-    return Y4M_ERR_RANGE;
-  /* 0:0 == unknown, so that is ok, otherwise zero denominator is bad */
-  if ((r->d == 0) && (r->n != 0))
-    return Y4M_ERR_RANGE;
-  y4m_ratio_reduce (r);
-  return Y4M_OK;
-}
-
-
-
-/*************************************************************************
- *
- * Guess the true SAR (sample aspect ratio) from a list of commonly 
- * encountered values, given the "suggested" display aspect ratio, and
- * the true frame width and height.
- *
- * Returns y4m_sar_UNKNOWN if no match is found.
- *
- *************************************************************************/
-
-/* this is big enough to accommodate the difference between 720 and 704 */
-#define GUESS_ASPECT_TOLERANCE 0.03
-
-y4m_ratio_t
-y4m_guess_sar (int width, int height, y4m_ratio_t dar)
-{
-  int i;
-  double implicit_sar = (double) (dar.n * height) / (double) (dar.d * width);
-  y4m_ratio_t sarray[] = {
-    y4m_sar_SQUARE,
-    y4m_sar_NTSC_CCIR601,
-    y4m_sar_NTSC_16_9,
-    y4m_sar_NTSC_SVCD_4_3,
-    y4m_sar_NTSC_SVCD_16_9,
-    y4m_sar_PAL_CCIR601,
-    y4m_sar_PAL_16_9,
-    y4m_sar_PAL_SVCD_4_3,
-    y4m_sar_PAL_SVCD_16_9,
-    y4m_sar_UNKNOWN
-  };
-
-  for (i = 0; !(Y4M_RATIO_EQL (sarray[i], y4m_sar_UNKNOWN)); i++) {
-    double ratio = implicit_sar / Y4M_RATIO_DBL (sarray[i]);
-
-    if ((ratio > (1.0 - GUESS_ASPECT_TOLERANCE)) && (ratio < (1.0 + GUESS_ASPECT_TOLERANCE)))
-      return sarray[i];
-  }
-  return y4m_sar_UNKNOWN;
-}