ua1zbe
/
dsd-fme
mirror of https://github.com/lwvmobile/dsd-fme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from balr0g/dmr-ambe+2-rename 

Fixes for ambe3600x2250 -> ambe3600x2450 rename
This commit is contained in:
Jared Szechy 2013-12-15 13:55:19 -08:00
parent 260ec82ea1 f978a8759e
commit 5fb79e9baa
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dsd.h
View File

@ -208,9 +208,9 @@ void openAudioInDevice (dsd_opts * opts);
int getDibit (dsd_opts * opts, dsd_state * state);
void skipDibit (dsd_opts * opts, dsd_state * state, int count);
void saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d);
void saveAmbe2250Data (dsd_opts * opts, dsd_state * state, char *ambe_d);
void saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d);
int readImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d);
int readAmbe2250Data (dsd_opts * opts, dsd_state * state, char *ambe_d);
int readAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d);
void openMbeInFile (dsd_opts * opts, dsd_state * state);
void closeMbeOutFile (dsd_opts * opts, dsd_state * state);
void openMbeOutFile (dsd_opts * opts, dsd_state * state);

4
dsd_file.c
View File

@ -43,7 +43,7 @@ saveImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
}
void
saveAmbe2250Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
saveAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
{
int i, j, k;
unsigned char b;
@ -99,7 +99,7 @@ readImbe4400Data (dsd_opts * opts, dsd_state * state, char *imbe_d)
}
int
readAmbe2250Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
readAmbe2450Data (dsd_opts * opts, dsd_state * state, char *ambe_d)
{
int i, j, k;

8
dsd_mbe.c
View File

@ -50,8 +50,8 @@ playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv)
}
else if (state->mbe_file_type == 1)
{
readAmbe2250Data (opts, state, ambe_d);
mbe_processAmbe2250Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
readAmbe2450Data (opts, state, ambe_d);
mbe_processAmbe2450Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
processAudio (opts, state);
if (opts->wav_out_fd != -1)
{
@ -101,10 +101,10 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
}
else
{
mbe_processAmbe3600x2250Framef (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, ambe_fr, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
mbe_processAmbe3600x2450Framef (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, ambe_fr, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality);
if (opts->mbe_out_f != NULL)
{
saveAmbe2250Data (opts, state, ambe_d);
saveAmbe2450Data (opts, state, ambe_d);
}
}

2
dstar.c
View File

@ -17,7 +17,7 @@
/*
* Note: D-STAR support is very incomplete and does not work yet
* It is unknown if the ambe3600x2250 decoder is even compatible with D-STAR
* It is unknown if the ambe3600x2450 decoder is even compatible with D-STAR
* voice frames. If it is then the interleave pattern needs to be determined.
* GMSK modulation optimizations will also required to get a usable bit error
* rate. This was included mainly as an example of how other systmes might