diff options
author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-01 22:45:57 +0000 |
---|---|---|
committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-01-01 22:45:57 +0000 |
commit | 9003ed34ba8e694b44433597c890affac369c368 (patch) | |
tree | dca1fa1b1decb37f42397813935add00b4f13182 /gst-libs/ext/mplex/mjpeg_logging.cc | |
parent | 0e3024712e2a935d1f5b216cd4d7794a0132c522 (diff) | |
download | gst-plugins-bad-9003ed34ba8e694b44433597c890affac369c368.tar.gz gst-plugins-bad-9003ed34ba8e694b44433597c890affac369c368.tar.bz2 gst-plugins-bad-9003ed34ba8e694b44433597c890affac369c368.zip |
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.
Diffstat (limited to 'gst-libs/ext/mplex/mjpeg_logging.cc')
-rw-r--r-- | gst-libs/ext/mplex/mjpeg_logging.cc | 239 |
1 files changed, 0 insertions, 239 deletions
diff --git a/gst-libs/ext/mplex/mjpeg_logging.cc b/gst-libs/ext/mplex/mjpeg_logging.cc deleted file mode 100644 index db4b0c07..00000000 --- a/gst-libs/ext/mplex/mjpeg_logging.cc +++ /dev/null @@ -1,239 +0,0 @@ -/* - $Id$ - - Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> - - 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 -*/ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include <stdlib.h> -#include <stdarg.h> -#include <stdio.h> -#include <assert.h> -#include <string.h> - -extern int fred; - -#include "mjpeg_logging.h" - -static const char _rcsid[] = "$Id: "; - -#define MAX_DEFAULT_ID_SIZE 16 -#define DEFAULT_DEFAULT_ID "???" - -#ifdef HAVE___PROGNAME -extern const char *__progname; -#endif - -static log_level_t mjpeg_log_verbosity = (log_level_t) 0; -static char default_handler_id[MAX_DEFAULT_ID_SIZE]; -static char default_handler_id_is_set = 0; - -static int -default_mjpeg_log_filter (log_level_t level) -{ - int verb_from_env; - - if (mjpeg_log_verbosity == 0) { - char *mjpeg_verb_env = getenv ("MJPEG_VERBOSITY"); - - if (mjpeg_verb_env != NULL) { - verb_from_env = LOG_WARN - atoi (mjpeg_verb_env); - if (verb_from_env >= LOG_DEBUG && verb_from_env <= LOG_ERROR) - mjpeg_log_verbosity = (log_level_t) verb_from_env; - } - } - return (level < LOG_WARN && level < mjpeg_log_verbosity); -} - -static mjpeg_log_filter_t _filter = default_mjpeg_log_filter; - -static void -default_mjpeg_log_handler (log_level_t level, const char message[]) -{ - const char *ids; - - if ((*_filter) (level)) - return; - if (default_handler_id_is_set) { - ids = default_handler_id; - } else { -#ifdef HAVE___PROGNAME - ids = __progname; -#else - ids = DEFAULT_DEFAULT_ID; -#endif - } - switch (level) { - case LOG_ERROR: - fprintf (stderr, "**ERROR: [%s] %s\n", ids, message); - break; - case LOG_DEBUG: - fprintf (stderr, "--DEBUG: [%s] %s\n", ids, message); - break; - case LOG_WARN: - fprintf (stderr, "++ WARN: [%s] %s\n", ids, message); - break; - case LOG_INFO: - fprintf (stderr, " INFO: [%s] %s\n", ids, message); - break; - default: - assert (0); - } -} - -static mjpeg_log_handler_t _handler = default_mjpeg_log_handler; - - -mjpeg_log_handler_t -mjpeg_log_set_handler (mjpeg_log_handler_t new_handler) -{ - mjpeg_log_handler_t old_handler = _handler; - - _handler = new_handler; - - return old_handler; -} - -/*************** - * - * Set default log handlers degree of verboseity. - * 0 = quiet, 1 = info, 2 = debug - * - *************/ - -int -mjpeg_default_handler_verbosity (int verbosity) -{ - int prev_verb = mjpeg_log_verbosity; - - mjpeg_log_verbosity = (log_level_t) (LOG_WARN - (log_level_t) verbosity); - return prev_verb; -} - -/* - * Set identifier string used by default handler - * - */ -int -mjpeg_default_handler_identifier (const char *new_id) -{ - const char *s; - - if (new_id == NULL) { - default_handler_id_is_set = 0; - return 0; - } - /* find basename of new_id (remove any directory prefix) */ - if ((s = strrchr (new_id, '/')) == NULL) - s = new_id; - else - s = s + 1; - strncpy (default_handler_id, s, MAX_DEFAULT_ID_SIZE); - default_handler_id[MAX_DEFAULT_ID_SIZE - 1] = '\0'; - default_handler_id_is_set = 1; - return 0; -} - - -static void -mjpeg_logv (log_level_t level, const char format[], va_list args) -{ - char buf[1024] = { 0, }; - - /* TODO: Original had a re-entrancy error trap to assist bug - finding. To make this work with multi-threaded applications a - lock is needed hence delete. - */ - - - vsnprintf (buf, sizeof (buf) - 1, format, args); - - _handler (level, buf); -} - -void -mjpeg_log (log_level_t level, const char format[], ...) -{ - va_list args; - - va_start (args, format); - mjpeg_logv (level, format, args); - va_end (args); -} - -void -mjpeg_debug (const char format[], ...) -{ - va_list args; - - va_start (args, format); - mjpeg_logv (LOG_DEBUG, format, args); - va_end (args); -} - -void -mjpeg_info (const char format[], ...) -{ - va_list args; - - va_start (args, format); - mjpeg_logv (LOG_INFO, format, args); - va_end (args); -} - -void -mjpeg_warn (const char format[], ...) -{ - va_list args; - - va_start (args, format); - mjpeg_logv (LOG_WARN, format, args); - va_end (args); -} - -void -mjpeg_error (const char format[], ...) -{ - va_list args; - - va_start (args, format); - mjpeg_logv (LOG_ERROR, format, args); - va_end (args); -} - -void -mjpeg_error_exit1 (const char format[], ...) -{ - va_list args; - - va_start (args, format); - mjpeg_logv (LOG_ERROR, format, args); - va_end (args); - exit (EXIT_FAILURE); -} - - -/* - * Local variables: - * c-file-style: "gnu" - * tab-width: 8 - * indent-tabs-mode: nil - * End: - */ |