diff options
-rw-r--r-- | src/demuxers/demux_aiff.c | 14 | ||||
-rw-r--r-- | src/demuxers/demux_film.c | 29 | ||||
-rw-r--r-- | src/demuxers/demux_fli.c | 15 | ||||
-rw-r--r-- | src/demuxers/demux_idcin.c | 14 | ||||
-rw-r--r-- | src/demuxers/demux_qt.c | 29 | ||||
-rw-r--r-- | src/demuxers/demux_real.c | 8 | ||||
-rw-r--r-- | src/demuxers/demux_realaudio.c | 13 | ||||
-rw-r--r-- | src/demuxers/demux_roq.c | 11 | ||||
-rw-r--r-- | src/demuxers/demux_smjpeg.c | 28 | ||||
-rw-r--r-- | src/demuxers/demux_snd.c | 14 | ||||
-rw-r--r-- | src/demuxers/demux_voc.c | 10 | ||||
-rw-r--r-- | src/demuxers/demux_wav.c | 19 | ||||
-rw-r--r-- | src/demuxers/demux_yuv4mpeg2.c | 8 |
13 files changed, 13 insertions, 199 deletions
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index df38a3312..d8660ad21 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -19,7 +19,7 @@ * * AIFF File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_aiff.c,v 1.25 2003/01/17 16:52:33 miguelfreitas Exp $ + * $Id: demux_aiff.c,v 1.26 2003/01/19 23:33:33 tmmm Exp $ * */ @@ -416,18 +416,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_aiff: %d Hz, %d channels, %d bits, %d frames\n"), - this->audio_sample_rate, - this->audio_channels, - this->audio_bits, - this->audio_frames); - xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_aiff: running time: %d min, %d sec\n"), - this->running_time / 60, - this->running_time % 60); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 88e11646c..669e50a00 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -21,7 +21,7 @@ * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_film.c,v 1.53 2003/01/10 21:10:59 miguelfreitas Exp $ + * $Id: demux_film.c,v 1.54 2003/01/19 23:33:33 tmmm Exp $ */ #ifdef HAVE_CONFIG_H @@ -731,33 +731,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_film: FILM version %c%c%c%c, running time: %d min, %d sec\n"), - this->version[0], - this->version[1], - this->version[2], - this->version[3], - this->total_time / 60, - this->total_time % 60); - if (this->video_type) - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_film: %c%c%c%c video @ %dx%d, %d Hz playback clock\n"), - (this->video_codec >> 24) & 0xFF, - (this->video_codec >> 16) & 0xFF, - (this->video_codec >> 8) & 0xFF, - (this->video_codec >> 0) & 0xFF, - this->bih.biWidth, - this->bih.biHeight, - this->frequency); - if (this->audio_type) - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_film: %d Hz, %d-bit %s%s PCM audio\n"), - this->sample_rate, - this->audio_bits, - (this->audio_bits == 16) ? "big-endian " : "", - (this->audio_channels == 1) ? "mono" : "stereo"); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index fb1a547a9..8378f8009 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -22,7 +22,7 @@ * avoid while programming a FLI decoder, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_fli.c,v 1.35 2003/01/10 11:57:16 miguelfreitas Exp $ + * $Id: demux_fli.c,v 1.36 2003/01/19 23:33:33 tmmm Exp $ */ #ifdef HAVE_CONFIG_H @@ -349,19 +349,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_fli: FLI type: %04X, speed: %d/%d\n"), - this->magic_number, this->speed, - (this->magic_number == FLI_FILE_MAGIC_1) ? 70 : 1000); - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_fli: %d frames, %dx%d\n"), - this->frame_count, this->width, this->height); - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_fli: running time: %d min, %d sec\n"), - this->frame_count * this->frame_pts_inc / 90000 / 60, - this->frame_count * this->frame_pts_inc / 90000 % 60); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index a1bb88a5d..ad5eab617 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -63,7 +63,7 @@ * - if any bytes exceed 63, do not shift the bytes at all before * transmitting them to the video decoder * - * $Id: demux_idcin.c,v 1.33 2003/01/10 11:57:16 miguelfreitas Exp $ + * $Id: demux_idcin.c,v 1.34 2003/01/19 23:33:33 tmmm Exp $ */ #ifdef HAVE_CONFIG_H @@ -526,18 +526,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_idcin: Id CIN file, video is %dx%d, 14 frames/sec\n"), - this->video_width, - this->video_height); - if (this->audio_channels) - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_idcin: %d-bit, %d Hz %s PCM audio\n"), - this->audio_bytes_per_sample * 8, - this->audio_sample_rate, - (this->audio_channels == 1) ? "monaural" : "stereo"); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index f0abd6a3a..4872b4dd5 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.141 2003/01/10 21:11:06 miguelfreitas Exp $ + * $Id: demux_qt.c,v 1.142 2003/01/19 23:33:33 tmmm Exp $ * */ @@ -2385,33 +2385,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_qt: Apple Quicktime file, %srunning time: %d min, %d sec\n"), - (this->qt->compressed_header) ? "compressed header, " : "", - this->qt->duration / this->qt->timescale / 60, - this->qt->duration / this->qt->timescale % 60); - if (this->qt->video_codec) - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_qt: '%c%c%c%c' video @ %dx%d\n"), - *((char *)&this->qt->video_codec + 0), - *((char *)&this->qt->video_codec + 1), - *((char *)&this->qt->video_codec + 2), - *((char *)&this->qt->video_codec + 3), - this->qt->video_width, - this->qt->video_height); - if (this->qt->audio_codec) - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_qt: '%c%c%c%c' audio @ %d Hz, %d bits, %d %s\n"), - *((char *)&this->qt->audio_codec + 0), - *((char *)&this->qt->audio_codec + 1), - *((char *)&this->qt->audio_codec + 2), - *((char *)&this->qt->audio_codec + 3), - this->qt->audio_sample_rate, - this->qt->audio_bits, - this->qt->audio_channels, - ngettext("channel", "channels", this->qt->audio_channels)); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 51e1e4713..097da65e9 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -28,7 +28,7 @@ * * Based on FFmpeg's libav/rm.c. * - * $Id: demux_real.c,v 1.35 2003/01/17 16:52:36 miguelfreitas Exp $ + * $Id: demux_real.c,v 1.36 2003/01/19 23:33:33 tmmm Exp $ */ #ifdef HAVE_CONFIG_H @@ -997,12 +997,6 @@ static void demux_real_send_headers(demux_plugin_t *this_gen) { real_parse_headers (this); - - /* print vital stats */ - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_real: Real media file, running time: %d min, %d sec\n"), - this->duration / 1000 / 60, - this->duration / 1000 % 60); } static int demux_real_seek (demux_plugin_t *this_gen, diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index 10b3fc022..4207c7343 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -19,7 +19,7 @@ * * RealAudio File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_realaudio.c,v 1.14 2003/01/17 16:52:38 miguelfreitas Exp $ + * $Id: demux_realaudio.c,v 1.15 2003/01/19 23:33:33 tmmm Exp $ * */ @@ -358,17 +358,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_realaudio: RealAudio file, %d bits, %d Hz, %s %c%c%c%c audio\n"), - this->wave.wBitsPerSample, - this->wave.nSamplesPerSec, - (this->wave.nChannels == 1) ? "monaural" : "stereo", - *((char *)&this->audio_fourcc + 0), - *((char *)&this->audio_fourcc + 1), - *((char *)&this->audio_fourcc + 2), - *((char *)&this->audio_fourcc + 3)); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index e209cd85e..e79b99e51 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -21,7 +21,7 @@ * For more information regarding the RoQ file format, visit: * http://www.csse.monash.edu.au/~timf/ * - * $Id: demux_roq.c,v 1.35 2003/01/04 14:48:12 miguelfreitas Exp $ + * $Id: demux_roq.c,v 1.36 2003/01/19 23:33:33 tmmm Exp $ */ #ifdef HAVE_CONFIG_H @@ -473,15 +473,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_roq: RoQ file, video is %dx%d, %d frames/sec\n"), - this->width, this->height, this->fps); - if (this->audio_channels) - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_roq: 16-bit, 22050 Hz %s RoQ DPCM audio\n"), - (this->audio_channels == 1) ? "monaural" : "stereo"); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index c06e291f9..a6b1f9f97 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -21,7 +21,7 @@ * For more information on the SMJPEG file format, visit: * http://www.lokigames.com/development/smjpeg.php3 * - * $Id: demux_smjpeg.c,v 1.35 2003/01/10 21:11:09 miguelfreitas Exp $ + * $Id: demux_smjpeg.c,v 1.36 2003/01/19 23:33:33 tmmm Exp $ */ #ifdef HAVE_CONFIG_H @@ -481,32 +481,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_smjpeg: SMJPEG file, running time: %d min, %d sec\n"), - this->duration / 1000 / 60, - this->duration / 1000 % 60); - if (this->video_type) - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_smjpeg: '%c%c%c%c' video @ %dx%d\n"), - *((char *)&this->bih.biCompression + 0), - *((char *)&this->bih.biCompression + 1), - *((char *)&this->bih.biCompression + 2), - *((char *)&this->bih.biCompression + 3), - this->bih.biWidth, - this->bih.biHeight); - if (this->audio_type) - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_smjpeg: '%c%c%c%c' audio @ %d Hz, %d bits, %d %s\n"), - *((char *)&this->audio_codec + 0), - *((char *)&this->audio_codec + 1), - *((char *)&this->audio_codec + 2), - *((char *)&this->audio_codec + 3), - this->audio_sample_rate, - this->audio_bits, - this->audio_channels, - ngettext("channel", "channels", this->audio_channels)); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index 9570e0ed9..da63e1616 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -19,7 +19,7 @@ * * SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_snd.c,v 1.24 2003/01/10 21:11:10 miguelfreitas Exp $ + * $Id: demux_snd.c,v 1.25 2003/01/19 23:33:33 tmmm Exp $ * */ @@ -387,18 +387,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_snd: %d Hz, %d channels, %d bits, %d frames\n"), - this->audio_sample_rate, - this->audio_channels, - this->audio_bits, - this->audio_frames); - xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_snd: running time: %d min, %d sec\n"), - this->running_time / 60, - this->running_time % 60); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 9af20a0ca..aa0295e16 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -23,7 +23,7 @@ * It will only play that block if it is PCM data. More variations will be * supported as they are encountered. * - * $Id: demux_voc.c,v 1.26 2003/01/17 16:54:47 miguelfreitas Exp $ + * $Id: demux_voc.c,v 1.27 2003/01/19 23:33:33 tmmm Exp $ * */ @@ -385,14 +385,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_voc: VOC format 0x%X audio, %d Hz, running time: %d min, %d sec\n"), - this->voc_audio_type, - this->audio_sample_rate, - this->running_time / 60, - this->running_time % 60); - return &this->demux_plugin; } diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index 5cd8a23cd..429ca8f34 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -20,7 +20,7 @@ * MS WAV File Demuxer by Mike Melanson (melanson@pcisys.net) * based on WAV specs that are available far and wide * - * $Id: demux_wav.c,v 1.34 2003/01/17 16:52:39 miguelfreitas Exp $ + * $Id: demux_wav.c,v 1.35 2003/01/19 23:33:33 tmmm Exp $ * */ @@ -381,23 +381,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_wav: format 0x%X audio, %d Hz, %d bits/sample, %d %s\n"), - this->wave->wFormatTag, - this->wave->nSamplesPerSec, - this->wave->wBitsPerSample, - this->wave->nChannels, - ngettext("channel", "channels", this->wave->nChannels)); - xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_wav: running time = %lld min, %lld sec\n"), - this->data_size / this->wave->nAvgBytesPerSec / 60, - this->data_size / this->wave->nAvgBytesPerSec % 60); - xine_log(this->stream->xine, XINE_LOG_MSG, - _("demux_wav: average bytes/sec = %d, block alignment = %d\n"), - this->wave->nAvgBytesPerSec, - this->wave->nBlockAlign); - /* special block alignment hack so that the demuxer doesn't send * packets with individual PCM samples */ if ((this->wave->nAvgBytesPerSec / this->wave->nBlockAlign) == diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 3a2e3df28..ab60682f7 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -22,7 +22,7 @@ * tools, visit: * http://mjpeg.sourceforge.net/ * - * $Id: demux_yuv4mpeg2.c,v 1.17 2003/01/10 21:11:12 miguelfreitas Exp $ + * $Id: demux_yuv4mpeg2.c,v 1.18 2003/01/19 23:33:33 tmmm Exp $ */ #ifdef HAVE_CONFIG_H @@ -398,12 +398,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str strncpy (this->last_mrl, input->get_mrl (input), 1024); - /* print vital stats */ - xine_log (this->stream->xine, XINE_LOG_MSG, - _("demux_yuv4mpeg2: raw YV12 video @ %d x %d\n"), - this->bih.biWidth, - this->bih.biHeight); - return &this->demux_plugin; } |