Mercurial > pidgin
diff src/mediastreamer/msilbcdec.c @ 12029:1c771536a032
[gaim-migrate @ 14322]
This _compiles_ for me now. Theres still a bunch of "dereferencing type-punned pointer will break strict-aliasing rules" warning and some redefinition warnings from the various config.h's. The deferencing warnings look like a BE<->LE hack but I left them untouched for the time being.
committer: Tailor Script <tailor@pidgin.im>
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Wed, 09 Nov 2005 09:57:33 +0000 |
| parents | e67993da8a22 |
| children |
line wrap: on
line diff
--- a/src/mediastreamer/msilbcdec.c Wed Nov 09 09:02:43 2005 +0000 +++ b/src/mediastreamer/msilbcdec.c Wed Nov 09 09:57:33 2005 +0000 @@ -83,11 +83,16 @@ { switch(prop){ case MS_FILTER_PROPERTY_FMTP: - if (!value) return; + if (!value) return 0; if (strstr(value,"ptime=20")!=NULL) obj->ms_per_frame=20; else if (strstr(value,"ptime=30")!=NULL) obj->ms_per_frame=30; else g_warning("Unrecognized fmtp parameter for ilbc encoder!"); break; + case MS_FILTER_PROPERTY_FREQ: + case MS_FILTER_PROPERTY_BITRATE: + case MS_FILTER_PROPERTY_CHANNELS: + default: + break; } return 0; } @@ -98,13 +103,17 @@ if (obj->ms_per_frame==20) strncpy(value,"ptime=20",MS_FILTER_PROPERTY_STRING_MAX_SIZE); if (obj->ms_per_frame==30) strncpy(value,"ptime=30",MS_FILTER_PROPERTY_STRING_MAX_SIZE); break; + case MS_FILTER_PROPERTY_FREQ: + case MS_FILTER_PROPERTY_BITRATE: + case MS_FILTER_PROPERTY_CHANNELS: + default: + break; } return 0; } void ms_ilbc_decoder_setup(MSILBCDecoder *r) { - MSFilterClass *klass = NULL; switch (r->ms_per_frame) { case 20: r->samples_per_frame = BLOCKL_20MS; @@ -157,7 +166,6 @@ { MSFifo *fo; MSQueue *qi; - int err1; void *dst=NULL; float speech[ILBC_MAX_SAMPLES_PER_FRAME]; MSMessage *m;