Skip to content

Commit

Permalink
add rewrite support using libopusenc
Browse files Browse the repository at this point in the history 
formats.conf is parsed to allow setting two encoder settings:

[opus]
complexity=4
maxaveragebitrate=20000
  • Loading branch information
@dhewg
dhewg committed Oct 23, 2021
1 parent 90e8780 commit 0c85434
Show file tree
Hide file tree
Showing 2 changed files with 173 additions and 10 deletions.
5 changes: 3 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ codec_opus_open_source: DEFS+=-DAST_MODULE=\"codec_opus_open_source\" \
codec_opus_open_source: codecs/codec_opus_open_source.so

format_ogg_opus_open_source: CPATH+=-I/usr/include/opus
format_ogg_opus_open_source: LIBS+=-lopus -lopusfile
format_ogg_opus_open_source: LIBS+=-lopus -lopusfile -lopusenc
format_ogg_opus_open_source: DEFS+=-DAST_MODULE=\"format_ogg_opus_open_source\" \
-DAST_MODULE_SELF_SYM=__internal_format_ogg_opus_open_source_self
-DAST_MODULE_SELF_SYM=__internal_format_ogg_opus_open_source_self \
-DHAVE_OPUSENC
format_ogg_opus_open_source: formats/format_ogg_opus_open_source.so

format_vp8: DEFS+=-DAST_MODULE=\"format_vp8\" \
Expand Down
178 changes: 170 additions & 8 deletions formats/format_ogg_opus_open_source.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: $")

#include <opus/opus.h>
#include <opus/opusfile.h>
#if defined(HAVE_OPUSENC)
#include <opus/opusenc.h>
#endif
#include "asterisk/config.h"
#include "asterisk/opus.h"
#include "asterisk/mod_format.h"
#include "asterisk/utils.h"
#include "asterisk/module.h"
Expand All @@ -41,8 +46,22 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: $")
#define SAMPLES_MAX 5760
#define BUF_SIZE (2 * SAMPLES_MAX)

#if defined(HAVE_OPUSENC)
/* Variables that can be set in formats.conf */
static int complexity = 10; /* OPUS default */
static int maxbitrate = CODEC_OPUS_DEFAULT_BITRATE;
#endif

struct ogg_opus_desc {
OggOpusFile *of;

#if defined(HAVE_OPUSENC)
OggOpusEnc *enc;
OggOpusComments *comments;
#endif

int writing;
off_t writing_pcm_pos;
};

static int fread_wrapper(void *_stream, unsigned char *_ptr, int _nbytes)
Expand Down Expand Up @@ -92,26 +111,104 @@ static int ogg_opus_open(struct ast_filestream *s)
return 0;
}

static int ogg_opus_rewrite(struct ast_filestream *s, const char *comment)
#if defined(HAVE_OPUSENC)
static int fwrite_wrapper(void *user_data, const unsigned char *ptr, opus_int32 len)
{
FILE *stream = user_data;

return fwrite(ptr, 1, len, stream) != (size_t)len;
}

static int fclose_wrapper(void *user_data)
{
return 0;
}

static const OpusEncCallbacks enc_callbacks = {
.write = fwrite_wrapper,
.close = fclose_wrapper,
};

static int ogg_opus_rewrite(struct ast_filestream *fs, const char *comment)
{
struct ogg_opus_desc *desc = fs->_private;
int err, rate, channels, family;

desc->writing = 1;
desc->writing_pcm_pos = 0;

desc->comments = ope_comments_create();
ope_comments_add(desc->comments, "ENCODER", "Asterisk PBX");
if (comment)
ope_comments_add(desc->comments, "COMMENT", comment);

rate = ast_format_get_sample_rate(fs->fmt->format);
channels = ast_format_get_channel_count(fs->fmt->format);
if (channels < 3)
family = 0;
else
family = 1;

desc->enc = ope_encoder_create_callbacks(&enc_callbacks, fs->f, desc->comments, rate, channels, family, &err);

if (!desc->enc) {
ast_log(AST_LOG_ERROR, "Error creating the OGG/Opus encoder: %s\n", ope_strerror(err));
return -1;
}

ope_encoder_ctl(desc->enc, OPUS_SET_SIGNAL(OPUS_SIGNAL_VOICE));
ope_encoder_ctl(desc->enc, OPUS_SET_COMPLEXITY(complexity));
ope_encoder_ctl(desc->enc, OPUS_SET_BITRATE(maxbitrate));

return 0;
}

static int ogg_opus_write(struct ast_filestream *fs, struct ast_frame *f)
{
/* XXX Unimplemented. We currently only can read from OGG/Opus streams */
ast_log(LOG_ERROR, "Cannot write OGG/Opus streams. Sorry :(\n");
struct ogg_opus_desc *desc = fs->_private;
int err;

if (!desc->writing) {
ast_log(LOG_ERROR, "This OGG/Opus stream is not set up for writing!\n");
return -1;
}

if (!f->datalen)
return -1;

err = ope_encoder_write(desc->enc, f->data.ptr, f->samples);

if (err) {
ast_log(AST_LOG_ERROR, "Error encoding OGG/Opus frame: %s\n", ope_strerror(err));
return -1;
}

desc->writing_pcm_pos += f->samples;
return 0;
}
#else
static int ogg_opus_rewrite(struct ast_filestream *fs, const char *comment)
{
ast_log(LOG_ERROR, "Writing OGG/Opus streams is not built-in\n");
return -1;
}

static int ogg_opus_write(struct ast_filestream *fs, struct ast_frame *f)
{
/* XXX Unimplemented. We currently only can read from OGG/Opus streams */
ast_log(LOG_ERROR, "Cannot write OGG/Opus streams. Sorry :(\n");
ast_log(LOG_ERROR, "Writing OGG/Opus streams is not built-in\n");
return -1;
}
#endif

static int ogg_opus_seek(struct ast_filestream *fs, off_t sample_offset, int whence)
{
int seek_result = -1;
off_t relative_pcm_pos;
struct ogg_opus_desc *desc = fs->_private;

if (desc->writing)
return -1;

switch (whence) {
case SEEK_SET:
seek_result = op_pcm_seek(desc->of, sample_offset);
Expand Down Expand Up @@ -141,8 +238,6 @@ static int ogg_opus_seek(struct ast_filestream *fs, off_t sample_offset, int whe

static int ogg_opus_trunc(struct ast_filestream *fs)
{
/* XXX Unimplemented. This is only used when recording, and we don't support that right now. */
ast_log(LOG_ERROR, "Truncation is not supported on OGG/Opus streams!\n");
return -1;
}

Expand All @@ -151,6 +246,9 @@ static off_t ogg_opus_tell(struct ast_filestream *fs)
struct ogg_opus_desc *desc = fs->_private;
off_t pos;

if (desc->writing)
return desc->writing_pcm_pos / CODEC_OPUS_DEFAULT_SAMPLE_RATE * DEFAULT_SAMPLE_RATE;

pos = (off_t) op_pcm_tell(desc->of);
if (pos < 0) {
return -1;
Expand All @@ -165,6 +263,11 @@ static struct ast_frame *ogg_opus_read(struct ast_filestream *fs, int *whennext)
int samples_read;
opus_int16 *out_buf;

if (desc->writing) {
ast_log(LOG_WARNING, "Reading is not supported on OGG/Opus in writing mode.\n");
return NULL;
}

AST_FRAME_SET_BUFFER(&fs->fr, fs->buf, AST_FRIENDLY_OFFSET, BUF_SIZE);

out_buf = (opus_int16 *) fs->fr.data.ptr;
Expand Down Expand Up @@ -196,7 +299,15 @@ static void ogg_opus_close(struct ast_filestream *fs)
{
struct ogg_opus_desc *desc = fs->_private;

op_free(desc->of);
if (desc->writing) {
#if defined(HAVE_OPUSENC)
ope_encoder_drain(desc->enc);
ope_encoder_destroy(desc->enc);
ope_comments_destroy(desc->comments);
#endif
} else {
op_free(desc->of);
}
}

static struct ast_format_def opus_f = {
Expand All @@ -214,15 +325,65 @@ static struct ast_format_def opus_f = {
.desc_size = sizeof(struct ogg_opus_desc),
};

static int parse_config(int reload)
{
#if defined(HAVE_OPUSENC)
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
struct ast_config *cfg = ast_config_load("formats.conf", config_flags);
struct ast_variable *var;
int i, res = 0;

if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID)
return res;

for (var = ast_variable_browse(cfg, "opus"); var; var = var->next) {
if (!strcasecmp(var->name, "complexity")) {
i = atoi(var->value);
if (i < 0 || i > 10) {
res = 1;
ast_log(LOG_ERROR, "Complexity must be in 0-10\n");
break;
}

complexity = i;
} else if (!strcasecmp(var->name, CODEC_OPUS_ATTR_MAX_AVERAGE_BITRATE)) {
i = atoi(var->value);
if (i < 500 || i > 512000) {
res = 1;
ast_log(LOG_ERROR, CODEC_OPUS_ATTR_MAX_AVERAGE_BITRATE " must be in 500-512000\n");
break;
}

maxbitrate = i;
}
}
ast_config_destroy(cfg);

return res;
#else
return 0;
#endif
}

static int load_module(void)
{
if (parse_config(0))
return AST_MODULE_LOAD_DECLINE;

opus_f.format = ast_format_slin48;
if (ast_format_def_register(&opus_f)) {
return AST_MODULE_LOAD_FAILURE;
}
return AST_MODULE_LOAD_SUCCESS;
}

static int reload_module(void)
{
if (parse_config(1))
return AST_MODULE_LOAD_DECLINE;
return AST_MODULE_LOAD_SUCCESS;
}

static int unload_module(void)
{
return ast_format_def_unregister(opus_f.name);
Expand All @@ -231,6 +392,7 @@ static int unload_module(void)
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Opus audio",
.support_level = AST_MODULE_SUPPORT_CORE,
.load = load_module,
.reload = reload_module,
.unload = unload_module,
.load_pri = AST_MODPRI_APP_DEPEND
);

0 comments on commit 0c85434

Please sign in to comment.