[svn-commits] file: branch group/media_formats r407956 - in /team/group/media_formats: code...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Feb 11 09:07:21 CST 2014
Author: file
Date: Tue Feb 11 09:07:18 2014
New Revision: 407956
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=407956
Log:
Allow translators to specify the name of a cached format for populating the resulting frame.
Modified:
team/group/media_formats/codecs/codec_a_mu.c
team/group/media_formats/codecs/codec_adpcm.c
team/group/media_formats/codecs/codec_alaw.c
team/group/media_formats/codecs/codec_dahdi.c
team/group/media_formats/codecs/codec_g722.c
team/group/media_formats/codecs/codec_g726.c
team/group/media_formats/codecs/codec_gsm.c
team/group/media_formats/codecs/codec_ilbc.c
team/group/media_formats/codecs/codec_lpc10.c
team/group/media_formats/codecs/codec_resample.c
team/group/media_formats/include/asterisk/translate.h
team/group/media_formats/main/translate.c
Modified: team/group/media_formats/codecs/codec_a_mu.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_a_mu.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_a_mu.c (original)
+++ team/group/media_formats/codecs/codec_a_mu.c Tue Feb 11 09:07:18 2014
@@ -90,6 +90,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "ulaw",
.framein = alawtoulaw_framein,
.sample = alaw_sample,
.buffer_samples = BUFFER_SAMPLES,
@@ -108,6 +109,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "alaw",
.framein = ulawtoalaw_framein,
.sample = ulaw_sample,
.buffer_samples = BUFFER_SAMPLES,
Modified: team/group/media_formats/codecs/codec_adpcm.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_adpcm.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_adpcm.c (original)
+++ team/group/media_formats/codecs/codec_adpcm.c Tue Feb 11 09:07:18 2014
@@ -300,6 +300,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "slin",
.framein = adpcmtolin_framein,
.sample = adpcm_sample,
.desc_size = sizeof(struct adpcm_decoder_pvt),
@@ -319,6 +320,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "adpcm",
.framein = lintoadpcm_framein,
.frameout = lintoadpcm_frameout,
.sample = slin8_sample,
Modified: team/group/media_formats/codecs/codec_alaw.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_alaw.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_alaw.c (original)
+++ team/group/media_formats/codecs/codec_alaw.c Tue Feb 11 09:07:18 2014
@@ -87,6 +87,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "slin",
.framein = alawtolin_framein,
.sample = alaw_sample,
.buffer_samples = BUFFER_SAMPLES,
@@ -105,6 +106,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "alaw",
.framein = lintoalaw_framein,
.sample = slin8_sample,
.buffer_samples = BUFFER_SAMPLES,
Modified: team/group/media_formats/codecs/codec_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_dahdi.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_dahdi.c (original)
+++ team/group/media_formats/codecs/codec_dahdi.c Tue Feb 11 09:07:18 2014
@@ -451,8 +451,6 @@
ast_atomic_fetchadd_int(&channels.decoders, -1);
break;
}
-
- ao2_cleanup(pvt->f.subclass.format);
close(dahdip->fd);
}
Modified: team/group/media_formats/codecs/codec_g722.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_g722.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_g722.c (original)
+++ team/group/media_formats/codecs/codec_g722.c Tue Feb 11 09:07:18 2014
@@ -148,6 +148,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "slin",
.newpvt = g722tolin_new, /* same for both directions */
.framein = g722tolin_framein,
.sample = g722_sample,
@@ -168,6 +169,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 16000,
},
+ .format = "g722",
.newpvt = lintog722_new, /* same for both directions */
.framein = lintog722_framein,
.sample = slin8_sample,
@@ -188,6 +190,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 16000,
},
+ .format = "slin16",
.newpvt = g722tolin16_new, /* same for both directions */
.framein = g722tolin_framein,
.sample = g722_sample,
@@ -208,6 +211,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 16000,
},
+ .format = "g722",
.newpvt = lin16tog722_new, /* same for both directions */
.framein = lintog722_framein,
.sample = slin16_sample,
Modified: team/group/media_formats/codecs/codec_g726.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_g726.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_g726.c (original)
+++ team/group/media_formats/codecs/codec_g726.c Tue Feb 11 09:07:18 2014
@@ -795,6 +795,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "slin",
.newpvt = lintog726_new, /* same for both directions */
.framein = g726tolin_framein,
.sample = g726_sample,
@@ -815,6 +816,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "g726",
.newpvt = lintog726_new, /* same for both directions */
.framein = lintog726_framein,
.sample = slin8_sample,
@@ -835,6 +837,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "slin",
.newpvt = lintog726_new, /* same for both directions */
.framein = g726aal2tolin_framein,
.sample = g726_sample,
@@ -855,6 +858,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "g726aal2",
.newpvt = lintog726_new, /* same for both directions */
.framein = lintog726aal2_framein,
.sample = slin8_sample,
Modified: team/group/media_formats/codecs/codec_gsm.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_gsm.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_gsm.c (original)
+++ team/group/media_formats/codecs/codec_gsm.c Tue Feb 11 09:07:18 2014
@@ -179,6 +179,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "slin",
.newpvt = gsm_new,
.framein = gsmtolin_framein,
.destroy = gsm_destroy_stuff,
@@ -200,6 +201,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "gsm",
.newpvt = gsm_new,
.framein = lintogsm_framein,
.frameout = lintogsm_frameout,
Modified: team/group/media_formats/codecs/codec_ilbc.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_ilbc.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_ilbc.c (original)
+++ team/group/media_formats/codecs/codec_ilbc.c Tue Feb 11 09:07:18 2014
@@ -189,6 +189,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "slin",
.newpvt = ilbctolin_new,
.framein = ilbctolin_framein,
.sample = ilbc_sample,
@@ -209,6 +210,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "ilbc",
.newpvt = lintoilbc_new,
.framein = lintoilbc_framein,
.frameout = lintoilbc_frameout,
Modified: team/group/media_formats/codecs/codec_lpc10.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_lpc10.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_lpc10.c (original)
+++ team/group/media_formats/codecs/codec_lpc10.c Tue Feb 11 09:07:18 2014
@@ -207,6 +207,7 @@
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
},
+ .format = "slin",
.newpvt = lpc10_dec_new,
.framein = lpc10tolin_framein,
.destroy = lpc10_destroy,
@@ -227,7 +228,8 @@
.name = "lpc10",
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
- },
+ },
+ .format = "lpc10",
.newpvt = lpc10_enc_new,
.framein = lintolpc10_framein,
.frameout = lintolpc10_frameout,
Modified: team/group/media_formats/codecs/codec_resample.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/codecs/codec_resample.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/codecs/codec_resample.c (original)
+++ team/group/media_formats/codecs/codec_resample.c Tue Feb 11 09:07:18 2014
@@ -98,6 +98,8 @@
return -1;
}
+ pvt->f.subclass.format = ast_format_cache_get_slin_by_rate(pvt->t->dst_codec.sample_rate);
+
return 0;
}
Modified: team/group/media_formats/include/asterisk/translate.h
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/include/asterisk/translate.h?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/include/asterisk/translate.h (original)
+++ team/group/media_formats/include/asterisk/translate.h Tue Feb 11 09:07:18 2014
@@ -140,6 +140,7 @@
struct ast_codec dst_codec; /*!< Destination codec */
struct ast_codec *core_src_codec; /*!< Core registered source codec */
struct ast_codec *core_dst_codec; /*!< Core registered destination codec */
+ const char *format; /*!< Optional name of a cached format this translator produces */
int table_cost; /*!< Cost value associated with this translator based
* on translation cost table. */
Modified: team/group/media_formats/main/translate.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/main/translate.c?view=diff&rev=407956&r1=407955&r2=407956
==============================================================================
--- team/group/media_formats/main/translate.c (original)
+++ team/group/media_formats/main/translate.c Tue Feb 11 09:07:18 2014
@@ -323,6 +323,7 @@
if (t->destroy)
t->destroy(pvt);
+ ao2_cleanup(pvt->f.subclass.format);
ast_free(pvt);
ast_module_unref(t->module);
}
More information about the svn-commits
mailing list