Commit e59095b1 authored by Karl Heyes's avatar Karl Heyes

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

sure if unknown ogg codecs are sent then it is logged

svn path=/icecast/trunk/icecast/; revision=8480
parent a2c849ed
......@@ -216,7 +216,7 @@ static int process_initial_page (format_plugin_t *plugin, ogg_page *page)
break;
#endif
/* any others */
INFO0 ("Seen BOS page with unknown type");
ERROR0 ("Seen BOS page with unknown type");
return -1;
} while (0);
......
......@@ -82,9 +82,9 @@ static void vorbis_codec_free (ogg_state_t *ogg_info, ogg_codec_t *codec)
vorbis_codec_t *vorbis = codec->specific;
DEBUG0 ("freeing vorbis codec");
stats_event (ogg_info->mount, "audio-bitrate", NULL);
stats_event (ogg_info->mount, "audio-channels", NULL);
stats_event (ogg_info->mount, "audio-samplerate", NULL);
stats_event (ogg_info->mount, "audio_bitrate", NULL);
stats_event (ogg_info->mount, "audio_channels", NULL);
stats_event (ogg_info->mount, "audio_samplerate", NULL);
vorbis_info_clear (&vorbis->vi);
vorbis_comment_clear (&vorbis->vc);
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->log_metadata = 1;
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-bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal);
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_bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal);
stats_event_args (ogg_info->mount, "ice-bitrate", "%ld", (long)source_vorbis->vi.bitrate_nominal/1000);
return NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment