Changeset 995:ee080ab7002b in mediastreamer2
- Timestamp:
- Jun 15, 2010 12:32:06 PM (3 years ago)
- Branch:
- default
- File:
-
- 1 edited
-
src/audiomixer.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/audiomixer.c
r993 r995 66 66 s->bytespertick=(2*s->nchannels*s->rate*f->ticker->interval)/1000; 67 67 s->sum=(int32_t*)ms_malloc0((s->bytespertick/2)*sizeof(int32_t)); 68 /*ms_message("bytespertick=%i, purgeoffset=%i",s->bytespertick,s->purgeoffset);*/ 68 69 } 69 70 … … 111 112 112 113 memset(s->sum,0,nwords*sizeof(int32_t)); 113 114 114 115 for(i=0;i<MIXER_MAX_CHANNELS;++i){ 115 116 MSQueue *q=f->inputs[i]; … … 194 195 mixer_postprocess, 195 196 mixer_uninit, 196 methods 197 methods, 198 MS_FILTER_IS_PUMP 197 199 }; 198 200 … … 211 213 .postprocess=mixer_postprocess, 212 214 .uninit=mixer_uninit, 213 .methods=methods 215 .methods=methods, 216 .flags=MS_FILTER_IS_PUMP 214 217 }; 215 218
Note: See TracChangeset
for help on using the changeset viewer.
