diff options
author | Roman Khassraf <roman@khassraf.at> | 2015-06-02 09:21:11 +0200 |
---|---|---|
committer | Roman Khassraf <roman@khassraf.at> | 2015-06-02 09:21:11 +0200 |
commit | fa7058b64b115f72fcdf63b05dcba0f3e6163f7c (patch) | |
tree | 1ae85685ab6a55275ef317159d4a7845d1a6ba15 /lib/decoding | |
parent | aa8fa99d0e54e3ed8919b6c0e56162f1db486a3a (diff) |
Changed tch_mode enum to support AMR
Diffstat (limited to 'lib/decoding')
-rw-r--r-- | lib/decoding/tch_f_decoder_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/decoding/tch_f_decoder_impl.cc b/lib/decoding/tch_f_decoder_impl.cc index 283e0f0..c8265ea 100644 --- a/lib/decoding/tch_f_decoder_impl.cc +++ b/lib/decoding/tch_f_decoder_impl.cc @@ -57,7 +57,7 @@ namespace gr { throw std::runtime_error("TCH/F Decoder: can't open file\n"); } - if (d_tch_mode == MODE_SPEECH_EFR) + if (d_tch_mode != TCH_FS) { fwrite(amr_nb_magic, 1, 6, d_speech_file); } @@ -196,7 +196,7 @@ namespace gr { unsigned char mTCHFrame[33]; unsigned int mTCHFrameLength; - if (d_tch_mode == MODE_SPEECH_FR) // GSM-FR + if (d_tch_mode == TCH_FS) // GSM-FR { // Undo Um's importance-sorted bit ordering. // See GSM 05.03 3.1 and Tablee 2. @@ -207,7 +207,7 @@ namespace gr { mVFrame.pack(mTCHFrame); mTCHFrameLength = 33; } - else if (d_tch_mode == MODE_SPEECH_EFR) // GSM-EFR / AMR 12.2 + else if (d_tch_mode == TCH_EFR) // GSM-EFR / AMR 12.2 { VocoderAMRFrame mVFrameAMR; |