diff options
author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2009-02-09 12:54:40 +0000 |
---|---|---|
committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2009-02-09 12:54:40 +0000 |
commit | 79e68576f0d06dbec50bde3778e3feffb18b9f76 (patch) | |
tree | 316b7938df805a597996d6ff516d7969953fd77c /plugins/easy_codec | |
parent | a10b54dc85d843fb9c9c79a7227446c6620e5b70 (diff) |
- remove reference to AMR (submitted by mistake)
- add new lines at the ends of headers
- fix struct usage
svn path=/trunk/; revision=27401
Diffstat (limited to 'plugins/easy_codec')
-rw-r--r-- | plugins/easy_codec/codec-g722.c | 8 | ||||
-rw-r--r-- | plugins/easy_codec/codec-g722.h | 2 | ||||
-rw-r--r-- | plugins/easy_codec/codec-g7231.c | 8 | ||||
-rw-r--r-- | plugins/easy_codec/codec-g7231.h | 2 | ||||
-rw-r--r-- | plugins/easy_codec/codec-g729a.c | 8 | ||||
-rw-r--r-- | plugins/easy_codec/codec-g729a.h | 2 | ||||
-rw-r--r-- | plugins/easy_codec/easy_codec_plugin.c | 2 |
7 files changed, 15 insertions, 17 deletions
diff --git a/plugins/easy_codec/codec-g722.c b/plugins/easy_codec/codec-g722.c index 576d15a085..274ca6772f 100644 --- a/plugins/easy_codec/codec-g722.c +++ b/plugins/easy_codec/codec-g722.c @@ -40,15 +40,15 @@ struct g722_context { }; void *codec_g722_init(void) { - g722_context *ctx = 0; + struct g722_context *ctx = 0; - ctx = (g722_context*)g_malloc0(sizeof(g722_context)); + ctx = (struct g722_context*)g_malloc0(sizeof(struct g722_context)); ctx->handle = EasyG722_init_decoder(); return ctx; } void codec_g722_release(void *context) { - g722_context *ctx = (g722_context*)context; + struct g722_context *ctx = (struct g722_context*)context; if (!ctx) return; EasyG722_release_decoder(ctx->handle); @@ -56,7 +56,7 @@ void codec_g722_release(void *context) { } int codec_g722_decode(void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes) { - g722_context *ctx = (g722_context*)context; + struct g722_context *ctx = (struct g722_context*)context; const unsigned char *bitstream = (const unsigned char*)input; short *speech = (short*)output; int decodedBytes = 0; diff --git a/plugins/easy_codec/codec-g722.h b/plugins/easy_codec/codec-g722.h index de41553909..ccdf72245d 100644 --- a/plugins/easy_codec/codec-g722.h +++ b/plugins/easy_codec/codec-g722.h @@ -38,4 +38,4 @@ int codec_g722_decode(void *ctx, const void *input, int inputSizeBytes, void *ou } /* extern "C" */ #endif -#endif /* _CODEC_G729_H_ */
\ No newline at end of file +#endif /* _CODEC_G729_H_ */ diff --git a/plugins/easy_codec/codec-g7231.c b/plugins/easy_codec/codec-g7231.c index dcfa8923f1..49ba9424d3 100644 --- a/plugins/easy_codec/codec-g7231.c +++ b/plugins/easy_codec/codec-g7231.c @@ -41,15 +41,15 @@ struct g7231_context { }; void *codec_g7231_init(void) { - g7231_context *ctx = 0; + struct g7231_context *ctx = 0; - ctx = (g7231_context*)g_malloc0(sizeof(g7231_context)); + ctx = (struct g7231_context*)g_malloc0(sizeof(struct g7231_context)); ctx->handle = -1; return ctx; } void codec_g7231_release(void *context) { - g7231_context *ctx = (g7231_context*)context; + struct g7231_context *ctx = (struct g7231_context*)context; if (!ctx) return; EasyG7231_release_decoder(ctx->handle); @@ -57,7 +57,7 @@ void codec_g7231_release(void *context) { } int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes) { - g7231_context *ctx = (g7231_context*)context; + struct g7231_context *ctx = (struct g7231_context*)context; const unsigned char *bitstream = (const unsigned char*)input; short *speech = (short*)output; int decodedBytes = 0; diff --git a/plugins/easy_codec/codec-g7231.h b/plugins/easy_codec/codec-g7231.h index 9000d33c08..533030814c 100644 --- a/plugins/easy_codec/codec-g7231.h +++ b/plugins/easy_codec/codec-g7231.h @@ -38,4 +38,4 @@ int codec_g7231_decode(void *ctx, const void *input, int inputSizeBytes, void *o } /* extern "C" */ #endif -#endif /* _CODEC_G729_H_ */
\ No newline at end of file +#endif /* _CODEC_G729_H_ */ diff --git a/plugins/easy_codec/codec-g729a.c b/plugins/easy_codec/codec-g729a.c index 4ad739d955..e1b6372de5 100644 --- a/plugins/easy_codec/codec-g729a.c +++ b/plugins/easy_codec/codec-g729a.c @@ -40,15 +40,15 @@ struct g729a_context { }; void *codec_g729a_init(void) { - g729a_context *ctx = 0; + struct g729a_context *ctx = 0; - ctx = (g729a_context*)g_malloc0(sizeof(g729a_context)); + ctx = (struct g729a_context*)g_malloc0(sizeof(struct g729a_context)); ctx->handle = EasyG729A_init_decoder(); return ctx; } void codec_g729a_release(void *context) { - g729a_context *ctx = (g729a_context*)context; + struct g729a_context *ctx = (struct g729a_context*)context; if (!ctx) return; EasyG729A_release_decoder(ctx->handle); @@ -56,7 +56,7 @@ void codec_g729a_release(void *context) { } int codec_g729a_decode(void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes) { - g729a_context *ctx = (g729a_context*)context; + struct g729a_context *ctx = (struct g729a_context*)context; const unsigned char *bitstream = (const unsigned char*)input; short *speech = (short*)output; int decodedBytes = 0; diff --git a/plugins/easy_codec/codec-g729a.h b/plugins/easy_codec/codec-g729a.h index ac75b62d03..4587586be8 100644 --- a/plugins/easy_codec/codec-g729a.h +++ b/plugins/easy_codec/codec-g729a.h @@ -38,4 +38,4 @@ int codec_g729a_decode(void *ctx, const void *input, int inputSizeBytes, void *o } /* extern "C" */ #endif -#endif /* _CODEC_G729A_H_ */
\ No newline at end of file +#endif /* _CODEC_G729A_H_ */ diff --git a/plugins/easy_codec/easy_codec_plugin.c b/plugins/easy_codec/easy_codec_plugin.c index d8ca1aeffc..6ef0b76b10 100644 --- a/plugins/easy_codec/easy_codec_plugin.c +++ b/plugins/easy_codec/easy_codec_plugin.c @@ -34,7 +34,6 @@ #include "codec-g7231.h" #include "codec-g729a.h" #include "codec-g722.h" -#include "codec-amr.h" G_MODULE_EXPORT const gchar version[] = "0.0.1"; @@ -43,7 +42,6 @@ G_MODULE_EXPORT void register_codec_module(void) register_codec("g723", codec_g7231_init, codec_g7231_release, codec_g7231_decode); register_codec("g729", codec_g729a_init, codec_g729a_release, codec_g729a_decode); register_codec("g722", codec_g722_init, codec_g722_release, codec_g722_decode); - register_codec("amr", codec_amr_init, codec_amr_release, codec_amr_decode); } #endif |