Menu
▾
▴
[tritonus-commits] CVS: tritonus/src/classes/org/tritonus/lowlevel/gsm
|
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 ---- |