Change in gr-gsm[master]: Fix the TCH/H decoder and demapper XML definitions
Piotr Krysik has submitted this change and it was merged. (
https://gerrit.osmocom.org/13246 )
Change subject: Fix the TCH/H decoder and demapper XML definitions
..
Fix the TCH/H decoder and demapper XML definitions
- The second argument of tch_h_decoder constructor is a string that
accepts the value of MultiRate configuration element and not an enum
like the tch_f_decoder decoder.
- Make the demapper's burst sink required.
- Make all parameters visible.
- Rename the TCH/H Channel parameter to Sub-channel number.
- Add the qa_tch_h_decoder test in the CMakeLists.txt
- Fix several typos
Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd
---
M apps/grgsm_decode
M grc/decoding/gsm_tch_h_decoder.xml
M grc/demapping/gsm_tch_h_chans_demapper.xml
M python/CMakeLists.txt
4 files changed, 26 insertions(+), 40 deletions(-)
Approvals:
Piotr Krysik: Looks good to me, approved; Verified
diff --git a/apps/grgsm_decode b/apps/grgsm_decode
index 3bc0db3..4bd1d95 100755
--- a/apps/grgsm_decode
+++ b/apps/grgsm_decode
@@ -344,7 +344,7 @@
tch_options.add_option("--sub-channel", dest="tch_h_channel", default="0",
type='intx',
help="TCH/H sub-channel. [default=0]")
tch_options.add_option("--multi-rate", dest="multi_rate", default="",
type='string',
- help="The MultiRrate configuration element from the
Assignment Command message. "
+ help="The MultiRate configuration element from the
Assignment Command message. "
"Example: 28111a40. See 3GPP TS 44.018 -
10.5.2.21aa MultiRate configuration")
tch_options.add_option("--voice-boundary",
dest="enable_voice_boundary_detection", action="store_true", default=False,
help="Enable voice boundary detection for traffic
channels. This can help reduce noice in the output.")
diff --git a/grc/decoding/gsm_tch_h_decoder.xml
b/grc/decoding/gsm_tch_h_decoder.xml
index 895104e..3936336 100644
--- a/grc/decoding/gsm_tch_h_decoder.xml
+++ b/grc/decoding/gsm_tch_h_decoder.xml
@@ -3,54 +3,27 @@
TCH/H decoder
gsm_tch_h_decoder
import grgsm
- grgsm.tch_h_decoder($sub_channel, $mode, $boundary_check)
+ grgsm.tch_h_decoder($sub_channel, $multi_rate, $boundary_check)
-sub-channel number
+Sub-channel number
sub_channel
0
int
+none
- sub-channel 0
+ 0
0
- sub-channel 1
+ 1
1
-TCH/H coding mode
-mode
-enum
-
- GSM-HS
- grgsm.TCH_HS
-
-
- GSM-AMR 7.95
- grgsm.TCH_AHS7_95
-
-
- GSM-AMR 7.4
- grgsm.TCH_AHS7_4
-
-
- GSM-AMR 6.7
- grgsm.TCH_AHS6_7
-
-
- GSM-AMR 5.9
- grgsm.TCH_AHS5_9
-
-
- GSM-AMR 5.15
- grgsm.TCH_AHS5_15
-
-
- GSM-AMR 4.75
- grgsm.TCH_AHS4_75
-
+MultiRate configuration
+multi_rate
+string
Voice boundary detection
@@ -83,6 +56,11 @@
+The MultiRate configuration string should contains the hex string from the
+MultiRate configuration element from the Assignment Command message.
+Example: 28111a40.
+See 3GPP TS 44.018 - 10.5.2.21aa MultiRate configuratio
+
If "Voice boundary detection" is enabled, then only bursts are decoded as
voice where
- the framenumber is greater then the framenumber of a received "Connect" or
"Connect Acknowlegde" message, and
diff --git a/grc/demapping/gsm_tch_h_chans_demapper.xml
b/grc/demapping/gsm_tch_h_chans_demapper.xml
index f2bd67f..52148f5 100644
--- a/grc/demapping/gsm_tch_h_chans_demapper.xml
+++ b/grc/demapping/gsm_tch_h_chans_demapper.xml
@@ -10,22 +10,29 @@
timeslot_nr
2
int
-part
+none
-TCH/H Channel
+Sub-channel number
tch_h_channel
0
int
-#if $tch_type() == 0 then 'all' else 'none'#
+none
+
+ 0
+ 0
+
+
+ 1
+ 1
+
$tch_h_channel() -1 and $tch_h_channel() 2
bursts
message
-1
tch_bursts
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 22c88a9..21f2507 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -58,6 +58,7 @@
GR_ADD_TEST(qa_burst_fnr_filter ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/qa_burst_fnr_filter.py)
GR_ADD_TEST(qa_dummy_burst_filter ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/qa_dummy_burst_filter.py)
GR_ADD_TEST(qa_tch_f_decoder ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/qa_tch_f_decoder.py)
+GR_ADD_TEST(qa_tch_h_decoder ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/qa_tch_h_decoder.py)
GR_ADD_TEST(qa_tch_f_chans_demapper ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/qa_tch_f_chans_demapper.py)
GR_ADD_TEST(qa_tch_h_chans_demapper ${PYTHON_EXECUTABLE}
${CMAKE_CURRENT_SOURCE_DIR}/qa_tch_h_chans_demapper.py)
Change in gr-gsm[master]: Fix the TCH/H decoder and demapper XML definitions
Piotr Krysik has posted comments on this change. ( https://gerrit.osmocom.org/13246 ) Change subject: Fix the TCH/H decoder and demapper XML definitions .. Patch Set 4: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/13246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd Gerrit-Change-Number: 13246 Gerrit-PatchSet: 4 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: Vasil Velichkov Gerrit-Reviewer: fixeria Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Mon, 25 Mar 2019 08:47:59 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in gr-gsm[master]: Fix the TCH/H decoder and demapper XML definitions
Hello Piotr Krysik, fixeria, Vadim Yanitskiy, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13246 to look at the new patch set (#4). Change subject: Fix the TCH/H decoder and demapper XML definitions .. Fix the TCH/H decoder and demapper XML definitions - The second argument of tch_h_decoder constructor is a string that accepts the value of MultiRate configuration element and not an enum like the tch_f_decoder decoder. - Make the demapper's burst sink required. - Make all parameters visible. - Rename the TCH/H Channel parameter to Sub-channel number. - Add the qa_tch_h_decoder test in the CMakeLists.txt - Fix several typos Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd --- M apps/grgsm_decode M grc/decoding/gsm_tch_h_decoder.xml M grc/demapping/gsm_tch_h_chans_demapper.xml M python/CMakeLists.txt 4 files changed, 26 insertions(+), 40 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/46/13246/4 -- To view, visit https://gerrit.osmocom.org/13246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd Gerrit-Change-Number: 13246 Gerrit-PatchSet: 4 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: Vasil Velichkov Gerrit-Reviewer: fixeria Gerrit-CC: Harald Welte Gerrit-CC: Max
Change in gr-gsm[master]: Fix the TCH/H decoder and demapper XML definitions
Vasil Velichkov has posted comments on this change. ( https://gerrit.osmocom.org/13246 ) Change subject: Fix the TCH/H decoder and demapper XML definitions .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/#/c/13246/2/grc/decoding/gsm_tch_h_decoder.xml File grc/decoding/gsm_tch_h_decoder.xml: https://gerrit.osmocom.org/#/c/13246/2/grc/decoding/gsm_tch_h_decoder.xml@59 PS2, Line 59: MultiRrate > spelling Done. Thanks. -- To view, visit https://gerrit.osmocom.org/13246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd Gerrit-Change-Number: 13246 Gerrit-PatchSet: 3 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: Vasil Velichkov Gerrit-Reviewer: fixeria Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Tue, 19 Mar 2019 15:33:23 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in gr-gsm[master]: Fix the TCH/H decoder and demapper XML definitions
Hello Piotr Krysik, fixeria, Vadim Yanitskiy, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13246 to look at the new patch set (#3). Change subject: Fix the TCH/H decoder and demapper XML definitions .. Fix the TCH/H decoder and demapper XML definitions - The second argument of tch_h_decoder constructor is a string that accepts the value of MultiRate configuration element and not an enum like the tch_f_decoder decoder. - Make the demapper's burst sink required. - Make all parameters visible. - Rename the TCH/H Channel parameter to Sub-channel number. - Add the qa_tch_h_decoder test in the CMakeLists.txt Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd --- M grc/decoding/gsm_tch_h_decoder.xml M grc/demapping/gsm_tch_h_chans_demapper.xml M python/CMakeLists.txt 3 files changed, 25 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/46/13246/3 -- To view, visit https://gerrit.osmocom.org/13246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd Gerrit-Change-Number: 13246 Gerrit-PatchSet: 3 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: Vasil Velichkov Gerrit-Reviewer: fixeria Gerrit-CC: Harald Welte Gerrit-CC: Max
Change in gr-gsm[master]: Fix the TCH/H decoder and demapper XML definitions
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/13246 ) Change subject: Fix the TCH/H decoder and demapper XML definitions .. Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/13246/2/grc/decoding/gsm_tch_h_decoder.xml File grc/decoding/gsm_tch_h_decoder.xml: https://gerrit.osmocom.org/#/c/13246/2/grc/decoding/gsm_tch_h_decoder.xml@59 PS2, Line 59: MultiRrate spelling -- To view, visit https://gerrit.osmocom.org/13246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd Gerrit-Change-Number: 13246 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: Vasil Velichkov Gerrit-Reviewer: fixeria Gerrit-CC: Harald Welte Gerrit-CC: Max Gerrit-Comment-Date: Tue, 19 Mar 2019 13:09:34 + Gerrit-HasComments: Yes Gerrit-HasLabels: No
Change in gr-gsm[master]: Fix the TCH/H decoder and demapper XML definitions
Hello Piotr Krysik, fixeria, Vadim Yanitskiy, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/13246 to look at the new patch set (#2). Change subject: Fix the TCH/H decoder and demapper XML definitions .. Fix the TCH/H decoder and demapper XML definitions - The second argument of tch_h_decoder constructor is a string that accepts the value of MultiRate configuration element and not an enum like the tch_f_decoder decoder. - Make the demapper's burst sink required. - Make all parameters visible. - Rename the TCH/H Channel parameter to Sub-channel number. Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd --- M grc/decoding/gsm_tch_h_decoder.xml M grc/demapping/gsm_tch_h_chans_demapper.xml 2 files changed, 24 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/gr-gsm refs/changes/46/13246/2 -- To view, visit https://gerrit.osmocom.org/13246 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: gr-gsm Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I92d4f49955c634df7d76f17cfb58d7106846c1bd Gerrit-Change-Number: 13246 Gerrit-PatchSet: 2 Gerrit-Owner: Vasil Velichkov Gerrit-Reviewer: Piotr Krysik Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Reviewer: Vasil Velichkov Gerrit-Reviewer: fixeria Gerrit-CC: Max
