Menu
▾
▴
tritonus-commits — CVS activity reports: sends one email per commit.
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(14) |
Dec
(33) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(68) |
Feb
(19) |
Mar
(6) |
Apr
(97) |
May
(15) |
Jun
(28) |
Jul
(83) |
Aug
(21) |
Sep
(67) |
Oct
(16) |
Nov
|
Dec
(22) |
| 2003 |
Jan
(47) |
Feb
(17) |
Mar
(5) |
Apr
|
May
(5) |
Jun
(106) |
Jul
(25) |
Aug
|
Sep
(14) |
Oct
(7) |
Nov
(24) |
Dec
(5) |
| 2004 |
Jan
(54) |
Feb
(19) |
Mar
|
Apr
(33) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(6) |
Nov
(153) |
Dec
(6) |
| 2005 |
Jan
(178) |
Feb
(17) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(2) |
Feb
(173) |
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(12) |
Dec
(14) |
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(29) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
(29) |
Feb
(3) |
Mar
(5) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(3) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
(7) |
Feb
|
Mar
(18) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Florian B. <fl...@us...> - 2015-04-09 19:12:14
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2714/tritonus/src/classes/org/tritonus/sampled/file Modified Files: AiffAudioFileReader.java AiffAudioFileWriter.java AiffAudioOutputStream.java AiffTool.java AuAudioFileReader.java AuAudioFileWriter.java AuAudioOutputStream.java AuTool.java WaveAudioFileReader.java WaveAudioFileWriter.java WaveAudioOutputStream.java WaveTool.java Log Message: switch to Apache License Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffAudioFileReader.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffAudioFileWriter.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffAudioOutputStream.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffTool.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioFileReader.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioFileWriter.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioOutputStream.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuTool.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioFileReader.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioFileWriter.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioOutputStream.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveTool.java Index: AiffAudioFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffAudioFileReader.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** AiffAudioFileReader.java 3 Jun 2007 19:44:26 -0000 1.3 --- AiffAudioFileReader.java 9 Apr 2015 19:11:40 -0000 1.4 *************** *** 10,26 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 10,24 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AiffAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffAudioFileWriter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** AiffAudioFileWriter.java 13 Feb 2006 13:25:24 -0000 1.3 --- AiffAudioFileWriter.java 9 Apr 2015 19:11:40 -0000 1.4 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AiffAudioOutputStream.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffAudioOutputStream.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AiffAudioOutputStream.java 3 Jun 2007 19:46:23 -0000 1.2 --- AiffAudioOutputStream.java 9 Apr 2015 19:11:40 -0000 1.3 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AiffTool.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AiffTool.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** AiffTool.java 3 Jun 2007 22:10:00 -0000 1.3 --- AiffTool.java 9 Apr 2015 19:11:40 -0000 1.4 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AuAudioFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioFileReader.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** AuAudioFileReader.java 3 Jun 2007 19:44:42 -0000 1.5 --- AuAudioFileReader.java 9 Apr 2015 19:11:40 -0000 1.6 *************** *** 10,26 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 10,24 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AuAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioFileWriter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** AuAudioFileWriter.java 13 Feb 2006 13:25:24 -0000 1.3 --- AuAudioFileWriter.java 9 Apr 2015 19:11:40 -0000 1.4 *************** *** 10,26 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 10,24 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AuAudioOutputStream.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuAudioOutputStream.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** AuAudioOutputStream.java 3 Jun 2007 19:49:29 -0000 1.3 --- AuAudioOutputStream.java 9 Apr 2015 19:11:40 -0000 1.4 *************** *** 10,26 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 10,24 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AuTool.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/AuTool.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** AuTool.java 3 Jun 2007 22:10:00 -0000 1.3 --- AuTool.java 9 Apr 2015 19:11:40 -0000 1.4 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: WaveAudioFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioFileReader.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** WaveAudioFileReader.java 19 Jan 2013 21:43:19 -0000 1.4 --- WaveAudioFileReader.java 9 Apr 2015 19:11:40 -0000 1.5 *************** *** 10,26 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 10,24 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: WaveAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioFileWriter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** WaveAudioFileWriter.java 13 Feb 2006 13:25:24 -0000 1.3 --- WaveAudioFileWriter.java 9 Apr 2015 19:11:40 -0000 1.4 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: WaveAudioOutputStream.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveAudioOutputStream.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** WaveAudioOutputStream.java 5 Mar 2013 18:39:01 -0000 1.5 --- WaveAudioOutputStream.java 9 Apr 2015 19:11:40 -0000 1.6 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: WaveTool.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/WaveTool.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** WaveTool.java 19 Jan 2013 21:43:19 -0000 1.4 --- WaveTool.java 9 Apr 2015 19:11:40 -0000 1.5 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ |
|
From: Florian B. <fl...@us...> - 2015-04-09 19:12:13
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/file In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2714/tritonus/src/classes/org/tritonus/midi/file Modified Files: MidiConstants.java StandardMidiFileReader.java StandardMidiFileWriter.java Log Message: switch to Apache License Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/midi/file/MidiConstants.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/midi/file/StandardMidiFileReader.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/midi/file/StandardMidiFileWriter.java Index: MidiConstants.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/file/MidiConstants.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** MidiConstants.java 16 Jan 2005 12:26:13 -0000 1.1 --- MidiConstants.java 9 Apr 2015 19:11:40 -0000 1.2 *************** *** 8,24 **** * Copyright (c) 2002 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 2002 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ Index: StandardMidiFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/file/StandardMidiFileReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** StandardMidiFileReader.java 13 Feb 2006 12:21:49 -0000 1.2 --- StandardMidiFileReader.java 9 Apr 2015 19:11:40 -0000 1.3 *************** *** 8,24 **** * Copyright (c) 1999, 2000 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 1999, 2000 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ Index: StandardMidiFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/midi/file/StandardMidiFileWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** StandardMidiFileWriter.java 16 Jan 2005 12:26:13 -0000 1.1 --- StandardMidiFileWriter.java 9 Apr 2015 19:11:40 -0000 1.2 *************** *** 8,24 **** * Copyright (c) 1999, 2000 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 1999, 2000 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ |
|
From: Florian B. <fl...@us...> - 2015-04-09 19:12:12
|
Update of /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/spi In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2714/tritonus/src/classes/javax/sound/sampled/spi Modified Files: AudioFileReader.java AudioFileWriter.java FormatConversionProvider.java MixerProvider.java Log Message: switch to Apache License Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/sampled/spi/AudioFileReader.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/sampled/spi/AudioFileWriter.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/sampled/spi/FormatConversionProvider.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/javax/sound/sampled/spi/MixerProvider.java Index: AudioFileReader.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/spi/AudioFileReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AudioFileReader.java 16 Jan 2005 08:25:04 -0000 1.1 --- AudioFileReader.java 9 Apr 2015 19:11:38 -0000 1.2 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/spi/AudioFileWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** AudioFileWriter.java 13 Feb 2006 12:21:48 -0000 1.2 --- AudioFileWriter.java 9 Apr 2015 19:11:38 -0000 1.3 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: FormatConversionProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/spi/FormatConversionProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** FormatConversionProvider.java 16 Jan 2005 08:25:04 -0000 1.1 --- FormatConversionProvider.java 9 Apr 2015 19:11:38 -0000 1.2 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: MixerProvider.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/javax/sound/sampled/spi/MixerProvider.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** MixerProvider.java 16 Jan 2005 08:25:04 -0000 1.1 --- MixerProvider.java 9 Apr 2015 19:11:38 -0000 1.2 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ |
|
From: Florian B. <fl...@us...> - 2015-04-09 19:12:11
|
Update of /cvsroot/tritonus/tritonus In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2714/tritonus Modified Files: INSTALL NEWS README configure.in Added Files: LICENSE Removed Files: ConvertJDK117 LGPL Log Message: switch to Apache License Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/LICENSE http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/INSTALL http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/NEWS http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/README http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/configure.in http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/ConvertJDK117 http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/LGPL --- NEW FILE: LICENSE --- Index: INSTALL =================================================================== RCS file: /cvsroot/tritonus/tritonus/INSTALL,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -r1.18 -r1.19 *** INSTALL 10 Feb 2006 13:33:41 -0000 1.18 --- INSTALL 9 Apr 2015 19:11:38 -0000 1.19 *************** *** 16,20 **** Which components do i need? ! [TODO: Which coponents to compile/install] --- 16,20 ---- Which components do i need? ! [TODO: Which components to compile/install] *************** *** 23,54 **** ============= ! - jdk 1.5.x. Testing was done with the ! Sun jdk 1.5.0-b64. Other versions may work. If you want to compile Linux specific components, it is recommended to do ! it on a Linux system, so you need a j2sdk for Linux. Cross-compiling has not been tested. If you only want to build pure-java (not Linux specific) components, you ! can use a j2sdk on any platform. ! Tritonus does not work with jdk1.1.X. There are no experiences with gcj. Reports are welcome. - Optional: jikes (recommended, testing was done with version 1.16) ! - Either: the Enlightened Sound Daemon (esd or EsounD). On Debian ! systems, install the packages esound-common, esound, libesd0 and ! libesd0-dev. On Suse systems, install the package esound. If esd is ! not part of your Linux distribution, look at www.gnome.org. Make sure ! you have not only the daemon and the shared library, but also the header ! files for libesd. ! ! NOTE: this is kept more or less as a compatibility option. Esd is ! considered a badly designed program. Using ALSA is highly ! recommended. ! ! - Or: ALSA 0.9.0rc2 or later or the corresponding cvs state. Get it ! from http://www.alsa-project.org/. It is recommended to use ALSA if ! you want to get high-performance, low-latency operation, or reliable ! full-duplex. It is a necessity if you want professional-grade MIDI support. ! Testing was done with ALSA 0.9.0rc2. 0.9.0rc3 has been reported to work. STILL ANOTHER NOTE: currently, Tritonus' ALSA handling does not do --- 23,41 ---- ============= ! - jdk 5 or later. If you want to compile Linux specific components, it is recommended to do ! it on a Linux system, so you need a JDK for Linux. Cross-compiling has not been tested. If you only want to build pure-java (not Linux specific) components, you ! can use a JDK on any platform. ! Tritonus does not work with JDK 1.1.X. There are no experiences with gcj. Reports are welcome. - Optional: jikes (recommended, testing was done with version 1.16) ! - It is recommended to use ALSA if you want to get high-performance, ! low-latency operation, or reliable full-duplex. It is a necessity if ! you want professional-grade MIDI support. Testing was done with ALSA ! 0.9.0rc2. 0.9.0rc3 has been reported to work. STILL ANOTHER NOTE: currently, Tritonus' ALSA handling does not do *************** *** 86,89 **** --- 73,77 ---- and that it is available in the classpath during the build. Only then the mp3 SPI plug-in gets compiled and packaged. + See also README_mp3. Index: NEWS =================================================================== RCS file: /cvsroot/tritonus/tritonus/NEWS,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** NEWS 13 Apr 2000 19:14:04 -0000 1.1.1.1 --- NEWS 9 Apr 2015 19:11:38 -0000 1.2 *************** *** 1,4 **** --- 1,6 ---- NEWS for Tritonus + Re-released under Apache v2 license. + version 0.2.0: - bug fixes in audio file writers *************** *** 58,63 **** - Mixer.get*Formats() work - Please report bugs to the author of this library: - Matthias Pfisterer <Mat...@gm...> - Have fun! --- 60,62 ---- Index: README =================================================================== RCS file: /cvsroot/tritonus/tritonus/README,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** README 9 Nov 2008 22:45:28 -0000 1.6 --- README 9 Apr 2015 19:11:38 -0000 1.7 *************** *** 1,20 **** This is Tritonus, version 0.3.7 ! Tritonus is an implementation of the Java Sound API (as of Java 5.0) ! and several Java Sound plugins ("service providers"). For pre-compiled versions of these components, see: http://www.tritonus.org/plugins.html ! Tritonus is distributed under the terms of the GNU Library General ! Public License. See the file LGPL for details. ! For installing instructions, see the file INSTALL. For new features and bug fixes, see file NEWS - - Please report bugs in Tritonus: - http://sourceforge.net/bugs/?group_id=1390 or send mail to the - developer mailing list: mailto:tri...@li... - You may also have a look at the Tritonus page: http://www.tritonus.org/ --- 1,23 ---- This is Tritonus, version 0.3.7 ! Tritonus is an implementation of the Java Sound API and several ! Java Sound plugins ("service providers"). For pre-compiled versions of these components, see: http://www.tritonus.org/plugins.html ! License: ! Tritonus is distributed under the terms of the Apache License, ! Version 2.0. See the file LICENSE for details. ! ! License Exceptions: ! - the low level GSM code (package org.tritonus.lowlevel.gsm) ! is licensed under the GNU GPL ! - BladeMP3EncDLL.h for Windows is licensed under the GNU LGPL. ! - the pvorbis lib is licensed under a BSD style license ! Installation: ! For installation instructions, see the file INSTALL. For new features and bug fixes, see file NEWS You may also have a look at the Tritonus page: http://www.tritonus.org/ Index: configure.in =================================================================== RCS file: /cvsroot/tritonus/tritonus/configure.in,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** configure.in 12 Feb 2006 08:56:32 -0000 1.33 --- configure.in 9 Apr 2015 19:11:38 -0000 1.34 *************** *** 117,122 **** AC_PROG_INSTALL AC_PROG_LN_S ! AC_DISABLE_STATIC ! AC_PROG_LIBTOOL AC_SUBST(SUBDIRS) --- 117,123 ---- AC_PROG_INSTALL AC_PROG_LN_S ! # does not work with my version of autoconf ! # AC_DISABLE_STATIC ! # AC_PROG_LIBTOOL AC_SUBST(SUBDIRS) *************** *** 125,129 **** AC_CHECK_LIB(asound, snd_seq_open,[SUBDIRS="$SUBDIRS src/lib/alsa"; AC_MSG_RESULT(Information: will build stuff for ALSA sequencer)],[AC_MSG_RESULT(Information: will not build stuff for ALSA sequencer)],) AC_CHECK_LIB(esd,esd_open_sound,[SUBDIRS="$SUBDIRS src/lib/esd"; AC_MSG_RESULT(Information: will build stuff for Enlightened Sound Daemon)],[AC_MSG_RESULT(Information: will not build stuff for Enlightened Sound Daemon)]) ! AC_CHECK_LIB(mp3lame,lame_init_params,[SUBDIRS="$SUBDIRS src/lib/lame"; AC_MSG_RESULT(Information: will build stuff for LAME mp3 encoder)],[AC_MSG_RESULT(Information: will not build stuff for LAME mp3 encoder)]) AC_CHECK_HEADER(linux/cdrom.h,[SUBDIRS="$SUBDIRS src/lib/cooked_ioctl"; AC_MSG_RESULT(Information: will build stuff for 'cooked ioctl' cdda)],[AC_MSG_RESULT(Information: will not build stuff for 'cooked ioctl' cdda)]) AC_CHECK_HEADER(cdda_interface.h,[SUBDIRS="$SUBDIRS src/lib/cdparanoia"; AC_MSG_RESULT(Information: will build stuff for cdparanoia)],[AC_MSG_RESULT(Information: will not build stuff for cdparanoia)]) --- 126,130 ---- AC_CHECK_LIB(asound, snd_seq_open,[SUBDIRS="$SUBDIRS src/lib/alsa"; AC_MSG_RESULT(Information: will build stuff for ALSA sequencer)],[AC_MSG_RESULT(Information: will not build stuff for ALSA sequencer)],) AC_CHECK_LIB(esd,esd_open_sound,[SUBDIRS="$SUBDIRS src/lib/esd"; AC_MSG_RESULT(Information: will build stuff for Enlightened Sound Daemon)],[AC_MSG_RESULT(Information: will not build stuff for Enlightened Sound Daemon)]) ! AC_CHECK_LIB(mp3lame,lame_init_params,[SUBDIRS="$SUBDIRS src/lib/lame"; AC_MSG_RESULT(Information: will build stuff for LAME mp3 encoder)],[AC_MSG_RESULT(Information: will not build stuff for LAME mp3 encoder)], -lm) AC_CHECK_HEADER(linux/cdrom.h,[SUBDIRS="$SUBDIRS src/lib/cooked_ioctl"; AC_MSG_RESULT(Information: will build stuff for 'cooked ioctl' cdda)],[AC_MSG_RESULT(Information: will not build stuff for 'cooked ioctl' cdda)]) AC_CHECK_HEADER(cdda_interface.h,[SUBDIRS="$SUBDIRS src/lib/cdparanoia"; AC_MSG_RESULT(Information: will build stuff for cdparanoia)],[AC_MSG_RESULT(Information: will not build stuff for cdparanoia)]) --- ConvertJDK117 DELETED --- --- LGPL DELETED --- |
|
From: Florian B. <fl...@us...> - 2015-04-09 19:11:46
|
Update of /cvsroot/tritonus/tritonus/src/org/tritonus/sampled/cdda In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2714/tritonus/src/org/tritonus/sampled/cdda Modified Files: CddaDataConnection.java CddaDriveListConnection.java CddaStreamHandler.java CddaTocConnection.java CddaURLStreamHandlerFactory.java Log Message: switch to Apache License Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaDataConnection.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaDriveListConnection.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaStreamHandler.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaTocConnection.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaURLStreamHandlerFactory.java Index: CddaDataConnection.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaDataConnection.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** CddaDataConnection.java 13 Feb 2006 21:38:30 -0000 1.7 --- CddaDataConnection.java 9 Apr 2015 19:11:42 -0000 1.8 *************** *** 8,24 **** * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ Index: CddaDriveListConnection.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaDriveListConnection.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** CddaDriveListConnection.java 23 Nov 2004 19:28:57 -0000 1.5 --- CddaDriveListConnection.java 9 Apr 2015 19:11:42 -0000 1.6 *************** *** 8,24 **** * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ Index: CddaStreamHandler.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaStreamHandler.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** CddaStreamHandler.java 23 Nov 2004 19:28:57 -0000 1.5 --- CddaStreamHandler.java 9 Apr 2015 19:11:42 -0000 1.6 *************** *** 8,24 **** * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ Index: CddaTocConnection.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaTocConnection.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** CddaTocConnection.java 23 Nov 2004 19:28:57 -0000 1.5 --- CddaTocConnection.java 9 Apr 2015 19:11:42 -0000 1.6 *************** *** 8,24 **** * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ Index: CddaURLStreamHandlerFactory.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/org/tritonus/sampled/cdda/CddaURLStreamHandlerFactory.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** CddaURLStreamHandlerFactory.java 23 Nov 2004 19:28:57 -0000 1.5 --- CddaURLStreamHandlerFactory.java 9 Apr 2015 19:11:42 -0000 1.6 *************** *** 8,24 **** * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 2001 - 2002 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ |
|
From: Florian B. <fl...@us...> - 2015-04-09 19:11:45
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2714/tritonus/src/classes/org/tritonus/share/sampled Modified Files: AudioFileTypes.java AudioFormatSet.java AudioFormats.java AudioSystemShadow.java AudioUtils.java Encodings.java FloatSampleBuffer.java FloatSampleTools.java TAudioFormat.java TConversionTool.java TVolumeUtils.java Log Message: switch to Apache License Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFileTypes.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFormatSet.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFormats.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioSystemShadow.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioUtils.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/Encodings.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleBuffer.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleTools.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/TAudioFormat.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/TConversionTool.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/TVolumeUtils.java Index: AudioFileTypes.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFileTypes.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** AudioFileTypes.java 3 Mar 2008 15:34:32 -0000 1.4 --- AudioFileTypes.java 9 Apr 2015 19:11:41 -0000 1.5 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AudioFormatSet.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFormatSet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** AudioFormatSet.java 3 Mar 2008 15:34:32 -0000 1.5 --- AudioFormatSet.java 9 Apr 2015 19:11:41 -0000 1.6 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AudioFormats.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioFormats.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AudioFormats.java 20 Jan 2005 07:47:16 -0000 1.1 --- AudioFormats.java 9 Apr 2015 19:11:41 -0000 1.2 *************** *** 10,26 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 10,24 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AudioSystemShadow.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioSystemShadow.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** AudioSystemShadow.java 20 Jan 2005 07:47:16 -0000 1.1 --- AudioSystemShadow.java 9 Apr 2015 19:11:41 -0000 1.2 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: AudioUtils.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/AudioUtils.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** AudioUtils.java 7 Jan 2008 16:02:27 -0000 1.5 --- AudioUtils.java 9 Apr 2015 19:11:41 -0000 1.6 *************** *** 8,24 **** * Copyright (c) 2000 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 8,22 ---- * Copyright (c) 2000 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: Encodings.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/Encodings.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Encodings.java 3 Mar 2008 15:34:32 -0000 1.4 --- Encodings.java 9 Apr 2015 19:11:41 -0000 1.5 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: FloatSampleBuffer.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleBuffer.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** FloatSampleBuffer.java 27 Feb 2008 15:00:32 -0000 1.10 --- FloatSampleBuffer.java 9 Apr 2015 19:11:41 -0000 1.11 *************** *** 8,24 **** * Copyright (c) 2000-2006 by Florian Bomers <http://www.bomers.de> * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 2000-2006 by Florian Bomers <http://www.bomers.de> * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ Index: FloatSampleTools.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/FloatSampleTools.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** FloatSampleTools.java 7 Jan 2008 16:03:26 -0000 1.6 --- FloatSampleTools.java 9 Apr 2015 19:11:41 -0000 1.7 *************** *** 8,24 **** * Copyright (c) 2000-2006 by Florian Bomers <http://www.bomers.de> * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 2000-2006 by Florian Bomers <http://www.bomers.de> * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ Index: TAudioFormat.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/TAudioFormat.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** TAudioFormat.java 3 Jun 2007 19:52:37 -0000 1.2 --- TAudioFormat.java 9 Apr 2015 19:11:41 -0000 1.3 *************** *** 8,24 **** * Copyright (c) 2003 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 2003 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ Index: TConversionTool.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/TConversionTool.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TConversionTool.java 20 Jan 2005 07:47:16 -0000 1.1 --- TConversionTool.java 9 Apr 2015 19:11:41 -0000 1.2 *************** *** 10,26 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 10,24 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ Index: TVolumeUtils.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/TVolumeUtils.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** TVolumeUtils.java 20 Jan 2005 07:47:16 -0000 1.1 --- TVolumeUtils.java 9 Apr 2015 19:11:41 -0000 1.2 *************** *** 8,24 **** * Copyright (c) 1999 by Matthias Pfisterer * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ --- 8,22 ---- * Copyright (c) 1999 by Matthias Pfisterer * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ |
|
From: Florian B. <fl...@us...> - 2015-04-09 19:11:44
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/mpeg In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2714/tritonus/src/classes/org/tritonus/sampled/file/mpeg Modified Files: MpegAudioFileWriter.java Log Message: switch to Apache License Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/sampled/file/mpeg/MpegAudioFileWriter.java Index: MpegAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/sampled/file/mpeg/MpegAudioFileWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** MpegAudioFileWriter.java 3 Jun 2007 19:36:36 -0000 1.2 --- MpegAudioFileWriter.java 9 Apr 2015 19:11:40 -0000 1.3 *************** *** 9,25 **** * * ! * This program is free software; you can redistribute it and/or modify ! * it under the terms of the GNU Library General Public License as published ! * by the Free Software Foundation; either version 2 of the License, or ! * (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this program; if not, write to the Free Software ! * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * */ --- 9,23 ---- * * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at * ! * http://www.apache.org/licenses/LICENSE-2.0 * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. * */ |
|
From: Matthias P. <pfi...@us...> - 2013-03-10 07:40:31
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16052/src/classes/org/tritonus/lowlevel/gsm Modified Files: BitDecoder.java GSMDecoder.java Log Message: - refactoring of GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: BitDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** BitDecoder.java 10 Mar 2013 00:47:48 -0000 1.7 --- BitDecoder.java 10 Mar 2013 07:40:28 -0000 1.8 *************** *** 38,48 **** } ! private final void getNextCodedByteValue() { ! m_sr |= getNextCodedByteValue2() << m_currentBits; m_currentBits += 8; } ! private final int getNextCodedByteValue2() { int value = m_codedFrame[m_codedFrameByteIndex]; --- 38,48 ---- } ! private final void addNextCodedByteValue() { ! m_sr |= getNextCodedByteValue() << m_currentBits; m_currentBits += 8; } ! private final int getNextCodedByteValue() { int value = m_codedFrame[m_codedFrameByteIndex]; *************** *** 58,62 **** while (m_currentBits < bits) { ! getNextCodedByteValue(); } int value = m_sr & Gsm_Def.BITMASKS[bits]; --- 58,62 ---- while (m_currentBits < bits) { ! addNextCodedByteValue(); } int value = m_sr & Gsm_Def.BITMASKS[bits]; Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** GSMDecoder.java 10 Mar 2013 00:47:48 -0000 1.17 --- GSMDecoder.java 10 Mar 2013 07:40:28 -0000 1.18 *************** *** 109,113 **** { case TOAST: ! anDecodedData = decode(abFrame, nFrameStart, true); for (int i = 0; i < 160; i++) { --- 109,113 ---- { case TOAST: ! anDecodedData = decode(abFrame, nFrameStart); for (int i = 0; i < 160; i++) { *************** *** 117,121 **** break; case MICROSOFT: ! anDecodedData = decode(abFrame, nFrameStart, true); for (int i = 0; i < 160; i++) { --- 117,121 ---- break; case MICROSOFT: ! anDecodedData = decode(abFrame, nFrameStart); for (int i = 0; i < 160; i++) { *************** *** 123,127 **** + nBufferStart, bBigEndian); } ! anDecodedData = decode(abFrame, nFrameStart + 33, false); for (int i = 0; i < 160; i++) { --- 123,127 ---- + nBufferStart, bBigEndian); } ! anDecodedData = decode(abFrame, nFrameStart + 33); for (int i = 0; i < 160; i++) { *************** *** 142,155 **** * @param bufferStartOffset * offset into the array for the coded frame - * @param firstHalfOfMicrosoftFrame - * should be passed as <code>true</code> if the frame is the - * first half of a 65 byte Microsoft format frame, false if the - * frame is the second half of a MS frame. For toast frames the - * value of the parameter is ignored. * @return an array containing the decoded samples * @throws InvalidGSMFrameException */ ! private final int[] decode(byte[] c, int bufferStartOffset, ! boolean firstHalfOfMicrosoftFrame) throws InvalidGSMFrameException { switch (gsmFrameFormat) --- 142,149 ---- * @param bufferStartOffset * offset into the array for the coded frame * @return an array containing the decoded samples * @throws InvalidGSMFrameException */ ! private final int[] decode(byte[] c, int bufferStartOffset) throws InvalidGSMFrameException { switch (gsmFrameFormat) *************** *** 160,164 **** case MICROSOFT: explodeFrameMicrosoft(c, bufferStartOffset, ! firstHalfOfMicrosoftFrame, m_gsmFrameParameters); break; } --- 154,158 ---- case MICROSOFT: explodeFrameMicrosoft(c, bufferStartOffset, ! m_gsmFrameParameters); break; } *************** *** 285,452 **** private final void explodeFrameMicrosoft(byte[] c, ! final int bufferStartIndex, boolean firstHalfOfMicrosoftFrame, ! GsmFrameParameters gsmFrameParameters) throws InvalidGSMFrameException { bitDecoder.setCodedFrame(c, bufferStartIndex); ! if (firstHalfOfMicrosoftFrame) ! { ! gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); ! gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); ! gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); ! gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); ! gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); ! } ! else ! { ! gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); ! gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); ! gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); ! gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); ! gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); ! } } --- 279,363 ---- private final void explodeFrameMicrosoft(byte[] c, ! final int bufferStartIndex, GsmFrameParameters gsmFrameParameters) throws InvalidGSMFrameException { bitDecoder.setCodedFrame(c, bufferStartIndex); ! gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); ! gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); ! gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); ! gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); ! gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); } |
|
From: Matthias P. <pfi...@us...> - 2013-03-10 00:47:51
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6588/src/classes/org/tritonus/lowlevel/gsm Modified Files: BitDecoder.java GSMDecoder.java Log Message: refactoring of GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: BitDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** BitDecoder.java 10 Mar 2013 00:19:56 -0000 1.6 --- BitDecoder.java 10 Mar 2013 00:47:48 -0000 1.7 *************** *** 9,20 **** private AllocationMode allocationMode; - /** - * The following variables are for exploding Microsoft frames. See - * {@link #explodeFrameMicrosoft(byte[], int, boolean)}. - */ ! // TODO: (GSM) should be reverted to private once transition is finished ! public byte[] m_codedFrame; ! public int m_codedFrameByteIndex; private int m_sr; private int m_currentBits; --- 9,15 ---- private AllocationMode allocationMode; ! private byte[] m_codedFrame; ! private int m_codedFrameByteIndex; private int m_sr; private int m_currentBits; *************** *** 37,41 **** } ! public final void getNextCodedByteValue() { m_sr |= getNextCodedByteValue2() << m_currentBits; --- 32,42 ---- } ! public void setCodedFrame(byte[] c, final int bufferStartIndex) ! { ! m_codedFrame = c; ! m_codedFrameByteIndex = bufferStartIndex; ! } ! ! private final void getNextCodedByteValue() { m_sr |= getNextCodedByteValue2() << m_currentBits; *************** *** 52,105 **** public final int getNextBits(int bits) { ! int value = m_sr & Gsm_Def.BITMASKS[bits]; ! m_sr >>>= bits; ! m_currentBits -= bits; ! return value; ! } ! ! public final void addBits(int value, int numBits) ! { ! // while (numBits > 0) ! // { ! // if (byteIndex >= codedBytes.length) ! // { ! // throw new RuntimeException("No more bytes in coded bytes array"); ! // } ! // int bits = Math.min(numBits, remainingBitsInCurrentByte); ! // int nextRemainingBits = remainingBitsInCurrentByte - bits; ! // int nextNumBits = numBits - bits; ! // int x; ! // switch (allocationMode) ! // { ! // case LSBitFirst: ! // x = (((value) & Gsm_Def.BITMASKS[bits]) << (8 - ! // remainingBitsInCurrentByte)); ! // codedBytes[byteIndex] |= x; ! // value >>>= bits; ! // break; ! // case MSBitFirst: ! // x = (((value >>> nextNumBits) & Gsm_Def.BITMASKS[bits]) << ! // nextRemainingBits); ! // codedBytes[byteIndex] |= x; ! // break; ! // } ! // remainingBitsInCurrentByte = nextRemainingBits; ! // if (remainingBitsInCurrentByte == 0) ! // { ! // byteIndex++; ! // remainingBitsInCurrentByte = 8; ! // } ! // numBits = nextNumBits; ! // } ! } ! ! public int getSr() ! { ! return m_sr; ! } ! ! public void setSr(int sr) ! { ! m_sr = sr; } } --- 53,71 ---- public final int getNextBits(int bits) { ! switch (allocationMode) ! { ! case LSBitFirst: ! while (m_currentBits < bits) ! { ! getNextCodedByteValue(); ! } ! int value = m_sr & Gsm_Def.BITMASKS[bits]; ! m_sr >>>= bits; ! m_currentBits -= bits; ! return value; ! case MSBitFirst: ! default: ! throw new RuntimeException("not supported"); ! } } } Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** GSMDecoder.java 10 Mar 2013 00:19:56 -0000 1.16 --- GSMDecoder.java 10 Mar 2013 00:47:48 -0000 1.17 *************** *** 289,404 **** throws InvalidGSMFrameException { ! bitDecoder.m_codedFrame = c; ! bitDecoder.m_codedFrameByteIndex = bufferStartIndex; if (firstHalfOfMicrosoftFrame) { - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); - bitDecoder.getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 10 */ gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 15 */ gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 20 */ gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 25 */ gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 30 */ gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); --- 289,370 ---- throws InvalidGSMFrameException { ! bitDecoder.setCodedFrame(c, bufferStartIndex); if (firstHalfOfMicrosoftFrame) { gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); *************** *** 406,514 **** else { - bitDecoder.getNextCodedByteValue(); /* 1 */ gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 10 */ gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 15 */ gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); - bitDecoder.getNextCodedByteValue(); /* 20 */ gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 25 */ gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); /* 30 */ gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); - bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); --- 372,448 ---- |
|
From: Matthias P. <pfi...@us...> - 2013-03-10 00:20:00
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5524/src/classes/org/tritonus/lowlevel/gsm Modified Files: BitDecoder.java GSMDecoder.java Log Message: refactoring of GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: BitDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** BitDecoder.java 9 Mar 2013 20:12:23 -0000 1.5 --- BitDecoder.java 10 Mar 2013 00:19:56 -0000 1.6 *************** *** 8,14 **** } - // private int byteIndex; - // private int remainingBitsInCurrentByte; - // private byte[] codedBytes; private AllocationMode allocationMode; /** --- 8,11 ---- *************** *** 33,39 **** { super(); - // byteIndex = 0; - // remainingBitsInCurrentByte = 8; - // this.codedBytes = codedBytes; this.allocationMode = allocationMode; m_codedFrame = codedBytes; --- 30,33 ---- *************** *** 41,55 **** m_sr = 0; m_currentBits = 0; - // getNextCodedByteValue(0); } ! // TODO: (GSM) parameter shift not used ! public final void getNextCodedByteValue(int shift) { ! m_sr |= getNextCodedByteValue() << m_currentBits; m_currentBits += 8; } ! private final int getNextCodedByteValue() { int value = m_codedFrame[m_codedFrameByteIndex]; --- 35,47 ---- m_sr = 0; m_currentBits = 0; } ! public final void getNextCodedByteValue() { ! m_sr |= getNextCodedByteValue2() << m_currentBits; m_currentBits += 8; } ! private final int getNextCodedByteValue2() { int value = m_codedFrame[m_codedFrameByteIndex]; Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** GSMDecoder.java 9 Mar 2013 20:12:23 -0000 1.15 --- GSMDecoder.java 10 Mar 2013 00:19:56 -0000 1.16 *************** *** 294,404 **** if (firstHalfOfMicrosoftFrame) { ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! bitDecoder.getNextCodedByteValue(4); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); ! bitDecoder.getNextCodedByteValue(2); /* 5 */ gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(4); gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); /* 10 */ gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(4); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); /* 15 */ gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(4); /* 20 */ gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); /* 25 */ gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(4); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); /* 30 */ gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); --- 294,404 ---- if (firstHalfOfMicrosoftFrame) { ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); ! bitDecoder.getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 10 */ gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 15 */ gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 20 */ gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 25 */ gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 30 */ gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); *************** *** 406,514 **** else { ! bitDecoder.getNextCodedByteValue(4); /* 1 */ gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); ! bitDecoder.getNextCodedByteValue(3); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); /* 5 */ gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(5); gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); /* 10 */ gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(5); gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); /* 15 */ gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(1); /* 20 */ gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(5); gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); /* 25 */ gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(5); gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); /* 30 */ gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); --- 406,514 ---- else { ! bitDecoder.getNextCodedByteValue(); /* 1 */ gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 10 */ gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 15 */ gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(); /* 20 */ gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 25 */ gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); /* 30 */ gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); |
|
From: Matthias P. <pfi...@us...> - 2013-03-09 20:12:27
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25477/src/classes/org/tritonus/lowlevel/gsm Modified Files: BitDecoder.java Gsm_Def.java GSMDecoder.java Log Message: - fixed bug in MS GSM decoder - cleanup Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Gsm_Def.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: BitDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** BitDecoder.java 9 Mar 2013 14:05:15 -0000 1.4 --- BitDecoder.java 9 Mar 2013 20:12:23 -0000 1.5 *************** *** 20,24 **** public byte[] m_codedFrame; public int m_codedFrameByteIndex; ! public int m_sr; private int m_currentBits; --- 20,24 ---- public byte[] m_codedFrame; public int m_codedFrameByteIndex; ! private int m_sr; private int m_currentBits; *************** *** 44,54 **** } public final void getNextCodedByteValue(int shift) { - // TODO: (GSM) remove - if (shift != m_currentBits) - { - System.out.println("shift != m_currentBits: shift: " + shift +", m_currentBits: "+ m_currentBits); - } m_sr |= getNextCodedByteValue() << m_currentBits; m_currentBits += 8; --- 44,50 ---- } + // TODO: (GSM) parameter shift not used public final void getNextCodedByteValue(int shift) { m_sr |= getNextCodedByteValue() << m_currentBits; m_currentBits += 8; Index: Gsm_Def.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Gsm_Def.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Gsm_Def.java 19 Jan 2013 21:15:09 -0000 1.3 --- Gsm_Def.java 9 Mar 2013 20:12:23 -0000 1.4 *************** *** 23,42 **** public abstract class Gsm_Def { ! // TODO: remove ! // Define the magic number for audio files ! public static final int AUDIO_FILE_MAGIC = 0x2e736e64; ! ! // TODO: remove ! // The encoding key for type: 8-bit ISDN u-law ! public static final int AUDIO_FILE_ENCODING_MULAW_8 = 1; ! ! public static final short FRAME_SIZE = 33; ! public static final short MAX_FRAME_READ = 1000; ! ! // TODO: use Short.MIN/MAX_VALUE public static final short MIN_WORD = -32768; public static final short MAX_WORD = 32767; ! // TODO: use Integer.MIN/MAX_VALUE public static final int MIN_LONGWORD = -2147483648; public static final int MAX_LONGWORD = 2147483647; --- 23,31 ---- public abstract class Gsm_Def { ! // TODO: (GSM) use Short.MIN/MAX_VALUE public static final short MIN_WORD = -32768; public static final short MAX_WORD = 32767; ! // TODO: (GSM) use Integer.MIN/MAX_VALUE public static final int MIN_LONGWORD = -2147483648; public static final int MAX_LONGWORD = 2147483647; Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** GSMDecoder.java 9 Mar 2013 14:05:15 -0000 1.14 --- GSMDecoder.java 9 Mar 2013 20:12:23 -0000 1.15 *************** *** 291,295 **** bitDecoder.m_codedFrame = c; bitDecoder.m_codedFrameByteIndex = bufferStartIndex; - bitDecoder.m_sr = 0; if (firstHalfOfMicrosoftFrame) --- 291,294 ---- |
|
From: Matthias P. <pfi...@us...> - 2013-03-09 14:05:18
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7340/src/classes/org/tritonus/lowlevel/gsm Modified Files: BitDecoder.java GSMDecoder.java Log Message: - refactoring of GSM decoder - fixed bug in MS GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: BitDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** BitDecoder.java 7 Mar 2013 10:25:47 -0000 1.3 --- BitDecoder.java 9 Mar 2013 14:05:15 -0000 1.4 *************** *** 46,50 **** public final void getNextCodedByteValue(int shift) { ! m_sr |= getNextCodedByteValue() << shift; m_currentBits += 8; } --- 46,55 ---- public final void getNextCodedByteValue(int shift) { ! // TODO: (GSM) remove ! if (shift != m_currentBits) ! { ! System.out.println("shift != m_currentBits: shift: " + shift +", m_currentBits: "+ m_currentBits); ! } ! m_sr |= getNextCodedByteValue() << m_currentBits; m_currentBits += 8; } Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** GSMDecoder.java 7 Mar 2013 17:19:24 -0000 1.13 --- GSMDecoder.java 9 Mar 2013 14:05:15 -0000 1.14 *************** *** 377,381 **** gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); --- 377,381 ---- gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); |
|
From: Matthias P. <pfi...@us...> - 2013-03-07 17:19:27
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26904/src/classes/org/tritonus/lowlevel/gsm Modified Files: GSMDecoder.java Log Message: - refactored GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** GSMDecoder.java 7 Mar 2013 10:25:47 -0000 1.12 --- GSMDecoder.java 7 Mar 2013 17:19:24 -0000 1.13 *************** *** 57,66 **** private GsmFrameParameters m_gsmFrameParameters = new GsmFrameParameters(); - /** - * Stores the last 4 bits of the last byte of the first half of a Microsoft - * frame to become the first 4 bits of the second half. - */ - private int m_frame_chain; - private int[] m_erp = new int[40]; private int[] m_wt = new int[160]; --- 57,60 ---- *************** *** 410,419 **** gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); - - m_frame_chain = bitDecoder.m_sr & 0xf; } else { - bitDecoder.m_sr = m_frame_chain; bitDecoder.getNextCodedByteValue(4); /* 1 */ gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); --- 404,410 ---- |
|
From: Matthias P. <pfi...@us...> - 2013-03-07 10:25:51
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv14307/src/classes/org/tritonus/lowlevel/gsm Modified Files: BitDecoder.java GSMDecoder.java Log Message: - refactored GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: BitDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** BitDecoder.java 7 Mar 2013 08:48:44 -0000 1.2 --- BitDecoder.java 7 Mar 2013 10:25:47 -0000 1.3 *************** *** 50,55 **** } ! //TODO: (GSM) revert to private ! public final int getNextCodedByteValue() { int value = m_codedFrame[m_codedFrameByteIndex]; --- 50,54 ---- } ! private final int getNextCodedByteValue() { int value = m_codedFrame[m_codedFrameByteIndex]; Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** GSMDecoder.java 7 Mar 2013 10:08:59 -0000 1.11 --- GSMDecoder.java 7 Mar 2013 10:25:47 -0000 1.12 *************** *** 301,305 **** if (firstHalfOfMicrosoftFrame) { ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); bitDecoder.getNextCodedByteValue(2); --- 301,305 ---- if (firstHalfOfMicrosoftFrame) { ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); bitDecoder.getNextCodedByteValue(2); *************** *** 321,325 **** gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); --- 321,325 ---- gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); *************** *** 332,336 **** gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); --- 332,336 ---- gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); *************** *** 345,349 **** gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 15 */ gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); --- 345,349 ---- gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); /* 15 */ gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); *************** *** 356,360 **** gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); --- 356,360 ---- gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); *************** *** 369,373 **** gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); --- 369,373 ---- gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); *************** *** 380,384 **** gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 25 */ gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); --- 380,384 ---- gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); /* 25 */ gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); *************** *** 393,397 **** gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); --- 393,397 ---- gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); *************** *** 404,408 **** gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); --- 404,408 ---- gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); *************** *** 419,423 **** gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); bitDecoder.getNextCodedByteValue(3); --- 419,423 ---- gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); bitDecoder.getNextCodedByteValue(3); *************** *** 428,432 **** gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); bitDecoder.getNextCodedByteValue(1); --- 428,432 ---- gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); /* 5 */ gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); bitDecoder.getNextCodedByteValue(1); *************** *** 441,445 **** gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); --- 441,445 ---- gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); *************** *** 452,456 **** gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); bitDecoder.getNextCodedByteValue(1); --- 452,456 ---- gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); bitDecoder.getNextCodedByteValue(1); *************** *** 465,469 **** gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); --- 465,469 ---- gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); *************** *** 476,480 **** gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); bitDecoder.getNextCodedByteValue(1); /* 20 */ --- 476,480 ---- gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); bitDecoder.getNextCodedByteValue(1); /* 20 */ *************** *** 489,493 **** gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); --- 489,493 ---- gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); *************** *** 500,504 **** gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); bitDecoder.getNextCodedByteValue(1); --- 500,504 ---- gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); bitDecoder.getNextCodedByteValue(1); *************** *** 513,517 **** gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 30 */ gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); --- 513,517 ---- gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); /* 30 */ gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); |
|
From: Matthias P. <pfi...@us...> - 2013-03-07 10:09:03
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11238/src/classes/org/tritonus/lowlevel/gsm Modified Files: GSMDecoder.java Log Message: - refactored GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** GSMDecoder.java 7 Mar 2013 09:22:19 -0000 1.10 --- GSMDecoder.java 7 Mar 2013 10:08:59 -0000 1.11 *************** *** 303,322 **** bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 5 */ gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); --- 303,322 ---- bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); ! bitDecoder.getNextCodedByteValue(4); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); ! bitDecoder.getNextCodedByteValue(2); /* 5 */ gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(4); gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); *************** *** 324,332 **** gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 10 */ gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); --- 324,332 ---- gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); /* 10 */ gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); *************** *** 335,346 **** gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); --- 335,346 ---- gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(4); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); *************** *** 348,356 **** gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); --- 348,356 ---- gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); *************** *** 359,370 **** gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; /* 20 */ gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); --- 359,370 ---- gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(4); /* 20 */ gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); *************** *** 372,380 **** gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); --- 372,380 ---- gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); *************** *** 383,394 **** gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); --- 383,394 ---- gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(0); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(4); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); *************** *** 396,404 **** gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 30 */ gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); --- 396,404 ---- gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); /* 30 */ gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); *************** *** 407,411 **** gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); --- 407,411 ---- gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); *************** *** 416,428 **** { bitDecoder.m_sr = m_frame_chain; ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; /* 1 */ gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 3; gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); --- 416,428 ---- { bitDecoder.m_sr = m_frame_chain; ! bitDecoder.getNextCodedByteValue(4); /* 1 */ gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); ! bitDecoder.getNextCodedByteValue(3); gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); *************** *** 430,441 **** bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); --- 430,441 ---- bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(5); gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); *************** *** 444,452 **** gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 10 */ gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); --- 444,452 ---- gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); /* 10 */ gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); *************** *** 454,465 **** bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 15 */ gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); --- 454,465 ---- bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(5); gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); /* 15 */ gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); *************** *** 468,476 **** gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); --- 468,476 ---- gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); *************** *** 478,489 **** bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 20 */ gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); --- 478,489 ---- bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(1); /* 20 */ gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(5); gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); *************** *** 492,500 **** gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 25 */ gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); --- 492,500 ---- gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); /* 25 */ gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); *************** *** 502,513 **** bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); --- 502,513 ---- bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); ! bitDecoder.getNextCodedByteValue(5); gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); *************** *** 516,524 **** gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); --- 516,524 ---- gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(2); gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); ! bitDecoder.getNextCodedByteValue(1); gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); |
|
From: Matthias P. <pfi...@us...> - 2013-03-07 09:22:23
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv2134/src/classes/org/tritonus/lowlevel/gsm Modified Files: GSMDecoder.java Log Message: - refactored GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** GSMDecoder.java 7 Mar 2013 08:57:50 -0000 1.9 --- GSMDecoder.java 7 Mar 2013 09:22:19 -0000 1.10 *************** *** 302,413 **** { bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_LARc[0] = getNextBits(6); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_LARc[1] = getNextBits(6); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; ! gsmFrameParameters.m_LARc[2] = getNextBits(5); ! gsmFrameParameters.m_LARc[3] = getNextBits(5); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_LARc[4] = getNextBits(4); ! gsmFrameParameters.m_LARc[5] = getNextBits(4); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 5 */ ! gsmFrameParameters.m_LARc[6] = getNextBits(3); ! gsmFrameParameters.m_LARc[7] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; ! gsmFrameParameters.m_Nc[0] = getNextBits(7); ! gsmFrameParameters.m_bc[0] = getNextBits(2); ! gsmFrameParameters.m_Mc[0] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[0] = getNextBits(6); ! gsmFrameParameters.m_xmc[0] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[1] = getNextBits(3); ! gsmFrameParameters.m_xmc[2] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[3] = getNextBits(3); ! gsmFrameParameters.m_xmc[4] = getNextBits(3); ! gsmFrameParameters.m_xmc[5] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 10 */ ! gsmFrameParameters.m_xmc[6] = getNextBits(3); ! gsmFrameParameters.m_xmc[7] = getNextBits(3); ! gsmFrameParameters.m_xmc[8] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[9] = getNextBits(3); ! gsmFrameParameters.m_xmc[10] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[11] = getNextBits(3); ! gsmFrameParameters.m_xmc[12] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; ! gsmFrameParameters.m_Nc[1] = getNextBits(7); ! gsmFrameParameters.m_bc[1] = getNextBits(2); ! gsmFrameParameters.m_Mc[1] = getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[1] = getNextBits(6); ! gsmFrameParameters.m_xmc[13] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 15 */ ! gsmFrameParameters.m_xmc[14] = getNextBits(3); ! gsmFrameParameters.m_xmc[15] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[16] = getNextBits(3); ! gsmFrameParameters.m_xmc[17] = getNextBits(3); ! gsmFrameParameters.m_xmc[18] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[19] = getNextBits(3); ! gsmFrameParameters.m_xmc[20] = getNextBits(3); ! gsmFrameParameters.m_xmc[21] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[22] = getNextBits(3); ! gsmFrameParameters.m_xmc[23] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[24] = getNextBits(3); ! gsmFrameParameters.m_xmc[25] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; /* 20 */ ! gsmFrameParameters.m_Nc[2] = getNextBits(7); ! gsmFrameParameters.m_bc[2] = getNextBits(2); ! gsmFrameParameters.m_Mc[2] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[2] = getNextBits(6); ! gsmFrameParameters.m_xmc[26] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[27] = getNextBits(3); ! gsmFrameParameters.m_xmc[28] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[29] = getNextBits(3); ! gsmFrameParameters.m_xmc[30] = getNextBits(3); ! gsmFrameParameters.m_xmc[31] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[32] = getNextBits(3); ! gsmFrameParameters.m_xmc[33] = getNextBits(3); ! gsmFrameParameters.m_xmc[34] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 25 */ ! gsmFrameParameters.m_xmc[35] = getNextBits(3); ! gsmFrameParameters.m_xmc[36] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[37] = getNextBits(3); ! gsmFrameParameters.m_xmc[38] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; ! gsmFrameParameters.m_Nc[3] = getNextBits(7); ! gsmFrameParameters.m_bc[3] = getNextBits(2); ! gsmFrameParameters.m_Mc[3] = getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[3] = getNextBits(6); ! gsmFrameParameters.m_xmc[39] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[40] = getNextBits(3); ! gsmFrameParameters.m_xmc[41] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 30 */ ! gsmFrameParameters.m_xmc[42] = getNextBits(3); ! gsmFrameParameters.m_xmc[43] = getNextBits(3); ! gsmFrameParameters.m_xmc[44] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[45] = getNextBits(3); ! gsmFrameParameters.m_xmc[46] = getNextBits(3); ! gsmFrameParameters.m_xmc[47] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[48] = getNextBits(3); ! gsmFrameParameters.m_xmc[49] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[50] = getNextBits(3); ! gsmFrameParameters.m_xmc[51] = getNextBits(3); m_frame_chain = bitDecoder.m_sr & 0xf; --- 302,413 ---- { bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; ! gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); ! gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); ! gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 5 */ ! gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; ! gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 10 */ ! gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; ! gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 15 */ ! gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; /* 20 */ ! gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 25 */ ! gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; ! gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); ! gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 30 */ ! gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); m_frame_chain = bitDecoder.m_sr & 0xf; *************** *** 417,537 **** bitDecoder.m_sr = m_frame_chain; bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; /* 1 */ ! gsmFrameParameters.m_LARc[0] = getNextBits(6); ! gsmFrameParameters.m_LARc[1] = getNextBits(6); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_LARc[2] = getNextBits(5); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 3; ! gsmFrameParameters.m_LARc[3] = getNextBits(5); ! gsmFrameParameters.m_LARc[4] = getNextBits(4); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_LARc[5] = getNextBits(4); ! gsmFrameParameters.m_LARc[6] = getNextBits(3); ! gsmFrameParameters.m_LARc[7] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 5 */ ! gsmFrameParameters.m_Nc[0] = getNextBits(7); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_bc[0] = getNextBits(2); ! gsmFrameParameters.m_Mc[0] = getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[0] = getNextBits(6); ! gsmFrameParameters.m_xmc[0] = getNextBits(3); ! gsmFrameParameters.m_xmc[1] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[2] = getNextBits(3); ! gsmFrameParameters.m_xmc[3] = getNextBits(3); ! gsmFrameParameters.m_xmc[4] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[5] = getNextBits(3); ! gsmFrameParameters.m_xmc[6] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 10 */ ! gsmFrameParameters.m_xmc[7] = getNextBits(3); ! gsmFrameParameters.m_xmc[8] = getNextBits(3); ! gsmFrameParameters.m_xmc[9] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[10] = getNextBits(3); ! gsmFrameParameters.m_xmc[11] = getNextBits(3); ! gsmFrameParameters.m_xmc[12] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_Nc[1] = getNextBits(7); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_bc[1] = getNextBits(2); ! gsmFrameParameters.m_Mc[1] = getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[1] = getNextBits(6); ! gsmFrameParameters.m_xmc[13] = getNextBits(3); ! gsmFrameParameters.m_xmc[14] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 15 */ ! gsmFrameParameters.m_xmc[15] = getNextBits(3); ! gsmFrameParameters.m_xmc[16] = getNextBits(3); ! gsmFrameParameters.m_xmc[17] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[18] = getNextBits(3); ! gsmFrameParameters.m_xmc[19] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[20] = getNextBits(3); ! gsmFrameParameters.m_xmc[21] = getNextBits(3); ! gsmFrameParameters.m_xmc[22] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[23] = getNextBits(3); ! gsmFrameParameters.m_xmc[24] = getNextBits(3); ! gsmFrameParameters.m_xmc[25] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_Nc[2] = getNextBits(7); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 20 */ ! gsmFrameParameters.m_bc[2] = getNextBits(2); ! gsmFrameParameters.m_Mc[2] = getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[2] = getNextBits(6); ! gsmFrameParameters.m_xmc[26] = getNextBits(3); ! gsmFrameParameters.m_xmc[27] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[28] = getNextBits(3); ! gsmFrameParameters.m_xmc[29] = getNextBits(3); ! gsmFrameParameters.m_xmc[30] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[31] = getNextBits(3); ! gsmFrameParameters.m_xmc[32] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[33] = getNextBits(3); ! gsmFrameParameters.m_xmc[34] = getNextBits(3); ! gsmFrameParameters.m_xmc[35] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 25 */ ! gsmFrameParameters.m_xmc[36] = getNextBits(3); ! gsmFrameParameters.m_xmc[37] = getNextBits(3); ! gsmFrameParameters.m_xmc[38] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_Nc[3] = getNextBits(7); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_bc[3] = getNextBits(2); ! gsmFrameParameters.m_Mc[3] = getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[3] = getNextBits(6); ! gsmFrameParameters.m_xmc[39] = getNextBits(3); ! gsmFrameParameters.m_xmc[40] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[41] = getNextBits(3); ! gsmFrameParameters.m_xmc[42] = getNextBits(3); ! gsmFrameParameters.m_xmc[43] = getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 30 */ ! gsmFrameParameters.m_xmc[44] = getNextBits(3); ! gsmFrameParameters.m_xmc[45] = getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[46] = getNextBits(3); ! gsmFrameParameters.m_xmc[47] = getNextBits(3); ! gsmFrameParameters.m_xmc[48] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[49] = getNextBits(3); ! gsmFrameParameters.m_xmc[50] = getNextBits(3); ! gsmFrameParameters.m_xmc[51] = getNextBits(3); } } - private final int getNextBits(int bits) - { - int value = bitDecoder.m_sr & Gsm_Def.BITMASKS[bits]; - bitDecoder.m_sr >>>= bits; - return value; - } - public final static void print(String name, int[] data) { --- 417,530 ---- bitDecoder.m_sr = m_frame_chain; bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; /* 1 */ ! gsmFrameParameters.m_LARc[0] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_LARc[1] = bitDecoder.getNextBits(6); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_LARc[2] = bitDecoder.getNextBits(5); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 3; ! gsmFrameParameters.m_LARc[3] = bitDecoder.getNextBits(5); ! gsmFrameParameters.m_LARc[4] = bitDecoder.getNextBits(4); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_LARc[5] = bitDecoder.getNextBits(4); ! gsmFrameParameters.m_LARc[6] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_LARc[7] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 5 */ ! gsmFrameParameters.m_Nc[0] = bitDecoder.getNextBits(7); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_bc[0] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[0] = bitDecoder.getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[0] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[0] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[1] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[2] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[3] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[4] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[5] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[6] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 10 */ ! gsmFrameParameters.m_xmc[7] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[8] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[9] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[10] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[11] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[12] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_Nc[1] = bitDecoder.getNextBits(7); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_bc[1] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[1] = bitDecoder.getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[1] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[13] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[14] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 15 */ ! gsmFrameParameters.m_xmc[15] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[16] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[17] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[18] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[19] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[20] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[21] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[22] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[23] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[24] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[25] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_Nc[2] = bitDecoder.getNextBits(7); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 20 */ ! gsmFrameParameters.m_bc[2] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[2] = bitDecoder.getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[2] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[26] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[27] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[28] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[29] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[30] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[31] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[32] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[33] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[34] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[35] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 25 */ ! gsmFrameParameters.m_xmc[36] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[37] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[38] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); ! gsmFrameParameters.m_Nc[3] = bitDecoder.getNextBits(7); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_bc[3] = bitDecoder.getNextBits(2); ! gsmFrameParameters.m_Mc[3] = bitDecoder.getNextBits(2); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[3] = bitDecoder.getNextBits(6); ! gsmFrameParameters.m_xmc[39] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[40] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[41] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[42] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[43] = bitDecoder.getNextBits(3); bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 30 */ ! gsmFrameParameters.m_xmc[44] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[45] = bitDecoder.getNextBits(3); bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[46] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[47] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[48] = bitDecoder.getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[49] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[50] = bitDecoder.getNextBits(3); ! gsmFrameParameters.m_xmc[51] = bitDecoder.getNextBits(3); } } public final static void print(String name, int[] data) { |
|
From: Matthias P. <pfi...@us...> - 2013-03-07 08:57:53
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29834/src/classes/org/tritonus/lowlevel/gsm Modified Files: GSMDecoder.java Log Message: - refactored GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** GSMDecoder.java 7 Mar 2013 08:48:44 -0000 1.8 --- GSMDecoder.java 7 Mar 2013 08:57:50 -0000 1.9 *************** *** 301,411 **** if (firstHalfOfMicrosoftFrame) { ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_LARc[0] = getNextBits(6); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[1] = getNextBits(6); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_LARc[2] = getNextBits(5); gsmFrameParameters.m_LARc[3] = getNextBits(5); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[4] = getNextBits(4); gsmFrameParameters.m_LARc[5] = getNextBits(4); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; /* 5 */ gsmFrameParameters.m_LARc[6] = getNextBits(3); gsmFrameParameters.m_LARc[7] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[0] = getNextBits(7); gsmFrameParameters.m_bc[0] = getNextBits(2); gsmFrameParameters.m_Mc[0] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[0] = getNextBits(6); gsmFrameParameters.m_xmc[0] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[1] = getNextBits(3); gsmFrameParameters.m_xmc[2] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[3] = getNextBits(3); gsmFrameParameters.m_xmc[4] = getNextBits(3); gsmFrameParameters.m_xmc[5] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; /* 10 */ gsmFrameParameters.m_xmc[6] = getNextBits(3); gsmFrameParameters.m_xmc[7] = getNextBits(3); gsmFrameParameters.m_xmc[8] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[9] = getNextBits(3); gsmFrameParameters.m_xmc[10] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[11] = getNextBits(3); gsmFrameParameters.m_xmc[12] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[1] = getNextBits(7); gsmFrameParameters.m_bc[1] = getNextBits(2); gsmFrameParameters.m_Mc[1] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[1] = getNextBits(6); gsmFrameParameters.m_xmc[13] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); /* 15 */ gsmFrameParameters.m_xmc[14] = getNextBits(3); gsmFrameParameters.m_xmc[15] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[16] = getNextBits(3); gsmFrameParameters.m_xmc[17] = getNextBits(3); gsmFrameParameters.m_xmc[18] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[19] = getNextBits(3); gsmFrameParameters.m_xmc[20] = getNextBits(3); gsmFrameParameters.m_xmc[21] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[22] = getNextBits(3); gsmFrameParameters.m_xmc[23] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[24] = getNextBits(3); gsmFrameParameters.m_xmc[25] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; /* 20 */ gsmFrameParameters.m_Nc[2] = getNextBits(7); gsmFrameParameters.m_bc[2] = getNextBits(2); gsmFrameParameters.m_Mc[2] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[2] = getNextBits(6); gsmFrameParameters.m_xmc[26] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[27] = getNextBits(3); gsmFrameParameters.m_xmc[28] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[29] = getNextBits(3); gsmFrameParameters.m_xmc[30] = getNextBits(3); gsmFrameParameters.m_xmc[31] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[32] = getNextBits(3); gsmFrameParameters.m_xmc[33] = getNextBits(3); gsmFrameParameters.m_xmc[34] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); /* 25 */ gsmFrameParameters.m_xmc[35] = getNextBits(3); gsmFrameParameters.m_xmc[36] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue(); gsmFrameParameters.m_xmc[37] = getNextBits(3); gsmFrameParameters.m_xmc[38] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[3] = getNextBits(7); gsmFrameParameters.m_bc[3] = getNextBits(2); gsmFrameParameters.m_Mc[3] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[3] = getNextBits(6); gsmFrameParameters.m_xmc[39] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[40] = getNextBits(3); gsmFrameParameters.m_xmc[41] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; /* 30 */ gsmFrameParameters.m_xmc[42] = getNextBits(3); gsmFrameParameters.m_xmc[43] = getNextBits(3); gsmFrameParameters.m_xmc[44] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[45] = getNextBits(3); gsmFrameParameters.m_xmc[46] = getNextBits(3); gsmFrameParameters.m_xmc[47] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[48] = getNextBits(3); gsmFrameParameters.m_xmc[49] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[50] = getNextBits(3); gsmFrameParameters.m_xmc[51] = getNextBits(3); --- 301,411 ---- if (firstHalfOfMicrosoftFrame) { ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[0] = getNextBits(6); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[1] = getNextBits(6); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; gsmFrameParameters.m_LARc[2] = getNextBits(5); gsmFrameParameters.m_LARc[3] = getNextBits(5); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[4] = getNextBits(4); gsmFrameParameters.m_LARc[5] = getNextBits(4); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 5 */ gsmFrameParameters.m_LARc[6] = getNextBits(3); gsmFrameParameters.m_LARc[7] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[0] = getNextBits(7); gsmFrameParameters.m_bc[0] = getNextBits(2); gsmFrameParameters.m_Mc[0] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[0] = getNextBits(6); gsmFrameParameters.m_xmc[0] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[1] = getNextBits(3); gsmFrameParameters.m_xmc[2] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[3] = getNextBits(3); gsmFrameParameters.m_xmc[4] = getNextBits(3); gsmFrameParameters.m_xmc[5] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 10 */ gsmFrameParameters.m_xmc[6] = getNextBits(3); gsmFrameParameters.m_xmc[7] = getNextBits(3); gsmFrameParameters.m_xmc[8] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[9] = getNextBits(3); gsmFrameParameters.m_xmc[10] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[11] = getNextBits(3); gsmFrameParameters.m_xmc[12] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[1] = getNextBits(7); gsmFrameParameters.m_bc[1] = getNextBits(2); gsmFrameParameters.m_Mc[1] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[1] = getNextBits(6); gsmFrameParameters.m_xmc[13] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 15 */ gsmFrameParameters.m_xmc[14] = getNextBits(3); gsmFrameParameters.m_xmc[15] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[16] = getNextBits(3); gsmFrameParameters.m_xmc[17] = getNextBits(3); gsmFrameParameters.m_xmc[18] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[19] = getNextBits(3); gsmFrameParameters.m_xmc[20] = getNextBits(3); gsmFrameParameters.m_xmc[21] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[22] = getNextBits(3); gsmFrameParameters.m_xmc[23] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[24] = getNextBits(3); gsmFrameParameters.m_xmc[25] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; /* 20 */ gsmFrameParameters.m_Nc[2] = getNextBits(7); gsmFrameParameters.m_bc[2] = getNextBits(2); gsmFrameParameters.m_Mc[2] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[2] = getNextBits(6); gsmFrameParameters.m_xmc[26] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[27] = getNextBits(3); gsmFrameParameters.m_xmc[28] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[29] = getNextBits(3); gsmFrameParameters.m_xmc[30] = getNextBits(3); gsmFrameParameters.m_xmc[31] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[32] = getNextBits(3); gsmFrameParameters.m_xmc[33] = getNextBits(3); gsmFrameParameters.m_xmc[34] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 25 */ gsmFrameParameters.m_xmc[35] = getNextBits(3); gsmFrameParameters.m_xmc[36] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[37] = getNextBits(3); gsmFrameParameters.m_xmc[38] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[3] = getNextBits(7); gsmFrameParameters.m_bc[3] = getNextBits(2); gsmFrameParameters.m_Mc[3] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[3] = getNextBits(6); gsmFrameParameters.m_xmc[39] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[40] = getNextBits(3); gsmFrameParameters.m_xmc[41] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 30 */ gsmFrameParameters.m_xmc[42] = getNextBits(3); gsmFrameParameters.m_xmc[43] = getNextBits(3); gsmFrameParameters.m_xmc[44] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[45] = getNextBits(3); gsmFrameParameters.m_xmc[46] = getNextBits(3); gsmFrameParameters.m_xmc[47] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[48] = getNextBits(3); gsmFrameParameters.m_xmc[49] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[50] = getNextBits(3); gsmFrameParameters.m_xmc[51] = getNextBits(3); *************** *** 416,524 **** { bitDecoder.m_sr = m_frame_chain; ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; /* 1 */ gsmFrameParameters.m_LARc[0] = getNextBits(6); gsmFrameParameters.m_LARc[1] = getNextBits(6); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = getNextBits(5); ! bitDecoder.m_sr |= getNextCodedByteValue() << 3; gsmFrameParameters.m_LARc[3] = getNextBits(5); gsmFrameParameters.m_LARc[4] = getNextBits(4); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[5] = getNextBits(4); gsmFrameParameters.m_LARc[6] = getNextBits(3); gsmFrameParameters.m_LARc[7] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_Nc[0] = getNextBits(7); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[0] = getNextBits(2); gsmFrameParameters.m_Mc[0] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[0] = getNextBits(6); gsmFrameParameters.m_xmc[0] = getNextBits(3); gsmFrameParameters.m_xmc[1] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[2] = getNextBits(3); gsmFrameParameters.m_xmc[3] = getNextBits(3); gsmFrameParameters.m_xmc[4] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[5] = getNextBits(3); gsmFrameParameters.m_xmc[6] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; /* 10 */ gsmFrameParameters.m_xmc[7] = getNextBits(3); gsmFrameParameters.m_xmc[8] = getNextBits(3); gsmFrameParameters.m_xmc[9] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[10] = getNextBits(3); gsmFrameParameters.m_xmc[11] = getNextBits(3); gsmFrameParameters.m_xmc[12] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = getNextBits(7); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[1] = getNextBits(2); gsmFrameParameters.m_Mc[1] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[1] = getNextBits(6); gsmFrameParameters.m_xmc[13] = getNextBits(3); gsmFrameParameters.m_xmc[14] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; /* 15 */ gsmFrameParameters.m_xmc[15] = getNextBits(3); gsmFrameParameters.m_xmc[16] = getNextBits(3); gsmFrameParameters.m_xmc[17] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[18] = getNextBits(3); gsmFrameParameters.m_xmc[19] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[20] = getNextBits(3); gsmFrameParameters.m_xmc[21] = getNextBits(3); gsmFrameParameters.m_xmc[22] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[23] = getNextBits(3); gsmFrameParameters.m_xmc[24] = getNextBits(3); gsmFrameParameters.m_xmc[25] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_Nc[2] = getNextBits(7); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; /* 20 */ gsmFrameParameters.m_bc[2] = getNextBits(2); gsmFrameParameters.m_Mc[2] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[2] = getNextBits(6); gsmFrameParameters.m_xmc[26] = getNextBits(3); gsmFrameParameters.m_xmc[27] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[28] = getNextBits(3); gsmFrameParameters.m_xmc[29] = getNextBits(3); gsmFrameParameters.m_xmc[30] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[31] = getNextBits(3); gsmFrameParameters.m_xmc[32] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[33] = getNextBits(3); gsmFrameParameters.m_xmc[34] = getNextBits(3); gsmFrameParameters.m_xmc[35] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; /* 25 */ gsmFrameParameters.m_xmc[36] = getNextBits(3); gsmFrameParameters.m_xmc[37] = getNextBits(3); gsmFrameParameters.m_xmc[38] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = getNextBits(7); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[3] = getNextBits(2); gsmFrameParameters.m_Mc[3] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[3] = getNextBits(6); gsmFrameParameters.m_xmc[39] = getNextBits(3); gsmFrameParameters.m_xmc[40] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[41] = getNextBits(3); gsmFrameParameters.m_xmc[42] = getNextBits(3); gsmFrameParameters.m_xmc[43] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); /* 30 */ gsmFrameParameters.m_xmc[44] = getNextBits(3); gsmFrameParameters.m_xmc[45] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[46] = getNextBits(3); gsmFrameParameters.m_xmc[47] = getNextBits(3); gsmFrameParameters.m_xmc[48] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[49] = getNextBits(3); gsmFrameParameters.m_xmc[50] = getNextBits(3); --- 416,524 ---- { bitDecoder.m_sr = m_frame_chain; ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 4; /* 1 */ gsmFrameParameters.m_LARc[0] = getNextBits(6); gsmFrameParameters.m_LARc[1] = getNextBits(6); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = getNextBits(5); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 3; gsmFrameParameters.m_LARc[3] = getNextBits(5); gsmFrameParameters.m_LARc[4] = getNextBits(4); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[5] = getNextBits(4); gsmFrameParameters.m_LARc[6] = getNextBits(3); gsmFrameParameters.m_LARc[7] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_Nc[0] = getNextBits(7); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[0] = getNextBits(2); gsmFrameParameters.m_Mc[0] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[0] = getNextBits(6); gsmFrameParameters.m_xmc[0] = getNextBits(3); gsmFrameParameters.m_xmc[1] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[2] = getNextBits(3); gsmFrameParameters.m_xmc[3] = getNextBits(3); gsmFrameParameters.m_xmc[4] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[5] = getNextBits(3); gsmFrameParameters.m_xmc[6] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; /* 10 */ gsmFrameParameters.m_xmc[7] = getNextBits(3); gsmFrameParameters.m_xmc[8] = getNextBits(3); gsmFrameParameters.m_xmc[9] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[10] = getNextBits(3); gsmFrameParameters.m_xmc[11] = getNextBits(3); gsmFrameParameters.m_xmc[12] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = getNextBits(7); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[1] = getNextBits(2); gsmFrameParameters.m_Mc[1] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[1] = getNextBits(6); gsmFrameParameters.m_xmc[13] = getNextBits(3); gsmFrameParameters.m_xmc[14] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 15 */ gsmFrameParameters.m_xmc[15] = getNextBits(3); gsmFrameParameters.m_xmc[16] = getNextBits(3); gsmFrameParameters.m_xmc[17] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[18] = getNextBits(3); gsmFrameParameters.m_xmc[19] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[20] = getNextBits(3); gsmFrameParameters.m_xmc[21] = getNextBits(3); gsmFrameParameters.m_xmc[22] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[23] = getNextBits(3); gsmFrameParameters.m_xmc[24] = getNextBits(3); gsmFrameParameters.m_xmc[25] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[2] = getNextBits(7); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 20 */ gsmFrameParameters.m_bc[2] = getNextBits(2); gsmFrameParameters.m_Mc[2] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[2] = getNextBits(6); gsmFrameParameters.m_xmc[26] = getNextBits(3); gsmFrameParameters.m_xmc[27] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[28] = getNextBits(3); gsmFrameParameters.m_xmc[29] = getNextBits(3); gsmFrameParameters.m_xmc[30] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_xmc[31] = getNextBits(3); gsmFrameParameters.m_xmc[32] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[33] = getNextBits(3); gsmFrameParameters.m_xmc[34] = getNextBits(3); gsmFrameParameters.m_xmc[35] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; /* 25 */ gsmFrameParameters.m_xmc[36] = getNextBits(3); gsmFrameParameters.m_xmc[37] = getNextBits(3); gsmFrameParameters.m_xmc[38] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = getNextBits(7); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[3] = getNextBits(2); gsmFrameParameters.m_Mc[3] = getNextBits(2); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[3] = getNextBits(6); gsmFrameParameters.m_xmc[39] = getNextBits(3); gsmFrameParameters.m_xmc[40] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[41] = getNextBits(3); gsmFrameParameters.m_xmc[42] = getNextBits(3); gsmFrameParameters.m_xmc[43] = getNextBits(3); ! bitDecoder.m_sr = bitDecoder.getNextCodedByteValue(); /* 30 */ gsmFrameParameters.m_xmc[44] = getNextBits(3); gsmFrameParameters.m_xmc[45] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[46] = getNextBits(3); gsmFrameParameters.m_xmc[47] = getNextBits(3); gsmFrameParameters.m_xmc[48] = getNextBits(3); ! bitDecoder.m_sr |= bitDecoder.getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[49] = getNextBits(3); gsmFrameParameters.m_xmc[50] = getNextBits(3); *************** *** 527,537 **** } - private final int getNextCodedByteValue() - { - int value = bitDecoder.m_codedFrame[bitDecoder.m_codedFrameByteIndex]; - bitDecoder.m_codedFrameByteIndex++; - return value & 0xFF; - } - private final int getNextBits(int bits) { --- 527,530 ---- |
|
From: Matthias P. <pfi...@us...> - 2013-03-07 08:48:47
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28259/src/classes/org/tritonus/lowlevel/gsm Modified Files: BitDecoder.java GSMDecoder.java Log Message: - refactored GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: BitDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** BitDecoder.java 5 Mar 2013 18:40:25 -0000 1.1 --- BitDecoder.java 7 Mar 2013 08:48:44 -0000 1.2 *************** *** 17,23 **** */ ! private byte[] m_codedFrame; ! private int m_codedFrameByteIndex; ! private int m_sr; private int m_currentBits; --- 17,24 ---- */ ! // TODO: (GSM) should be reverted to private once transition is finished ! public byte[] m_codedFrame; ! public int m_codedFrameByteIndex; ! public int m_sr; private int m_currentBits; *************** *** 40,44 **** m_sr = 0; m_currentBits = 0; ! // getNextCodedByteValue(0); } --- 41,45 ---- m_sr = 0; m_currentBits = 0; ! // getNextCodedByteValue(0); } *************** *** 49,53 **** } ! private final int getNextCodedByteValue() { int value = m_codedFrame[m_codedFrameByteIndex]; --- 50,55 ---- } ! //TODO: (GSM) revert to private ! public final int getNextCodedByteValue() { int value = m_codedFrame[m_codedFrameByteIndex]; Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** GSMDecoder.java 6 Mar 2013 14:33:44 -0000 1.7 --- GSMDecoder.java 7 Mar 2013 08:48:44 -0000 1.8 *************** *** 42,52 **** private GsmFrameFormat gsmFrameFormat; ! /** ! * The following variables are for exploding Microsoft frames. See ! * {@link #explodeFrameMicrosoft(byte[], int, boolean)}. ! */ ! private byte[] m_codedFrame; ! private int m_codedFrameByteIndex; ! private int m_sr; private int[] m_dp0 = new int[280]; --- 42,47 ---- private GsmFrameFormat gsmFrameFormat; ! private BitDecoder bitDecoder = new BitDecoder(null, 0, ! AllocationMode.LSBitFirst); private int[] m_dp0 = new int[280]; *************** *** 300,529 **** throws InvalidGSMFrameException { ! m_codedFrame = c; ! m_codedFrameByteIndex = bufferStartIndex; ! m_sr = 0; if (firstHalfOfMicrosoftFrame) { ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_LARc[0] = getNextBits(6); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[1] = getNextBits(6); ! m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_LARc[2] = getNextBits(5); gsmFrameParameters.m_LARc[3] = getNextBits(5); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[4] = getNextBits(4); gsmFrameParameters.m_LARc[5] = getNextBits(4); ! m_sr |= getNextCodedByteValue() << 2; /* 5 */ gsmFrameParameters.m_LARc[6] = getNextBits(3); gsmFrameParameters.m_LARc[7] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[0] = getNextBits(7); gsmFrameParameters.m_bc[0] = getNextBits(2); gsmFrameParameters.m_Mc[0] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[0] = getNextBits(6); gsmFrameParameters.m_xmc[0] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[1] = getNextBits(3); gsmFrameParameters.m_xmc[2] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[3] = getNextBits(3); gsmFrameParameters.m_xmc[4] = getNextBits(3); gsmFrameParameters.m_xmc[5] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; /* 10 */ gsmFrameParameters.m_xmc[6] = getNextBits(3); gsmFrameParameters.m_xmc[7] = getNextBits(3); gsmFrameParameters.m_xmc[8] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[9] = getNextBits(3); gsmFrameParameters.m_xmc[10] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[11] = getNextBits(3); gsmFrameParameters.m_xmc[12] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[1] = getNextBits(7); gsmFrameParameters.m_bc[1] = getNextBits(2); gsmFrameParameters.m_Mc[1] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[1] = getNextBits(6); gsmFrameParameters.m_xmc[13] = getNextBits(3); ! m_sr = getNextCodedByteValue(); /* 15 */ gsmFrameParameters.m_xmc[14] = getNextBits(3); gsmFrameParameters.m_xmc[15] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[16] = getNextBits(3); gsmFrameParameters.m_xmc[17] = getNextBits(3); gsmFrameParameters.m_xmc[18] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[19] = getNextBits(3); gsmFrameParameters.m_xmc[20] = getNextBits(3); gsmFrameParameters.m_xmc[21] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[22] = getNextBits(3); gsmFrameParameters.m_xmc[23] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[24] = getNextBits(3); gsmFrameParameters.m_xmc[25] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 4; /* 20 */ gsmFrameParameters.m_Nc[2] = getNextBits(7); gsmFrameParameters.m_bc[2] = getNextBits(2); gsmFrameParameters.m_Mc[2] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[2] = getNextBits(6); gsmFrameParameters.m_xmc[26] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[27] = getNextBits(3); gsmFrameParameters.m_xmc[28] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[29] = getNextBits(3); gsmFrameParameters.m_xmc[30] = getNextBits(3); gsmFrameParameters.m_xmc[31] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[32] = getNextBits(3); gsmFrameParameters.m_xmc[33] = getNextBits(3); gsmFrameParameters.m_xmc[34] = getNextBits(3); ! m_sr = getNextCodedByteValue(); /* 25 */ gsmFrameParameters.m_xmc[35] = getNextBits(3); gsmFrameParameters.m_xmc[36] = getNextBits(3); ! m_sr |= getNextCodedByteValue(); gsmFrameParameters.m_xmc[37] = getNextBits(3); gsmFrameParameters.m_xmc[38] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[3] = getNextBits(7); gsmFrameParameters.m_bc[3] = getNextBits(2); gsmFrameParameters.m_Mc[3] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[3] = getNextBits(6); gsmFrameParameters.m_xmc[39] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[40] = getNextBits(3); gsmFrameParameters.m_xmc[41] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; /* 30 */ gsmFrameParameters.m_xmc[42] = getNextBits(3); gsmFrameParameters.m_xmc[43] = getNextBits(3); gsmFrameParameters.m_xmc[44] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[45] = getNextBits(3); gsmFrameParameters.m_xmc[46] = getNextBits(3); gsmFrameParameters.m_xmc[47] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[48] = getNextBits(3); gsmFrameParameters.m_xmc[49] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[50] = getNextBits(3); gsmFrameParameters.m_xmc[51] = getNextBits(3); ! m_frame_chain = m_sr & 0xf; } else { ! m_sr = m_frame_chain; ! m_sr |= getNextCodedByteValue() << 4; /* 1 */ gsmFrameParameters.m_LARc[0] = getNextBits(6); gsmFrameParameters.m_LARc[1] = getNextBits(6); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = getNextBits(5); ! m_sr |= getNextCodedByteValue() << 3; gsmFrameParameters.m_LARc[3] = getNextBits(5); gsmFrameParameters.m_LARc[4] = getNextBits(4); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[5] = getNextBits(4); gsmFrameParameters.m_LARc[6] = getNextBits(3); gsmFrameParameters.m_LARc[7] = getNextBits(3); ! m_sr = getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_Nc[0] = getNextBits(7); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[0] = getNextBits(2); gsmFrameParameters.m_Mc[0] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[0] = getNextBits(6); gsmFrameParameters.m_xmc[0] = getNextBits(3); gsmFrameParameters.m_xmc[1] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[2] = getNextBits(3); gsmFrameParameters.m_xmc[3] = getNextBits(3); gsmFrameParameters.m_xmc[4] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[5] = getNextBits(3); gsmFrameParameters.m_xmc[6] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; /* 10 */ gsmFrameParameters.m_xmc[7] = getNextBits(3); gsmFrameParameters.m_xmc[8] = getNextBits(3); gsmFrameParameters.m_xmc[9] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[10] = getNextBits(3); gsmFrameParameters.m_xmc[11] = getNextBits(3); gsmFrameParameters.m_xmc[12] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = getNextBits(7); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[1] = getNextBits(2); gsmFrameParameters.m_Mc[1] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[1] = getNextBits(6); gsmFrameParameters.m_xmc[13] = getNextBits(3); gsmFrameParameters.m_xmc[14] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; /* 15 */ gsmFrameParameters.m_xmc[15] = getNextBits(3); gsmFrameParameters.m_xmc[16] = getNextBits(3); gsmFrameParameters.m_xmc[17] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[18] = getNextBits(3); gsmFrameParameters.m_xmc[19] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[20] = getNextBits(3); gsmFrameParameters.m_xmc[21] = getNextBits(3); gsmFrameParameters.m_xmc[22] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[23] = getNextBits(3); gsmFrameParameters.m_xmc[24] = getNextBits(3); gsmFrameParameters.m_xmc[25] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_Nc[2] = getNextBits(7); ! m_sr |= getNextCodedByteValue() << 1; /* 20 */ gsmFrameParameters.m_bc[2] = getNextBits(2); gsmFrameParameters.m_Mc[2] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[2] = getNextBits(6); gsmFrameParameters.m_xmc[26] = getNextBits(3); gsmFrameParameters.m_xmc[27] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[28] = getNextBits(3); gsmFrameParameters.m_xmc[29] = getNextBits(3); gsmFrameParameters.m_xmc[30] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[31] = getNextBits(3); gsmFrameParameters.m_xmc[32] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[33] = getNextBits(3); gsmFrameParameters.m_xmc[34] = getNextBits(3); gsmFrameParameters.m_xmc[35] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; /* 25 */ gsmFrameParameters.m_xmc[36] = getNextBits(3); gsmFrameParameters.m_xmc[37] = getNextBits(3); gsmFrameParameters.m_xmc[38] = getNextBits(3); ! m_sr = getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = getNextBits(7); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[3] = getNextBits(2); gsmFrameParameters.m_Mc[3] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[3] = getNextBits(6); gsmFrameParameters.m_xmc[39] = getNextBits(3); gsmFrameParameters.m_xmc[40] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[41] = getNextBits(3); gsmFrameParameters.m_xmc[42] = getNextBits(3); gsmFrameParameters.m_xmc[43] = getNextBits(3); ! m_sr = getNextCodedByteValue(); /* 30 */ gsmFrameParameters.m_xmc[44] = getNextBits(3); gsmFrameParameters.m_xmc[45] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[46] = getNextBits(3); gsmFrameParameters.m_xmc[47] = getNextBits(3); gsmFrameParameters.m_xmc[48] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[49] = getNextBits(3); gsmFrameParameters.m_xmc[50] = getNextBits(3); --- 295,524 ---- throws InvalidGSMFrameException { ! bitDecoder.m_codedFrame = c; ! bitDecoder.m_codedFrameByteIndex = bufferStartIndex; ! bitDecoder.m_sr = 0; if (firstHalfOfMicrosoftFrame) { ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_LARc[0] = getNextBits(6); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[1] = getNextBits(6); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_LARc[2] = getNextBits(5); gsmFrameParameters.m_LARc[3] = getNextBits(5); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[4] = getNextBits(4); gsmFrameParameters.m_LARc[5] = getNextBits(4); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; /* 5 */ gsmFrameParameters.m_LARc[6] = getNextBits(3); gsmFrameParameters.m_LARc[7] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[0] = getNextBits(7); gsmFrameParameters.m_bc[0] = getNextBits(2); gsmFrameParameters.m_Mc[0] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[0] = getNextBits(6); gsmFrameParameters.m_xmc[0] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[1] = getNextBits(3); gsmFrameParameters.m_xmc[2] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[3] = getNextBits(3); gsmFrameParameters.m_xmc[4] = getNextBits(3); gsmFrameParameters.m_xmc[5] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; /* 10 */ gsmFrameParameters.m_xmc[6] = getNextBits(3); gsmFrameParameters.m_xmc[7] = getNextBits(3); gsmFrameParameters.m_xmc[8] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[9] = getNextBits(3); gsmFrameParameters.m_xmc[10] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[11] = getNextBits(3); gsmFrameParameters.m_xmc[12] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[1] = getNextBits(7); gsmFrameParameters.m_bc[1] = getNextBits(2); gsmFrameParameters.m_Mc[1] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[1] = getNextBits(6); gsmFrameParameters.m_xmc[13] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); /* 15 */ gsmFrameParameters.m_xmc[14] = getNextBits(3); gsmFrameParameters.m_xmc[15] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[16] = getNextBits(3); gsmFrameParameters.m_xmc[17] = getNextBits(3); gsmFrameParameters.m_xmc[18] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[19] = getNextBits(3); gsmFrameParameters.m_xmc[20] = getNextBits(3); gsmFrameParameters.m_xmc[21] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[22] = getNextBits(3); gsmFrameParameters.m_xmc[23] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[24] = getNextBits(3); gsmFrameParameters.m_xmc[25] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; /* 20 */ gsmFrameParameters.m_Nc[2] = getNextBits(7); gsmFrameParameters.m_bc[2] = getNextBits(2); gsmFrameParameters.m_Mc[2] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[2] = getNextBits(6); gsmFrameParameters.m_xmc[26] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[27] = getNextBits(3); gsmFrameParameters.m_xmc[28] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[29] = getNextBits(3); gsmFrameParameters.m_xmc[30] = getNextBits(3); gsmFrameParameters.m_xmc[31] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[32] = getNextBits(3); gsmFrameParameters.m_xmc[33] = getNextBits(3); gsmFrameParameters.m_xmc[34] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); /* 25 */ gsmFrameParameters.m_xmc[35] = getNextBits(3); gsmFrameParameters.m_xmc[36] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue(); gsmFrameParameters.m_xmc[37] = getNextBits(3); gsmFrameParameters.m_xmc[38] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; gsmFrameParameters.m_Nc[3] = getNextBits(7); gsmFrameParameters.m_bc[3] = getNextBits(2); gsmFrameParameters.m_Mc[3] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmaxc[3] = getNextBits(6); gsmFrameParameters.m_xmc[39] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[40] = getNextBits(3); gsmFrameParameters.m_xmc[41] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; /* 30 */ gsmFrameParameters.m_xmc[42] = getNextBits(3); gsmFrameParameters.m_xmc[43] = getNextBits(3); gsmFrameParameters.m_xmc[44] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[45] = getNextBits(3); gsmFrameParameters.m_xmc[46] = getNextBits(3); gsmFrameParameters.m_xmc[47] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[48] = getNextBits(3); gsmFrameParameters.m_xmc[49] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[50] = getNextBits(3); gsmFrameParameters.m_xmc[51] = getNextBits(3); ! m_frame_chain = bitDecoder.m_sr & 0xf; } else { ! bitDecoder.m_sr = m_frame_chain; ! bitDecoder.m_sr |= getNextCodedByteValue() << 4; /* 1 */ gsmFrameParameters.m_LARc[0] = getNextBits(6); gsmFrameParameters.m_LARc[1] = getNextBits(6); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_LARc[2] = getNextBits(5); ! bitDecoder.m_sr |= getNextCodedByteValue() << 3; gsmFrameParameters.m_LARc[3] = getNextBits(5); gsmFrameParameters.m_LARc[4] = getNextBits(4); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_LARc[5] = getNextBits(4); gsmFrameParameters.m_LARc[6] = getNextBits(3); gsmFrameParameters.m_LARc[7] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); /* 5 */ gsmFrameParameters.m_Nc[0] = getNextBits(7); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[0] = getNextBits(2); gsmFrameParameters.m_Mc[0] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[0] = getNextBits(6); gsmFrameParameters.m_xmc[0] = getNextBits(3); gsmFrameParameters.m_xmc[1] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[2] = getNextBits(3); gsmFrameParameters.m_xmc[3] = getNextBits(3); gsmFrameParameters.m_xmc[4] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[5] = getNextBits(3); gsmFrameParameters.m_xmc[6] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; /* 10 */ gsmFrameParameters.m_xmc[7] = getNextBits(3); gsmFrameParameters.m_xmc[8] = getNextBits(3); gsmFrameParameters.m_xmc[9] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[10] = getNextBits(3); gsmFrameParameters.m_xmc[11] = getNextBits(3); gsmFrameParameters.m_xmc[12] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_Nc[1] = getNextBits(7); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[1] = getNextBits(2); gsmFrameParameters.m_Mc[1] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[1] = getNextBits(6); gsmFrameParameters.m_xmc[13] = getNextBits(3); gsmFrameParameters.m_xmc[14] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; /* 15 */ gsmFrameParameters.m_xmc[15] = getNextBits(3); gsmFrameParameters.m_xmc[16] = getNextBits(3); gsmFrameParameters.m_xmc[17] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[18] = getNextBits(3); gsmFrameParameters.m_xmc[19] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[20] = getNextBits(3); gsmFrameParameters.m_xmc[21] = getNextBits(3); gsmFrameParameters.m_xmc[22] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[23] = getNextBits(3); gsmFrameParameters.m_xmc[24] = getNextBits(3); gsmFrameParameters.m_xmc[25] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_Nc[2] = getNextBits(7); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; /* 20 */ gsmFrameParameters.m_bc[2] = getNextBits(2); gsmFrameParameters.m_Mc[2] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[2] = getNextBits(6); gsmFrameParameters.m_xmc[26] = getNextBits(3); gsmFrameParameters.m_xmc[27] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[28] = getNextBits(3); gsmFrameParameters.m_xmc[29] = getNextBits(3); gsmFrameParameters.m_xmc[30] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_xmc[31] = getNextBits(3); gsmFrameParameters.m_xmc[32] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[33] = getNextBits(3); gsmFrameParameters.m_xmc[34] = getNextBits(3); gsmFrameParameters.m_xmc[35] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; /* 25 */ gsmFrameParameters.m_xmc[36] = getNextBits(3); gsmFrameParameters.m_xmc[37] = getNextBits(3); gsmFrameParameters.m_xmc[38] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); gsmFrameParameters.m_Nc[3] = getNextBits(7); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_bc[3] = getNextBits(2); gsmFrameParameters.m_Mc[3] = getNextBits(2); ! bitDecoder.m_sr |= getNextCodedByteValue() << 5; gsmFrameParameters.m_xmaxc[3] = getNextBits(6); gsmFrameParameters.m_xmc[39] = getNextBits(3); gsmFrameParameters.m_xmc[40] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[41] = getNextBits(3); gsmFrameParameters.m_xmc[42] = getNextBits(3); gsmFrameParameters.m_xmc[43] = getNextBits(3); ! bitDecoder.m_sr = getNextCodedByteValue(); /* 30 */ gsmFrameParameters.m_xmc[44] = getNextBits(3); gsmFrameParameters.m_xmc[45] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 2; gsmFrameParameters.m_xmc[46] = getNextBits(3); gsmFrameParameters.m_xmc[47] = getNextBits(3); gsmFrameParameters.m_xmc[48] = getNextBits(3); ! bitDecoder.m_sr |= getNextCodedByteValue() << 1; gsmFrameParameters.m_xmc[49] = getNextBits(3); gsmFrameParameters.m_xmc[50] = getNextBits(3); *************** *** 534,539 **** private final int getNextCodedByteValue() { ! int value = m_codedFrame[m_codedFrameByteIndex]; ! m_codedFrameByteIndex++; return value & 0xFF; } --- 529,534 ---- private final int getNextCodedByteValue() { ! int value = bitDecoder.m_codedFrame[bitDecoder.m_codedFrameByteIndex]; ! bitDecoder.m_codedFrameByteIndex++; return value & 0xFF; } *************** *** 541,546 **** private final int getNextBits(int bits) { ! int value = m_sr & Gsm_Def.BITMASKS[bits]; ! m_sr >>>= bits; return value; } --- 536,541 ---- private final int getNextBits(int bits) { ! int value = bitDecoder.m_sr & Gsm_Def.BITMASKS[bits]; ! bitDecoder.m_sr >>>= bits; return value; } |
|
From: Matthias P. <pfi...@us...> - 2013-03-07 06:42:09
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32321/src/classes/org/tritonus/lowlevel/gsm Modified Files: GsmFrameParameters.java BitEncoder.java Encoder.java Log Message: - fixed bug in GSM Encoder - cleanup Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GsmFrameParameters.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitEncoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Encoder.java Index: GsmFrameParameters.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GsmFrameParameters.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** GsmFrameParameters.java 5 Mar 2013 18:40:25 -0000 1.1 --- GsmFrameParameters.java 7 Mar 2013 06:42:06 -0000 1.2 *************** *** 69,72 **** --- 69,73 ---- * * @param printStream + * the stream to output the dump */ public void dump(PrintStream printStream) Index: BitEncoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitEncoder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** BitEncoder.java 5 Mar 2013 18:47:49 -0000 1.2 --- BitEncoder.java 7 Mar 2013 06:42:06 -0000 1.3 *************** *** 18,21 **** --- 18,25 ---- * Constructor. * + * <p> + * Note: this constructor writes 0 values into the passed byte array. + * </p> + * * @param codedBytes * @param allocationMode *************** *** 28,31 **** --- 32,36 ---- this.codedBytes = codedBytes; this.allocationMode = allocationMode; + Arrays.fill(codedBytes, (byte) 0); } Index: Encoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/Encoder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Encoder.java 19 Jan 2013 21:15:09 -0000 1.7 --- Encoder.java 7 Mar 2013 06:42:06 -0000 1.8 *************** *** 75,79 **** * @param abFrame * the encoded GSM frame (33 or 65 bytes, depending on the frame ! * format). */ public void encode(short[] asBuffer, byte[] abFrame) --- 75,80 ---- * @param abFrame * the encoded GSM frame (33 or 65 bytes, depending on the frame ! * format). Note that the contents of this array is overwritten ! * by this method. */ public void encode(short[] asBuffer, byte[] abFrame) *************** *** 98,101 **** --- 99,103 ---- Gsm_Coder_java(); implodeFrameGeneric(bitEncoder); + if (gsmFrameFormat == GsmFrameFormat.MICROSOFT) { *************** *** 107,114 **** implodeFrameGeneric(bitEncoder); } - - // byte[] frameold = new byte[33]; - // implodeFrame(frameold, index); - // System.arraycopy(frame, 0, abFrame, 0, frame.length); } --- 109,112 ---- *************** *** 197,268 **** } ! // TODO (GSM) remove ! private void implodeFrameOld(byte[] frame, int index) ! { ! frame[index++] = (byte) (((0xD) << 4) /* 1 */ ! | ((LARc[0] >> 2) & 0xF)); ! frame[index++] = (byte) (((LARc[0] & 0x3) << 6) /* 2 */ ! | (LARc[1] & 0x3F)); ! frame[index++] = (byte) (((LARc[2] & 0x1F) << 3) /* 3 */ ! | ((LARc[3] >> 2) & 0x7)); ! frame[index++] = (byte) (((LARc[3] & 0x3) << 6) /* 4 */ ! | ((LARc[4] & 0xF) << 2) | ((LARc[5] >> 2) & 0x3)); ! frame[index++] = (byte) (((LARc[5] & 0x3) << 6) /* 5 */ ! | ((LARc[6] & 0x7) << 3) | (LARc[7] & 0x7)); ! frame[index++] = (byte) (((Nc[0] & 0x7F) << 1) /* 6 */ ! | ((bc[0] >> 1) & 0x1)); ! frame[index++] = (byte) (((bc[0] & 0x1) << 7) /* 7 */ ! | ((Mc[0] & 0x3) << 5) | ((xmaxc[0] >> 1) & 0x1F)); ! frame[index++] = (byte) (((xmaxc[0] & 0x1) << 7) /* 8 */ ! | ((xmc[0] & 0x7) << 4) | ((xmc[1] & 0x7) << 1) | ((xmc[2] >> 2) & 0x1)); ! frame[index++] = (byte) (((xmc[2] & 0x3) << 6) /* 9 */ ! | ((xmc[3] & 0x7) << 3) | (xmc[4] & 0x7)); ! frame[index++] = (byte) (((xmc[5] & 0x7) << 5) /* 10 */ ! | ((xmc[6] & 0x7) << 2) | ((xmc[7] >> 1) & 0x3)); ! frame[index++] = (byte) (((xmc[7] & 0x1) << 7) /* 11 */ ! | ((xmc[8] & 0x7) << 4) | ((xmc[9] & 0x7) << 1) | ((xmc[10] >> 2) & 0x1)); ! frame[index++] = (byte) ((((xmc[10] & 0x3) << 6) /* 12 */ ! | ((xmc[11] & 0x7) << 3) | (xmc[12] & 0x7))); ! frame[index++] = (byte) (((Nc[1] & 0x7F) << 1) /* 13 */ ! | ((bc[1] >> 1) & 0x1)); ! frame[index++] = (byte) (((bc[1] & 0x1) << 7) /* 14 */ ! | ((Mc[1] & 0x3) << 5) | ((xmaxc[1] >> 1) & 0x1F)); ! frame[index++] = (byte) (((xmaxc[1] & 0x1) << 7) /* 15 */ ! | ((xmc[13] & 0x7) << 4) | ((xmc[14] & 0x7) << 1) | ((xmc[15] >> 2) & 0x1)); ! frame[index++] = (byte) (((xmc[15] & 0x3) << 6) ! | ((xmc[16] & 0x7) << 3) | (xmc[17] & 0x7)); ! frame[index++] = (byte) (((xmc[18] & 0x7) << 5) ! | ((xmc[19] & 0x7) << 2) | ((xmc[20] >> 1) & 0x3)); ! frame[index++] = (byte) (((xmc[20] & 0x1) << 7) ! | ((xmc[21] & 0x7) << 4) | ((xmc[22] & 0x7) << 1) | ((xmc[23] >> 2) & 0x1)); ! frame[index++] = (byte) (((xmc[23] & 0x3) << 6) ! | ((xmc[24] & 0x7) << 3) | (xmc[25] & 0x7)); ! frame[index++] = (byte) (((Nc[2] & 0x7F) << 1) /* 20 */ ! | ((bc[2] >> 1) & 0x1)); ! frame[index++] = (byte) (((bc[2] & 0x1) << 7) | ((Mc[2] & 0x3) << 5) | ((xmaxc[2] >> 1) & 0x1F)); ! frame[index++] = (byte) (((xmaxc[2] & 0x1) << 7) ! | ((xmc[26] & 0x7) << 4) | ((xmc[27] & 0x7) << 1) | ((xmc[28] >> 2) & 0x1)); ! frame[index++] = (byte) (((xmc[28] & 0x3) << 6) ! | ((xmc[29] & 0x7) << 3) | (xmc[30] & 0x7)); ! frame[index++] = (byte) (((xmc[31] & 0x7) << 5) ! | ((xmc[32] & 0x7) << 2) | ((xmc[33] >> 1) & 0x3)); ! frame[index++] = (byte) (((xmc[33] & 0x1) << 7) ! | ((xmc[34] & 0x7) << 4) | ((xmc[35] & 0x7) << 1) | ((xmc[36] >> 2) & 0x1)); ! frame[index++] = (byte) (((xmc[36] & 0x3) << 6) ! | ((xmc[37] & 0x7) << 3) | (xmc[38] & 0x7)); ! frame[index++] = (byte) (((Nc[3] & 0x7F) << 1) | ((bc[3] >> 1) & 0x1)); ! frame[index++] = (byte) (((bc[3] & 0x1) << 7) | ((Mc[3] & 0x3) << 5) | ((xmaxc[3] >> 1) & 0x1F)); ! frame[index++] = (byte) (((xmaxc[3] & 0x1) << 7) ! | ((xmc[39] & 0x7) << 4) | ((xmc[40] & 0x7) << 1) | ((xmc[41] >> 2) & 0x1)); ! frame[index++] = (byte) (((xmc[41] & 0x3) << 6) /* 30 */ ! | ((xmc[42] & 0x7) << 3) | (xmc[43] & 0x7)); ! frame[index++] = (byte) (((xmc[44] & 0x7) << 5) /* 31 */ ! | ((xmc[45] & 0x7) << 2) | ((xmc[46] >> 1) & 0x3)); ! frame[index++] = (byte) (((xmc[46] & 0x1) << 7) /* 32 */ ! | ((xmc[47] & 0x7) << 4) | ((xmc[48] & 0x7) << 1) | ((xmc[49] >> 2) & 0x1)); ! frame[index++] = (byte) (((xmc[49] & 0x3) << 6) /* 33 */ ! | ((xmc[50] & 0x7) << 3) | (xmc[51] & 0x7)); ! } ! private void Gsm_Coder_java() { --- 195,205 ---- } ! /** ! * Main part of encoding. ! * ! * <p>Uses array input_signal as input (160 samples are expected there).</p> ! * ! * <p>Output is in the arrays xmc, LARc, etc.</p> ! */ private void Gsm_Coder_java() { |
|
From: Matthias P. <pfi...@us...> - 2013-03-06 14:33:47
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29150/src/classes/org/tritonus/lowlevel/gsm Modified Files: GSMDecoder.java Log Message: refactoring of GSM decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java Index: GSMDecoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GSMDecoder.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** GSMDecoder.java 19 Jan 2013 21:15:09 -0000 1.6 --- GSMDecoder.java 6 Mar 2013 14:33:44 -0000 1.7 *************** *** 25,28 **** --- 25,29 ---- package org.tritonus.lowlevel.gsm; + import org.tritonus.lowlevel.gsm.BitDecoder.AllocationMode; import org.tritonus.share.sampled.TConversionTool; *************** *** 59,70 **** private int msr; ! // only to reduce memory allocations ! // (formerly allocated once for each frame to decode) ! private int[] m_LARc = new int[8]; ! private int[] m_Nc = new int[4]; ! private int[] m_Mc = new int[4]; ! private int[] m_bc = new int[4]; ! private int[] m_xmaxc = new int[4]; ! private int[] m_xmc = new int[13 * 4]; /** --- 60,64 ---- private int msr; ! private GsmFrameParameters m_gsmFrameParameters = new GsmFrameParameters(); /** *************** *** 173,188 **** { case TOAST: ! explodeFrameToast(c, bufferStartOffset); break; case MICROSOFT: explodeFrameMicrosoft(c, bufferStartOffset, ! firstHalfOfMicrosoftFrame); break; } ! return decoder(m_LARc, m_Nc, m_bc, m_Mc, m_xmaxc, m_xmc); } ! private final void explodeFrameToast(byte[] c, int bufferStartIndex) throws InvalidGSMFrameException { --- 167,183 ---- { case TOAST: ! explodeFrameToast(c, bufferStartOffset, m_gsmFrameParameters); break; case MICROSOFT: explodeFrameMicrosoft(c, bufferStartOffset, ! firstHalfOfMicrosoftFrame, m_gsmFrameParameters); break; } ! return decoder(m_gsmFrameParameters); } ! private final void explodeFrameToast(byte[] c, int bufferStartIndex, ! GsmFrameParameters gsmFrameParameters) throws InvalidGSMFrameException { *************** *** 199,305 **** } ! m_LARc[0] = ((c[i++] & 0xF) << 2); /* 1 */ ! m_LARc[0] |= ((c[i] >> 6) & 0x3); ! m_LARc[1] = (c[i++] & 0x3F); ! m_LARc[2] = ((c[i] >> 3) & 0x1F); ! m_LARc[3] = ((c[i++] & 0x7) << 2); ! m_LARc[3] |= ((c[i] >> 6) & 0x3); ! m_LARc[4] = ((c[i] >> 2) & 0xF); ! m_LARc[5] = ((c[i++] & 0x3) << 2); ! m_LARc[5] |= ((c[i] >> 6) & 0x3); ! m_LARc[6] = ((c[i] >> 3) & 0x7); ! m_LARc[7] = (c[i++] & 0x7); ! m_Nc[0] = ((c[i] >> 1) & 0x7F); ! m_bc[0] = ((c[i++] & 0x1) << 1); ! m_bc[0] |= ((c[i] >> 7) & 0x1); ! m_Mc[0] = ((c[i] >> 5) & 0x3); ! m_xmaxc[0] = ((c[i++] & 0x1F) << 1); ! m_xmaxc[0] |= ((c[i] >> 7) & 0x1); ! m_xmc[0] = ((c[i] >> 4) & 0x7); ! m_xmc[1] = ((c[i] >> 1) & 0x7); ! m_xmc[2] = ((c[i++] & 0x1) << 2); ! m_xmc[2] |= ((c[i] >> 6) & 0x3); ! m_xmc[3] = ((c[i] >> 3) & 0x7); ! m_xmc[4] = (c[i++] & 0x7); ! m_xmc[5] = ((c[i] >> 5) & 0x7); ! m_xmc[6] = ((c[i] >> 2) & 0x7); ! m_xmc[7] = ((c[i++] & 0x3) << 1); /* 10 */ ! m_xmc[7] |= ((c[i] >> 7) & 0x1); ! m_xmc[8] = ((c[i] >> 4) & 0x7); ! m_xmc[9] = ((c[i] >> 1) & 0x7); ! m_xmc[10] = ((c[i++] & 0x1) << 2); ! m_xmc[10] |= ((c[i] >> 6) & 0x3); ! m_xmc[11] = ((c[i] >> 3) & 0x7); ! m_xmc[12] = (c[i++] & 0x7); ! m_Nc[1] = ((c[i] >> 1) & 0x7F); ! m_bc[1] = ((c[i++] & 0x1) << 1); ! m_bc[1] |= ((c[i] >> 7) & 0x1); ! m_Mc[1] = ((c[i] >> 5) & 0x3); ! m_xmaxc[1] = ((c[i++] & 0x1F) << 1); ! m_xmaxc[1] |= ((c[i] >> 7) & 0x1); ! m_xmc[13] = ((c[i] >> 4) & 0x7); ! m_xmc[14] = ((c[i] >> 1) & 0x7); ! m_xmc[15] = ((c[i++] & 0x1) << 2); ! m_xmc[15] |= ((c[i] >> 6) & 0x3); ! m_xmc[16] = ((c[i] >> 3) & 0x7); ! m_xmc[17] = (c[i++] & 0x7); ! m_xmc[18] = ((c[i] >> 5) & 0x7); ! m_xmc[19] = ((c[i] >> 2) & 0x7); ! m_xmc[20] = ((c[i++] & 0x3) << 1); ! m_xmc[20] |= ((c[i] >> 7) & 0x1); ! m_xmc[21] = ((c[i] >> 4) & 0x7); ! m_xmc[22] = ((c[i] >> 1) & 0x7); ! m_xmc[23] = ((c[i++] & 0x1) << 2); ! m_xmc[23] |= ((c[i] >> 6) & 0x3); ! m_xmc[24] = ((c[i] >> 3) & 0x7); ! m_xmc[25] = (c[i++] & 0x7); ! m_Nc[2] = ((c[i] >> 1) & 0x7F); ! m_bc[2] = ((c[i++] & 0x1) << 1); /* 20 */ ! m_bc[2] |= ((c[i] >> 7) & 0x1); ! m_Mc[2] = ((c[i] >> 5) & 0x3); ! m_xmaxc[2] = ((c[i++] & 0x1F) << 1); ! m_xmaxc[2] |= ((c[i] >> 7) & 0x1); ! m_xmc[26] = ((c[i] >> 4) & 0x7); ! m_xmc[27] = ((c[i] >> 1) & 0x7); ! m_xmc[28] = ((c[i++] & 0x1) << 2); ! m_xmc[28] |= ((c[i] >> 6) & 0x3); ! m_xmc[29] = ((c[i] >> 3) & 0x7); ! m_xmc[30] = (c[i++] & 0x7); ! m_xmc[31] = ((c[i] >> 5) & 0x7); ! m_xmc[32] = ((c[i] >> 2) & 0x7); ! m_xmc[33] = ((c[i++] & 0x3) << 1); ! m_xmc[33] |= ((c[i] >> 7) & 0x1); ! m_xmc[34] = ((c[i] >> 4) & 0x7); ! m_xmc[35] = ((c[i] >> 1) & 0x7); ! m_xmc[36] = ((c[i++] & 0x1) << 2); ! m_xmc[36] |= ((c[i] >> 6) & 0x3); ! m_xmc[37] = ((c[i] >> 3) & 0x7); ! m_xmc[38] = (c[i++] & 0x7); ! m_Nc[3] = ((c[i] >> 1) & 0x7F); ! m_bc[3] = ((c[i++] & 0x1) << 1); ! m_bc[3] |= ((c[i] >> 7) & 0x1); ! m_Mc[3] = ((c[i] >> 5) & 0x3); ! m_xmaxc[3] = ((c[i++] & 0x1F) << 1); ! m_xmaxc[3] |= ((c[i] >> 7) & 0x1); ! m_xmc[39] = ((c[i] >> 4) & 0x7); ! m_xmc[40] = ((c[i] >> 1) & 0x7); ! m_xmc[41] = ((c[i++] & 0x1) << 2); ! m_xmc[41] |= ((c[i] >> 6) & 0x3); ! m_xmc[42] = ((c[i] >> 3) & 0x7); ! m_xmc[43] = (c[i++] & 0x7); /* 30 */ ! m_xmc[44] = ((c[i] >> 5) & 0x7); ! m_xmc[45] = ((c[i] >> 2) & 0x7); ! m_xmc[46] = ((c[i++] & 0x3) << 1); ! m_xmc[46] |= ((c[i] >> 7) & 0x1); ! m_xmc[47] = ((c[i] >> 4) & 0x7); ! m_xmc[48] = ((c[i] >> 1) & 0x7); ! m_xmc[49] = ((c[i++] & 0x1) << 2); ! m_xmc[49] |= ((c[i] >> 6) & 0x3); ! m_xmc[50] = ((c[i] >> 3) & 0x7); ! m_xmc[51] = (c[i] & 0x7); /* 33 */ } private final void explodeFrameMicrosoft(byte[] c, ! final int bufferStartIndex, boolean firstHalfOfMicrosoftFrame) throws InvalidGSMFrameException { --- 194,301 ---- } ! gsmFrameParameters.m_LARc[0] = ((c[i++] & 0xF) << 2); /* 1 */ ! gsmFrameParameters.m_LARc[0] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_LARc[1] = (c[i++] & 0x3F); ! gsmFrameParameters.m_LARc[2] = ((c[i] >> 3) & 0x1F); ! gsmFrameParameters.m_LARc[3] = ((c[i++] & 0x7) << 2); ! gsmFrameParameters.m_LARc[3] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_LARc[4] = ((c[i] >> 2) & 0xF); ! gsmFrameParameters.m_LARc[5] = ((c[i++] & 0x3) << 2); ! gsmFrameParameters.m_LARc[5] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_LARc[6] = ((c[i] >> 3) & 0x7); ! gsmFrameParameters.m_LARc[7] = (c[i++] & 0x7); ! gsmFrameParameters.m_Nc[0] = ((c[i] >> 1) & 0x7F); ! gsmFrameParameters.m_bc[0] = ((c[i++] & 0x1) << 1); ! gsmFrameParameters.m_bc[0] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_Mc[0] = ((c[i] >> 5) & 0x3); ! gsmFrameParameters.m_xmaxc[0] = ((c[i++] & 0x1F) << 1); ! gsmFrameParameters.m_xmaxc[0] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_xmc[0] = ((c[i] >> 4) & 0x7); ! gsmFrameParameters.m_xmc[1] = ((c[i] >> 1) & 0x7); ! gsmFrameParameters.m_xmc[2] = ((c[i++] & 0x1) << 2); ! gsmFrameParameters.m_xmc[2] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_xmc[3] = ((c[i] >> 3) & 0x7); ! gsmFrameParameters.m_xmc[4] = (c[i++] & 0x7); ! gsmFrameParameters.m_xmc[5] = ((c[i] >> 5) & 0x7); ! gsmFrameParameters.m_xmc[6] = ((c[i] >> 2) & 0x7); ! gsmFrameParameters.m_xmc[7] = ((c[i++] & 0x3) << 1); /* 10 */ ! gsmFrameParameters.m_xmc[7] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_xmc[8] = ((c[i] >> 4) & 0x7); ! gsmFrameParameters.m_xmc[9] = ((c[i] >> 1) & 0x7); ! gsmFrameParameters.m_xmc[10] = ((c[i++] & 0x1) << 2); ! gsmFrameParameters.m_xmc[10] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_xmc[11] = ((c[i] >> 3) & 0x7); ! gsmFrameParameters.m_xmc[12] = (c[i++] & 0x7); ! gsmFrameParameters.m_Nc[1] = ((c[i] >> 1) & 0x7F); ! gsmFrameParameters.m_bc[1] = ((c[i++] & 0x1) << 1); ! gsmFrameParameters.m_bc[1] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_Mc[1] = ((c[i] >> 5) & 0x3); ! gsmFrameParameters.m_xmaxc[1] = ((c[i++] & 0x1F) << 1); ! gsmFrameParameters.m_xmaxc[1] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_xmc[13] = ((c[i] >> 4) & 0x7); ! gsmFrameParameters.m_xmc[14] = ((c[i] >> 1) & 0x7); ! gsmFrameParameters.m_xmc[15] = ((c[i++] & 0x1) << 2); ! gsmFrameParameters.m_xmc[15] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_xmc[16] = ((c[i] >> 3) & 0x7); ! gsmFrameParameters.m_xmc[17] = (c[i++] & 0x7); ! gsmFrameParameters.m_xmc[18] = ((c[i] >> 5) & 0x7); ! gsmFrameParameters.m_xmc[19] = ((c[i] >> 2) & 0x7); ! gsmFrameParameters.m_xmc[20] = ((c[i++] & 0x3) << 1); ! gsmFrameParameters.m_xmc[20] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_xmc[21] = ((c[i] >> 4) & 0x7); ! gsmFrameParameters.m_xmc[22] = ((c[i] >> 1) & 0x7); ! gsmFrameParameters.m_xmc[23] = ((c[i++] & 0x1) << 2); ! gsmFrameParameters.m_xmc[23] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_xmc[24] = ((c[i] >> 3) & 0x7); ! gsmFrameParameters.m_xmc[25] = (c[i++] & 0x7); ! gsmFrameParameters.m_Nc[2] = ((c[i] >> 1) & 0x7F); ! gsmFrameParameters.m_bc[2] = ((c[i++] & 0x1) << 1); /* 20 */ ! gsmFrameParameters.m_bc[2] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_Mc[2] = ((c[i] >> 5) & 0x3); ! gsmFrameParameters.m_xmaxc[2] = ((c[i++] & 0x1F) << 1); ! gsmFrameParameters.m_xmaxc[2] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_xmc[26] = ((c[i] >> 4) & 0x7); ! gsmFrameParameters.m_xmc[27] = ((c[i] >> 1) & 0x7); ! gsmFrameParameters.m_xmc[28] = ((c[i++] & 0x1) << 2); ! gsmFrameParameters.m_xmc[28] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_xmc[29] = ((c[i] >> 3) & 0x7); ! gsmFrameParameters.m_xmc[30] = (c[i++] & 0x7); ! gsmFrameParameters.m_xmc[31] = ((c[i] >> 5) & 0x7); ! gsmFrameParameters.m_xmc[32] = ((c[i] >> 2) & 0x7); ! gsmFrameParameters.m_xmc[33] = ((c[i++] & 0x3) << 1); ! gsmFrameParameters.m_xmc[33] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_xmc[34] = ((c[i] >> 4) & 0x7); ! gsmFrameParameters.m_xmc[35] = ((c[i] >> 1) & 0x7); ! gsmFrameParameters.m_xmc[36] = ((c[i++] & 0x1) << 2); ! gsmFrameParameters.m_xmc[36] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_xmc[37] = ((c[i] >> 3) & 0x7); ! gsmFrameParameters.m_xmc[38] = (c[i++] & 0x7); ! gsmFrameParameters.m_Nc[3] = ((c[i] >> 1) & 0x7F); ! gsmFrameParameters.m_bc[3] = ((c[i++] & 0x1) << 1); ! gsmFrameParameters.m_bc[3] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_Mc[3] = ((c[i] >> 5) & 0x3); ! gsmFrameParameters.m_xmaxc[3] = ((c[i++] & 0x1F) << 1); ! gsmFrameParameters.m_xmaxc[3] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_xmc[39] = ((c[i] >> 4) & 0x7); ! gsmFrameParameters.m_xmc[40] = ((c[i] >> 1) & 0x7); ! gsmFrameParameters.m_xmc[41] = ((c[i++] & 0x1) << 2); ! gsmFrameParameters.m_xmc[41] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_xmc[42] = ((c[i] >> 3) & 0x7); ! gsmFrameParameters.m_xmc[43] = (c[i++] & 0x7); /* 30 */ ! gsmFrameParameters.m_xmc[44] = ((c[i] >> 5) & 0x7); ! gsmFrameParameters.m_xmc[45] = ((c[i] >> 2) & 0x7); ! gsmFrameParameters.m_xmc[46] = ((c[i++] & 0x3) << 1); ! gsmFrameParameters.m_xmc[46] |= ((c[i] >> 7) & 0x1); ! gsmFrameParameters.m_xmc[47] = ((c[i] >> 4) & 0x7); ! gsmFrameParameters.m_xmc[48] = ((c[i] >> 1) & 0x7); ! gsmFrameParameters.m_xmc[49] = ((c[i++] & 0x1) << 2); ! gsmFrameParameters.m_xmc[49] |= ((c[i] >> 6) & 0x3); ! gsmFrameParameters.m_xmc[50] = ((c[i] >> 3) & 0x7); ! gsmFrameParameters.m_xmc[51] = (c[i] & 0x7); /* 33 */ } private final void explodeFrameMicrosoft(byte[] c, ! final int bufferStartIndex, boolean firstHalfOfMicrosoftFrame, ! GsmFrameParameters gsmFrameParameters) throws InvalidGSMFrameException { *************** *** 311,422 **** { m_sr = getNextCodedByteValue(); ! m_LARc[0] = getNextBits(6); m_sr |= getNextCodedByteValue() << 2; ! m_LARc[1] = getNextBits(6); m_sr |= getNextCodedByteValue() << 4; ! m_LARc[2] = getNextBits(5); ! m_LARc[3] = getNextBits(5); m_sr |= getNextCodedByteValue() << 2; ! m_LARc[4] = getNextBits(4); ! m_LARc[5] = getNextBits(4); m_sr |= getNextCodedByteValue() << 2; /* 5 */ ! m_LARc[6] = getNextBits(3); ! m_LARc[7] = getNextBits(3); m_sr |= getNextCodedByteValue() << 4; ! m_Nc[0] = getNextBits(7); ! m_bc[0] = getNextBits(2); ! m_Mc[0] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmaxc[0] = getNextBits(6); ! m_xmc[0] = getNextBits(3); ! m_sr = getNextCodedByteValue(); ! m_xmc[1] = getNextBits(3); ! m_xmc[2] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; ! m_xmc[3] = getNextBits(3); ! m_xmc[4] = getNextBits(3); ! m_xmc[5] = getNextBits(3); m_sr |= getNextCodedByteValue() << 1; /* 10 */ ! m_xmc[6] = getNextBits(3); ! m_xmc[7] = getNextBits(3); ! m_xmc[8] = getNextBits(3); m_sr = getNextCodedByteValue(); ! m_xmc[9] = getNextBits(3); ! m_xmc[10] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! m_xmc[11] = getNextBits(3); ! m_xmc[12] = getNextBits(3); m_sr |= getNextCodedByteValue() << 4; ! m_Nc[1] = getNextBits(7); ! m_bc[1] = getNextBits(2); ! m_Mc[1] = getNextBits(2); m_sr |= getNextCodedByteValue() << 1; ! m_xmaxc[1] = getNextBits(6); ! m_xmc[13] = getNextBits(3); m_sr = getNextCodedByteValue(); /* 15 */ ! m_xmc[14] = getNextBits(3); ! m_xmc[15] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! m_xmc[16] = getNextBits(3); ! m_xmc[17] = getNextBits(3); ! m_xmc[18] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmc[19] = getNextBits(3); ! m_xmc[20] = getNextBits(3); ! m_xmc[21] = getNextBits(3); m_sr = getNextCodedByteValue(); ! m_xmc[22] = getNextBits(3); ! m_xmc[23] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! m_xmc[24] = getNextBits(3); ! m_xmc[25] = getNextBits(3); m_sr |= getNextCodedByteValue() << 4; /* 20 */ ! m_Nc[2] = getNextBits(7); ! m_bc[2] = getNextBits(2); ! m_Mc[2] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmaxc[2] = getNextBits(6); ! m_xmc[26] = getNextBits(3); ! m_sr = getNextCodedByteValue(); ! m_xmc[27] = getNextBits(3); ! m_xmc[28] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; ! m_xmc[29] = getNextBits(3); ! m_xmc[30] = getNextBits(3); ! m_xmc[31] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmc[32] = getNextBits(3); ! m_xmc[33] = getNextBits(3); ! m_xmc[34] = getNextBits(3); m_sr = getNextCodedByteValue(); /* 25 */ ! m_xmc[35] = getNextBits(3); ! m_xmc[36] = getNextBits(3); m_sr |= getNextCodedByteValue(); ! m_xmc[37] = getNextBits(3); ! m_xmc[38] = getNextBits(3); m_sr |= getNextCodedByteValue() << 4; ! m_Nc[3] = getNextBits(7); ! m_bc[3] = getNextBits(2); ! m_Mc[3] = getNextBits(2); m_sr |= getNextCodedByteValue() << 1; ! m_xmaxc[3] = getNextBits(6); ! m_xmc[39] = getNextBits(3); m_sr = getNextCodedByteValue(); ! m_xmc[40] = getNextBits(3); ! m_xmc[41] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; /* 30 */ ! m_xmc[42] = getNextBits(3); ! m_xmc[43] = getNextBits(3); ! m_xmc[44] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmc[45] = getNextBits(3); ! m_xmc[46] = getNextBits(3); ! m_xmc[47] = getNextBits(3); m_sr = getNextCodedByteValue(); ! m_xmc[48] = getNextBits(3); ! m_xmc[49] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! m_xmc[50] = getNextBits(3); ! m_xmc[51] = getNextBits(3); m_frame_chain = m_sr & 0xf; --- 307,418 ---- { m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_LARc[0] = getNextBits(6); m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_LARc[1] = getNextBits(6); m_sr |= getNextCodedByteValue() << 4; ! gsmFrameParameters.m_LARc[2] = getNextBits(5); ! gsmFrameParameters.m_LARc[3] = getNextBits(5); m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_LARc[4] = getNextBits(4); ! gsmFrameParameters.m_LARc[5] = getNextBits(4); m_sr |= getNextCodedByteValue() << 2; /* 5 */ ! gsmFrameParameters.m_LARc[6] = getNextBits(3); ! gsmFrameParameters.m_LARc[7] = getNextBits(3); m_sr |= getNextCodedByteValue() << 4; ! gsmFrameParameters.m_Nc[0] = getNextBits(7); ! gsmFrameParameters.m_bc[0] = getNextBits(2); ! gsmFrameParameters.m_Mc[0] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[0] = getNextBits(6); ! gsmFrameParameters.m_xmc[0] = getNextBits(3); ! m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[1] = getNextBits(3); ! gsmFrameParameters.m_xmc[2] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[3] = getNextBits(3); ! gsmFrameParameters.m_xmc[4] = getNextBits(3); ! gsmFrameParameters.m_xmc[5] = getNextBits(3); m_sr |= getNextCodedByteValue() << 1; /* 10 */ ! gsmFrameParameters.m_xmc[6] = getNextBits(3); ! gsmFrameParameters.m_xmc[7] = getNextBits(3); ! gsmFrameParameters.m_xmc[8] = getNextBits(3); m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[9] = getNextBits(3); ! gsmFrameParameters.m_xmc[10] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[11] = getNextBits(3); ! gsmFrameParameters.m_xmc[12] = getNextBits(3); m_sr |= getNextCodedByteValue() << 4; ! gsmFrameParameters.m_Nc[1] = getNextBits(7); ! gsmFrameParameters.m_bc[1] = getNextBits(2); ! gsmFrameParameters.m_Mc[1] = getNextBits(2); m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[1] = getNextBits(6); ! gsmFrameParameters.m_xmc[13] = getNextBits(3); m_sr = getNextCodedByteValue(); /* 15 */ ! gsmFrameParameters.m_xmc[14] = getNextBits(3); ! gsmFrameParameters.m_xmc[15] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[16] = getNextBits(3); ! gsmFrameParameters.m_xmc[17] = getNextBits(3); ! gsmFrameParameters.m_xmc[18] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[19] = getNextBits(3); ! gsmFrameParameters.m_xmc[20] = getNextBits(3); ! gsmFrameParameters.m_xmc[21] = getNextBits(3); m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[22] = getNextBits(3); ! gsmFrameParameters.m_xmc[23] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[24] = getNextBits(3); ! gsmFrameParameters.m_xmc[25] = getNextBits(3); m_sr |= getNextCodedByteValue() << 4; /* 20 */ ! gsmFrameParameters.m_Nc[2] = getNextBits(7); ! gsmFrameParameters.m_bc[2] = getNextBits(2); ! gsmFrameParameters.m_Mc[2] = getNextBits(2); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[2] = getNextBits(6); ! gsmFrameParameters.m_xmc[26] = getNextBits(3); ! m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[27] = getNextBits(3); ! gsmFrameParameters.m_xmc[28] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[29] = getNextBits(3); ! gsmFrameParameters.m_xmc[30] = getNextBits(3); ! gsmFrameParameters.m_xmc[31] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[32] = getNextBits(3); ! gsmFrameParameters.m_xmc[33] = getNextBits(3); ! gsmFrameParameters.m_xmc[34] = getNextBits(3); m_sr = getNextCodedByteValue(); /* 25 */ ! gsmFrameParameters.m_xmc[35] = getNextBits(3); ! gsmFrameParameters.m_xmc[36] = getNextBits(3); m_sr |= getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[37] = getNextBits(3); ! gsmFrameParameters.m_xmc[38] = getNextBits(3); m_sr |= getNextCodedByteValue() << 4; ! gsmFrameParameters.m_Nc[3] = getNextBits(7); ! gsmFrameParameters.m_bc[3] = getNextBits(2); ! gsmFrameParameters.m_Mc[3] = getNextBits(2); m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmaxc[3] = getNextBits(6); ! gsmFrameParameters.m_xmc[39] = getNextBits(3); m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[40] = getNextBits(3); ! gsmFrameParameters.m_xmc[41] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; /* 30 */ ! gsmFrameParameters.m_xmc[42] = getNextBits(3); ! gsmFrameParameters.m_xmc[43] = getNextBits(3); ! gsmFrameParameters.m_xmc[44] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[45] = getNextBits(3); ! gsmFrameParameters.m_xmc[46] = getNextBits(3); ! gsmFrameParameters.m_xmc[47] = getNextBits(3); m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[48] = getNextBits(3); ! gsmFrameParameters.m_xmc[49] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[50] = getNextBits(3); ! gsmFrameParameters.m_xmc[51] = getNextBits(3); m_frame_chain = m_sr & 0xf; *************** *** 426,536 **** m_sr = m_frame_chain; m_sr |= getNextCodedByteValue() << 4; /* 1 */ ! m_LARc[0] = getNextBits(6); ! m_LARc[1] = getNextBits(6); m_sr = getNextCodedByteValue(); ! m_LARc[2] = getNextBits(5); m_sr |= getNextCodedByteValue() << 3; ! m_LARc[3] = getNextBits(5); ! m_LARc[4] = getNextBits(4); m_sr |= getNextCodedByteValue() << 2; ! m_LARc[5] = getNextBits(4); ! m_LARc[6] = getNextBits(3); ! m_LARc[7] = getNextBits(3); m_sr = getNextCodedByteValue(); /* 5 */ ! m_Nc[0] = getNextBits(7); m_sr |= getNextCodedByteValue() << 1; ! m_bc[0] = getNextBits(2); ! m_Mc[0] = getNextBits(2); m_sr |= getNextCodedByteValue() << 5; ! m_xmaxc[0] = getNextBits(6); ! m_xmc[0] = getNextBits(3); ! m_xmc[1] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmc[2] = getNextBits(3); ! m_xmc[3] = getNextBits(3); ! m_xmc[4] = getNextBits(3); m_sr = getNextCodedByteValue(); ! m_xmc[5] = getNextBits(3); ! m_xmc[6] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; /* 10 */ ! m_xmc[7] = getNextBits(3); ! m_xmc[8] = getNextBits(3); ! m_xmc[9] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmc[10] = getNextBits(3); ! m_xmc[11] = getNextBits(3); ! m_xmc[12] = getNextBits(3); m_sr = getNextCodedByteValue(); ! m_Nc[1] = getNextBits(7); m_sr |= getNextCodedByteValue() << 1; ! m_bc[1] = getNextBits(2); ! m_Mc[1] = getNextBits(2); m_sr |= getNextCodedByteValue() << 5; ! m_xmaxc[1] = getNextBits(6); ! m_xmc[13] = getNextBits(3); ! m_xmc[14] = getNextBits(3); m_sr |= getNextCodedByteValue() << 1; /* 15 */ ! m_xmc[15] = getNextBits(3); ! m_xmc[16] = getNextBits(3); ! m_xmc[17] = getNextBits(3); ! m_sr = getNextCodedByteValue(); ! m_xmc[18] = getNextBits(3); ! m_xmc[19] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; ! m_xmc[20] = getNextBits(3); ! m_xmc[21] = getNextBits(3); ! m_xmc[22] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmc[23] = getNextBits(3); ! m_xmc[24] = getNextBits(3); ! m_xmc[25] = getNextBits(3); m_sr = getNextCodedByteValue(); ! m_Nc[2] = getNextBits(7); m_sr |= getNextCodedByteValue() << 1; /* 20 */ ! m_bc[2] = getNextBits(2); ! m_Mc[2] = getNextBits(2); m_sr |= getNextCodedByteValue() << 5; ! m_xmaxc[2] = getNextBits(6); ! m_xmc[26] = getNextBits(3); ! m_xmc[27] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmc[28] = getNextBits(3); ! m_xmc[29] = getNextBits(3); ! m_xmc[30] = getNextBits(3); ! m_sr = getNextCodedByteValue(); ! m_xmc[31] = getNextBits(3); ! m_xmc[32] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; ! m_xmc[33] = getNextBits(3); ! m_xmc[34] = getNextBits(3); ! m_xmc[35] = getNextBits(3); m_sr |= getNextCodedByteValue() << 1; /* 25 */ ! m_xmc[36] = getNextBits(3); ! m_xmc[37] = getNextBits(3); ! m_xmc[38] = getNextBits(3); m_sr = getNextCodedByteValue(); ! m_Nc[3] = getNextBits(7); m_sr |= getNextCodedByteValue() << 1; ! m_bc[3] = getNextBits(2); ! m_Mc[3] = getNextBits(2); m_sr |= getNextCodedByteValue() << 5; ! m_xmaxc[3] = getNextBits(6); ! m_xmc[39] = getNextBits(3); ! m_xmc[40] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmc[41] = getNextBits(3); ! m_xmc[42] = getNextBits(3); ! m_xmc[43] = getNextBits(3); m_sr = getNextCodedByteValue(); /* 30 */ ! m_xmc[44] = getNextBits(3); ! m_xmc[45] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! m_xmc[46] = getNextBits(3); ! m_xmc[47] = getNextBits(3); ! m_xmc[48] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! m_xmc[49] = getNextBits(3); ! m_xmc[50] = getNextBits(3); ! m_xmc[51] = getNextBits(3); } } --- 422,532 ---- m_sr = m_frame_chain; m_sr |= getNextCodedByteValue() << 4; /* 1 */ ! gsmFrameParameters.m_LARc[0] = getNextBits(6); ! gsmFrameParameters.m_LARc[1] = getNextBits(6); m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_LARc[2] = getNextBits(5); m_sr |= getNextCodedByteValue() << 3; ! gsmFrameParameters.m_LARc[3] = getNextBits(5); ! gsmFrameParameters.m_LARc[4] = getNextBits(4); m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_LARc[5] = getNextBits(4); ! gsmFrameParameters.m_LARc[6] = getNextBits(3); ! gsmFrameParameters.m_LARc[7] = getNextBits(3); m_sr = getNextCodedByteValue(); /* 5 */ ! gsmFrameParameters.m_Nc[0] = getNextBits(7); m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_bc[0] = getNextBits(2); ! gsmFrameParameters.m_Mc[0] = getNextBits(2); m_sr |= getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[0] = getNextBits(6); ! gsmFrameParameters.m_xmc[0] = getNextBits(3); ! gsmFrameParameters.m_xmc[1] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[2] = getNextBits(3); ! gsmFrameParameters.m_xmc[3] = getNextBits(3); ! gsmFrameParameters.m_xmc[4] = getNextBits(3); m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[5] = getNextBits(3); ! gsmFrameParameters.m_xmc[6] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; /* 10 */ ! gsmFrameParameters.m_xmc[7] = getNextBits(3); ! gsmFrameParameters.m_xmc[8] = getNextBits(3); ! gsmFrameParameters.m_xmc[9] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[10] = getNextBits(3); ! gsmFrameParameters.m_xmc[11] = getNextBits(3); ! gsmFrameParameters.m_xmc[12] = getNextBits(3); m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_Nc[1] = getNextBits(7); m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_bc[1] = getNextBits(2); ! gsmFrameParameters.m_Mc[1] = getNextBits(2); m_sr |= getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[1] = getNextBits(6); ! gsmFrameParameters.m_xmc[13] = getNextBits(3); ! gsmFrameParameters.m_xmc[14] = getNextBits(3); m_sr |= getNextCodedByteValue() << 1; /* 15 */ ! gsmFrameParameters.m_xmc[15] = getNextBits(3); ! gsmFrameParameters.m_xmc[16] = getNextBits(3); ! gsmFrameParameters.m_xmc[17] = getNextBits(3); ! m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[18] = getNextBits(3); ! gsmFrameParameters.m_xmc[19] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[20] = getNextBits(3); ! gsmFrameParameters.m_xmc[21] = getNextBits(3); ! gsmFrameParameters.m_xmc[22] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[23] = getNextBits(3); ! gsmFrameParameters.m_xmc[24] = getNextBits(3); ! gsmFrameParameters.m_xmc[25] = getNextBits(3); m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_Nc[2] = getNextBits(7); m_sr |= getNextCodedByteValue() << 1; /* 20 */ ! gsmFrameParameters.m_bc[2] = getNextBits(2); ! gsmFrameParameters.m_Mc[2] = getNextBits(2); m_sr |= getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[2] = getNextBits(6); ! gsmFrameParameters.m_xmc[26] = getNextBits(3); ! gsmFrameParameters.m_xmc[27] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[28] = getNextBits(3); ! gsmFrameParameters.m_xmc[29] = getNextBits(3); ! gsmFrameParameters.m_xmc[30] = getNextBits(3); ! m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_xmc[31] = getNextBits(3); ! gsmFrameParameters.m_xmc[32] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[33] = getNextBits(3); ! gsmFrameParameters.m_xmc[34] = getNextBits(3); ! gsmFrameParameters.m_xmc[35] = getNextBits(3); m_sr |= getNextCodedByteValue() << 1; /* 25 */ ! gsmFrameParameters.m_xmc[36] = getNextBits(3); ! gsmFrameParameters.m_xmc[37] = getNextBits(3); ! gsmFrameParameters.m_xmc[38] = getNextBits(3); m_sr = getNextCodedByteValue(); ! gsmFrameParameters.m_Nc[3] = getNextBits(7); m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_bc[3] = getNextBits(2); ! gsmFrameParameters.m_Mc[3] = getNextBits(2); m_sr |= getNextCodedByteValue() << 5; ! gsmFrameParameters.m_xmaxc[3] = getNextBits(6); ! gsmFrameParameters.m_xmc[39] = getNextBits(3); ! gsmFrameParameters.m_xmc[40] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[41] = getNextBits(3); ! gsmFrameParameters.m_xmc[42] = getNextBits(3); ! gsmFrameParameters.m_xmc[43] = getNextBits(3); m_sr = getNextCodedByteValue(); /* 30 */ ! gsmFrameParameters.m_xmc[44] = getNextBits(3); ! gsmFrameParameters.m_xmc[45] = getNextBits(3); m_sr |= getNextCodedByteValue() << 2; ! gsmFrameParameters.m_xmc[46] = getNextBits(3); ! gsmFrameParameters.m_xmc[47] = getNextBits(3); ! gsmFrameParameters.m_xmc[48] = getNextBits(3); ! m_sr |= getNextCodedByteValue() << 1; ! gsmFrameParameters.m_xmc[49] = getNextBits(3); ! gsmFrameParameters.m_xmc[50] = getNextBits(3); ! gsmFrameParameters.m_xmc[51] = getNextBits(3); } } *************** *** 572,575 **** --- 568,578 ---- } + private final int[] decoder(GsmFrameParameters gsmFrameParameters) + { + return decoder(gsmFrameParameters.m_LARc, gsmFrameParameters.m_Nc, + gsmFrameParameters.m_bc, gsmFrameParameters.m_Mc, + gsmFrameParameters.m_xmaxc, gsmFrameParameters.m_xmc); + } + private final int[] decoder(int[] LARcr, int[] Ncr, int[] bcr, int[] Mcr, int[] xmaxcr, int[] xMcr) |
|
From: Matthias P. <pfi...@us...> - 2013-03-05 18:47:52
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27319/src/classes/org/tritonus/lowlevel/gsm Modified Files: BitEncoder.java Log Message: - extended for MS GSM Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitEncoder.java Index: BitEncoder.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitEncoder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** BitEncoder.java 19 Jan 2013 21:15:09 -0000 1.1 --- BitEncoder.java 5 Mar 2013 18:47:49 -0000 1.2 *************** *** 51,60 **** int nextRemainingBits = remainingBitsInCurrentByte - bits; int nextNumBits = numBits - bits; switch (allocationMode) { case LSBitFirst: break; case MSBitFirst: ! int x = (((value >>> nextNumBits) & Gsm_Def.BITMASKS[bits]) << nextRemainingBits); codedBytes[byteIndex] |= x; break; --- 51,64 ---- int nextRemainingBits = remainingBitsInCurrentByte - bits; int nextNumBits = numBits - bits; + int x; switch (allocationMode) { case LSBitFirst: + x = (((value) & Gsm_Def.BITMASKS[bits]) << (8 - remainingBitsInCurrentByte)); + codedBytes[byteIndex] |= x; + value >>>= bits; break; case MSBitFirst: ! x = (((value >>> nextNumBits) & Gsm_Def.BITMASKS[bits]) << nextRemainingBits); codedBytes[byteIndex] |= x; break; |
|
From: Matthias P. <pfi...@us...> - 2013-03-05 18:40:28
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26916/src/classes/org/tritonus/lowlevel/gsm Added Files: BitDecoder.java GsmFrameParameters.java Log Message: - new utility classes for GSM encoder/decoder Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/BitDecoder.java http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/lowlevel/gsm/GsmFrameParameters.java --- NEW FILE: BitDecoder.java --- --- NEW FILE: GsmFrameParameters.java --- |
|
From: Matthias P. <pfi...@us...> - 2013-03-05 18:39:04
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/file In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26826/src/classes/org/tritonus/share/sampled/file Modified Files: TAudioFileWriter.java Log Message: - fixed WaveAudioOutputStream for MS GSM - fixed documentation typos Direct links to online-CVS: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/tritonus/tritonus/src/classes/org/tritonus/share/sampled/file/TAudioFileWriter.java Index: TAudioFileWriter.java =================================================================== RCS file: /cvsroot/tritonus/tritonus/src/classes/org/tritonus/share/sampled/file/TAudioFileWriter.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** TAudioFileWriter.java 3 Mar 2008 15:34:32 -0000 1.5 --- TAudioFileWriter.java 5 Mar 2013 18:39:01 -0000 1.6 *************** *** 54,58 **** * an AudioOutputStream. * <p>There should be only one set of audio formats supported by any given ! * class of TAudioFileWriter. This class assumes implicitely that all * supported file types have a common set of audio formats they can handle. * --- 54,58 ---- * an AudioOutputStream. * <p>There should be only one set of audio formats supported by any given ! * class of TAudioFileWriter. This class assumes implicitly that all * supported file types have a common set of audio formats they can handle. * *************** *** 155,159 **** // changing for PCM formats. // I prefer to return false if the format is not exactly supported ! // but still exectute the write, if only sign/endian changing is necessary. } --- 155,159 ---- // changing for PCM formats. // I prefer to return false if the format is not exactly supported ! // but still execute the write, if only sign/endian changing is necessary. } |
|
From: Matthias P. <pfi...@us...> - 2013-03-05 17:54:25
|
Update of /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/dsp/sources In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24976/src/classes/org/tritonus/lowlevel/dsp/sources Log Message: Directory /cvsroot/tritonus/tritonus/src/classes/org/tritonus/lowlevel/dsp/sources added to the repository Direct links to online-CVS: |