Skip to content

fixes conventionalDMR plugin support#828

Merged
robotastic merged 2 commits intoTrunkRecorder:masterfrom
ellery:fix_dmr_plugman_audio_callback
Jul 8, 2023
Merged

fixes conventionalDMR plugin support#828
robotastic merged 2 commits intoTrunkRecorder:masterfrom
ellery:fix_dmr_plugman_audio_callback

Conversation

@ellery
Copy link
Contributor

@ellery ellery commented Jun 20, 2023

This PR fixes plugin support for conventionalDMR. please see the following discord discussion for background.

This PR changes the following:

  • Adds the use_streaming variable to dmr_recorder_impl.cc following the pattern from analog_recorder.cc.
  • Adds a connect() between framer and the plugin sink
  • Changes the variables passed to plugman_audio_callback

Tests conducted and open questions:

  • I have built and tested this code on Ubuntu 22.04
  • I have confirmed the basic functions of simpleStreaming on a single channel conventionalDMR system.
  • I do not know how this will function with more then one talkgroup.
  • Do we need a plugin sink for each slot?, yes it appears so.

The following configuration was used for testing:

{
        "ver":2,
	"audioStreaming": true,
        "sources":[
                {
                        "center":155000000.0,
                        "rate":3600000,
                        "gain":50,
                        "digitalRecorders":2,
                        "driver":"osmosdr"
                }
        ],
        "systems":[
                {
                        "channels": [155070000],
                        "type": "conventionalDMR",
                        "squelch": -70,
                        "shortName":"trbo",
            		"callLog": true,
            		"audioArchive": true
                }
	],
	"plugins":[
	   {
          "name":"simplestream",
          "library":"libsimplestream.so",
          "streams":[
            {
              "TGID": 0,
              "address":"127.0.0.1",
              "port": 55123,
              "sendTGID":false,
              "shortName":"trbo"
             }
           ]
	  }
	],
        "frequencyFormat":"mhz",
        "logLevel":"debug",
        "logFile":true,
        "defaultMode": "digital"
}

Thanks to @robotastic for pointing me in the right direction.

@robotastic
Copy link
Collaborator

Nice work! This looks good. The Main branch is sort of jacked up right now.... once I get things stable, I will merge this in

@robotastic robotastic merged commit 997ff24 into TrunkRecorder:master Jul 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants