Commit 1295a56c authored by giles's avatar giles

Add support for Opus audio in the Ogg container.

Patch by David Richards from the icecast-webm branch.

svn path=/icecast/trunk/icecast/; revision=18401
parents a7cd4e2b e6cd0cff
......@@ -4,3 +4,4 @@ oddsock <oddsock@xiph.org>
Karl Heyes <karl@xiph.org>
Philipp "ph3-der-loewe" Schafft <lion@lion.leolix.org>
Thomas B. "dm8tbr" Ruecker <thomas.rucker@tieto.com>
David "oneman" Richards <kradradio@gmail.com>
......@@ -12,12 +12,12 @@ noinst_HEADERS = admin.h cfgfile.h logging.h sighandler.h connection.h \
auth.h auth_htpasswd.h auth_url.h \
format.h format_ogg.h format_mp3.h \
format_vorbis.h format_theora.h format_flac.h format_speex.h format_midi.h \
format_kate.h format_skeleton.h
format_kate.h format_skeleton.h format_opus.h
icecast_SOURCES = cfgfile.c main.c logging.c sighandler.c connection.c global.c \
util.c slave.c source.c stats.c refbuf.c client.c \
xslt.c fserve.c event.c admin.c md5.c \
format.c format_ogg.c format_mp3.c format_midi.c format_flac.c \
auth.c auth_htpasswd.c format_kate.c format_skeleton.c
auth.c auth_htpasswd.c format_kate.c format_skeleton.c format_opus.c
EXTRA_icecast_SOURCES = yp.c \
auth_url.c \
format_vorbis.c format_theora.c format_speex.c
......
......@@ -40,6 +40,7 @@
#ifdef HAVE_SPEEX
#include "format_speex.h"
#endif
#include "format_opus.h"
#include "format_midi.h"
#include "format_flac.h"
#include "format_kate.h"
......@@ -246,6 +247,9 @@ static int process_initial_page (format_plugin_t *plugin, ogg_page *page)
if (codec)
break;
codec = initial_skeleton_page (plugin, page);
if (codec)
break;
codec = initial_opus_page (plugin, page);
if (codec)
break;
......
/* Icecast
*
* This program is distributed under the GNU General Public License,
* version 2. A copy of this license is included with this source.
* At your option, this specific source file can also be distributed
* under the GNU GPL version 3.
*
* Copyright 2012, David Richards, Mozilla Foundation,
* and others (see AUTHORS for details).
*/
/* Ogg codec handler for opus streams */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdlib.h>
#include <ogg/ogg.h>
typedef struct source_tag source_t;
#include "format_opus.h"
#include "refbuf.h"
#include "client.h"
#define CATMODULE "format-opus"
#include "logging.h"
static void opus_codec_free (ogg_state_t *ogg_info, ogg_codec_t *codec)
{
ogg_stream_clear (&codec->os);
free (codec);
}
static refbuf_t *process_opus_page (ogg_state_t *ogg_info,
ogg_codec_t *codec, ogg_page *page)
{
refbuf_t *refbuf;
if (codec->headers < 2)
{
ogg_packet packet;
ogg_stream_pagein (&codec->os, page);
while (ogg_stream_packetout (&codec->os, &packet) > 0)
{
/* first time around (normal case) yields comments */
codec->headers++;
}
/* add header page to associated list */
format_ogg_attach_header (ogg_info, page);
return NULL;
}
refbuf = make_refbuf_with_page (page);
return refbuf;
}
ogg_codec_t *initial_opus_page (format_plugin_t *plugin, ogg_page *page)
{
ogg_state_t *ogg_info = plugin->_state;
ogg_codec_t *codec = calloc (1, sizeof (ogg_codec_t));
ogg_packet packet;
ogg_stream_init (&codec->os, ogg_page_serialno (page));
ogg_stream_pagein (&codec->os, page);
ogg_stream_packetout (&codec->os, &packet);
DEBUG0("checking for opus codec");
if (strncmp((char *)packet.packet, "OpusHead", 8) != 0)
{
ogg_stream_clear (&codec->os);
free (codec);
return NULL;
}
INFO0 ("seen initial opus header");
codec->process_page = process_opus_page;
codec->codec_free = opus_codec_free;
codec->headers = 1;
format_ogg_attach_header (ogg_info, page);
return codec;
}
/* Icecast
*
* This program is distributed under the GNU General Public License,
* version 2. A copy of this license is included with this source.
* At your option, this specific source file can also be distributed
* under the GNU GPL version 3.
*
* Copyright 2012, David Richards, Mozilla Foundation,
* and others (see AUTHORS for details).
*/
#ifndef __FORMAT_OPUS_H
#define __FORMAT_OPUS_H
#include "format_ogg.h"
ogg_codec_t *initial_opus_page (format_plugin_t *plugin, ogg_page *page);
#endif /* __FORMAT_OPUS_H */
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