diff options
author | Richard Mudgett <rmudgett@digium.com> | 2016-11-15 16:23:35 -0600 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2016-11-16 13:49:23 -0600 |
commit | ed0f1afc8cea8918171a1aabc9b6885bba41e3c4 (patch) | |
tree | 72eaef93bcdd6e6c4a88774845abc53d064eb1b4 /main/codec_builtin.c | |
parent | 4c3d25875f0a91554437020aec8f79e53db1d26b (diff) |
codec_opus: Fix warning when Opus negotiated but codec_opus not loaded.
When Opus is negotiated but not loaded, the log is spammed with messages
because the system does not know how to calculate the number of samples in
a frame.
* Suppress the warning by supplying a function that assumes 20ms of
samples in the frame. For pass through support it doesn't really seem to
matter what number of samples is returned anyway.
ASTERISK-26605 #close
Change-Id: Icf2273692f040dc2c45b01e72a790d11092f9e0f
Diffstat (limited to 'main/codec_builtin.c')
-rw-r--r-- | main/codec_builtin.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/main/codec_builtin.c b/main/codec_builtin.c index 973423d55..da03cce6b 100644 --- a/main/codec_builtin.c +++ b/main/codec_builtin.c @@ -701,6 +701,21 @@ static struct ast_codec g719 = { .get_length = g719_length, }; +static int opus_samples(struct ast_frame *frame) +{ + /* + * XXX This is likely not at all what's intended from this + * callback. If you have codec_opus.so loaded then this + * function is overridden anyway. However, since opus is + * variable bit rate and I cannot extract the calculation code + * from the opus library, I am going to punt and assume 20ms + * worth of samples. In testing, this has worked just fine. + * Pass through support doesn't seem to care about the value + * returned anyway. + */ + return ast_format_get_sample_rate(frame->subclass.format) / 50; +} + static struct ast_codec opus = { .name = "opus", .description = "Opus Codec", @@ -709,6 +724,7 @@ static struct ast_codec opus = { .minimum_ms = 20, .maximum_ms = 60, .default_ms = 20, + .samples_count = opus_samples, .minimum_bytes = 10, }; |