aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-01-03 14:56:34 -05:00
Code

make vorbis specific stat names consistent with the existing ones, and make

Browse Source 
sure if unknown ogg codecs are sent then it is logged

svn path=/icecast/trunk/icecast/; revision=8480
This commit is contained in:
Karl Heyes 2004-12-17 21:05:20 +00:00
parent a2c849ed7c
commit e59095b11a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/format_ogg.c
View File

@ -216,7 +216,7 @@ static int process_initial_page (format_plugin_t *plugin, ogg_page *page)
break; break;
#endif #endif
/* any others */ /* any others */
INFO0 ("Seen BOS page with unknown type"); ERROR0 ("Seen BOS page with unknown type");
return -1; return -1;
} while (0); } while (0);

12
src/format_vorbis.c
View File

@ -82,9 +82,9 @@ static void vorbis_codec_free (ogg_state_t *ogg_info, ogg_codec_t *codec)
vorbis_codec_t *vorbis = codec->specific; vorbis_codec_t *vorbis = codec->specific;
DEBUG0 ("freeing vorbis codec"); DEBUG0 ("freeing vorbis codec");
stats_event (ogg_info->mount, "audio-bitrate", NULL); stats_event (ogg_info->mount, "audio_bitrate", NULL);
stats_event (ogg_info->mount, "audio-channels", NULL); stats_event (ogg_info->mount, "audio_channels", NULL);
stats_event (ogg_info->mount, "audio-samplerate", NULL); stats_event (ogg_info->mount, "audio_samplerate", NULL);
vorbis_info_clear (&vorbis->vi); vorbis_info_clear (&vorbis->vi);
vorbis_comment_clear (&vorbis->vc); vorbis_comment_clear (&vorbis->vc);
ogg_stream_clear (&codec->os); ogg_stream_clear (&codec->os);
@ -546,9 +546,9 @@ static refbuf_t *process_vorbis_page (ogg_state_t *ogg_info,
ogg_info->artist = NULL; ogg_info->artist = NULL;
ogg_info->log_metadata = 1; ogg_info->log_metadata = 1;
stats_event_args (ogg_info->mount, "audio-samplerate", "%ld", (long)source_vorbis->vi.rate); stats_event_args (ogg_info->mount, "audio_samplerate", "%ld", (long)source_vorbis->vi.rate);
stats_event_args (ogg_info->mount, "audio-channels", "%ld", (long)source_vorbis->vi.channels); stats_event_args (ogg_info->mount, "audio_channels", "%ld", (long)source_vorbis->vi.channels);
stats_event_args (ogg_info->mount, "audio-bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal); stats_event_args (ogg_info->mount, "audio_bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal);
stats_event_args (ogg_info->mount, "ice-bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal/1000); stats_event_args (ogg_info->mount, "ice-bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal/1000);
return NULL; return NULL;