comparison src/descriptors.c @ 104:a32738e9d955

- Fixes to descriptors.c where no break statement was given for certain cases is switch conditionals
- Added LPC and LPCC extraction functions. LPC implements Durbin method as described in Rabiner and Juang and implemented in Dr. Dobbs 1994 edition by Jutta Degener

 	    case XTRACT_SPECTRAL_STANDARD_DEVIATION:
 	    case XTRACT_SPECTRAL_AVERAGE_DEVIATION:
 	    case XTRACT_LOWEST_VALUE:
 	    case XTRACT_TONALITY:
 	    case XTRACT_MFCC:
+	    case XTRACT_LPC:
+	    case XTRACT_LPCC:
 		*argv_min = XTRACT_ANY;
 		*argv_max = XTRACT_ANY;
 		*argv_def = XTRACT_ANY;
 		*argv_unit = XTRACT_ANY;
+                break;
 	    case XTRACT_SPECTRAL_INHARMONICITY:
 		*argv_min = 0.f;
 		*argv_max = XTRACT_SR_UPPER_LIMIT / 2;
 		*argv_def = XTRACT_FUNDAMENTAL_DEFAULT;
 		*argv_unit = XTRACT_HERTZ;
+                break;
 	    case XTRACT_F0:
 	    case XTRACT_FAILSAFE_F0:
 		*argv_min = XTRACT_SR_LOWER_LIMIT;
 		*argv_max = XTRACT_SR_UPPER_LIMIT;
 		*argv_def = XTRACT_SR_DEFAULT; 
 		*argv_unit = XTRACT_HERTZ;
+                break;
 	    /* argc = 2 */;
 	    case XTRACT_ROLLOFF:
 		*argv_min  = XTRACT_FFT_BANDS_MIN;
 		*argv_max = XTRACT_FFT_BANDS_MAX;
 		*argv_def = XTRACT_SPEC_BW_DEF ;
 		*argv_unit = XTRACT_HERTZ;
 		*(argv_min + 1) = 0.f;
 		*(argv_max + 1) = 100.f;
 		*(argv_def + 1) = 95.f;
 		*(argv_unit + 1) = XTRACT_PERCENT;
+                break;
 	    case XTRACT_SPECTRUM:
 		*argv_min  = XTRACT_SR_LOWER_LIMIT / 2; 
 		*argv_max = XTRACT_SR_UPPER_LIMIT / 2;
 		*argv_def = XTRACT_SR_DEFAULT / 2;
 		*argv_unit = XTRACT_HERTZ;
 		*(argv_min + 1) = 0;
 		*(argv_max + 1) = 3 ;
 		*(argv_def + 1) = 0;
 		*(argv_unit + 1) = XTRACT_NONE;
+                break;
 	    case XTRACT_PEAK_SPECTRUM:
 		*argv_min  = XTRACT_SR_LOWER_LIMIT / 2; 
 		*argv_max = XTRACT_SR_UPPER_LIMIT / 2;
 		*argv_def = XTRACT_SR_DEFAULT / 2;
 		*argv_unit = XTRACT_HERTZ;
 		*(argv_min + 1) = 0.f;
 		*(argv_max + 1) = 100.f ;
 		*(argv_def + 1) = 10.f ;
 		*(argv_unit + 1) = XTRACT_PERCENT;
+                break;
 	    case XTRACT_HARMONIC_SPECTRUM:
 		*argv_min = 0.f;
 		*argv_max = XTRACT_SR_UPPER_LIMIT / 2;
 		*argv_def = XTRACT_FUNDAMENTAL_DEFAULT;
 		*argv_unit = XTRACT_HERTZ;
 		*(argv_min + 1) = 0.f;
 		*(argv_max + 1) = 1.f ;
 		*(argv_def + 1) = .1f ;
 		*(argv_unit + 1) = XTRACT_NONE;
+                break;
 	    case XTRACT_NOISINESS:
 	    case XTRACT_SKEWNESS:
 	    case XTRACT_KURTOSIS:
 	    case XTRACT_SPECTRAL_SKEWNESS:
 	    case XTRACT_SPECTRAL_KURTOSIS:

 		*argv_unit = XTRACT_NONE;
 		*(argv_min + 1) = XTRACT_NONE;
 		*(argv_max + 1) = XTRACT_NONE;
 		*(argv_def + 1) = XTRACT_NONE;
 		*(argv_unit + 1) = XTRACT_NONE;
+                break;
 	    case XTRACT_BARK_COEFFICIENTS:
 	    /* BARK_COEFFICIENTS is special because argc = BARK_BANDS */
 	    default:
 		*argv_min = XTRACT_NONE;
 		*argv_max = XTRACT_NONE;
 		*argv_def = XTRACT_NONE;
 		*argv_unit = XTRACT_NONE;
+                break;
 	}
 
 	argv_donor = &d->argv.donor[0];
 
 	switch (f) {

 	    case XTRACT_HPS:
 	    case XTRACT_PEAK_SPECTRUM:
 	    case XTRACT_MFCC:
 		*data_format = XTRACT_SPECTRAL_MAGNITUDES;
 		break;
+            case XTRACT_LPC:
+                *data_format = XTRACT_AUTOCORRELATION_COEFFS;
+                break;
+            case XTRACT_LPCC:
+                *data_format = XTRACT_LPC_COEFFS;
+                break;
 	    case XTRACT_SPECTRAL_INHARMONICITY:
 	    case XTRACT_HARMONIC_SPECTRUM:
 		*data_format = XTRACT_SPECTRAL_PEAKS;
 		break;
 	    case XTRACT_NONZERO_COUNT:

 	    case XTRACT_HPS:
 	    case XTRACT_SPECTRUM:
 	    case XTRACT_TONALITY:
 	    case XTRACT_LOUDNESS:
 	    case XTRACT_NONZERO_COUNT:
+            case XTRACT_LPC:
+            case XTRACT_LPCC:
 		*data_unit = XTRACT_ANY;
 		break;
 	    case XTRACT_SPECTRAL_MEAN:
 	    case XTRACT_SPECTRAL_VARIANCE:
 	    case XTRACT_SPECTRAL_STANDARD_DEVIATION:

 		strcpy(name, "mfcc");
 		strcpy(p_name, "Mel-Frequency Cepstral Coefficients");
 		strcpy(desc, "Extract MFCC from a spectrum");
 		strcpy(p_desc, "Extract MFCC from an audio spectrum");
 		strcpy(author, "Rabiner");
+                break;
+            case XTRACT_LPC:
+		strcpy(name, "lpc");
+		strcpy(p_name, "Linear predictive coding coefficients");
+		strcpy(desc, "Extract LPC from autocorrelation coefficients");
+		strcpy(p_desc, 
+                        "Extract LPC from autocorrelation coefficients");
+		strcpy(author, 
+                        "Rabiner and Juang as implemented by Jutta Degener");
+                *year = 1994;
+                break;
+            case XTRACT_LPCC:
+		strcpy(name, "lpcc");
+		strcpy(p_name, "Linear predictive coding cepstral coefficients");
+		strcpy(desc, "Extract LPC cepstrum from LPC coefficients");
+		strcpy(p_desc, 
+                        "Extract LPC cepstrum from LPC coefficients");
+		strcpy(author, "Rabiner and Juang");
+                *year = 1993;
 		break;
 	    case XTRACT_BARK_COEFFICIENTS:
 		strcpy(name, "bark_coefficients");
 		strcpy(p_name, "Bark Coefficients");
 		strcpy(desc, "Extract bark coefficients from a spectrum");

 		break;
 	    case XTRACT_MFCC:
 		*argc = 1;
 		*argv_type = XTRACT_MEL_FILTER;
 		break;
+            case XTRACT_LPCC:
+                *argc = 1;
+                *argv_type = XTRACT_INT;
+                break;
 	    case XTRACT_BARK_COEFFICIENTS:
 		*argc = XTRACT_BARK_BANDS;
 		*argv_type = XTRACT_INT;
 		break;
 	    case XTRACT_MEAN:

 	    case XTRACT_AUTOCORRELATION:
 	    case XTRACT_AMDF:
 	    case XTRACT_ASDF:
 	    case XTRACT_NONZERO_COUNT:
 	    case XTRACT_ODD_EVEN_RATIO:
+            case XTRACT_LPC:
 	    default:
 		*argc = 0;
 		break;
 	}
     

 	    case XTRACT_BARK_COEFFICIENTS:
 	    case XTRACT_PEAK_SPECTRUM:
 	    case XTRACT_SPECTRUM:
 	    case XTRACT_AUTOCORRELATION_FFT:
 	    case XTRACT_MFCC:
+	    case XTRACT_LPC:
+	    case XTRACT_LPCC:
 	    case XTRACT_DCT:
 	    case XTRACT_HARMONIC_SPECTRUM:
 		*is_scalar = XTRACT_FALSE;
 		break;
 	    default:

 		case XTRACT_HPS:
 		case XTRACT_ROLLOFF:
 		    *result_unit = XTRACT_HERTZ;
 		    *result_min = 0.f;
 		    *result_max = XTRACT_SR_UPPER_LIMIT / 2;
+                    break;
 		case XTRACT_ZCR:
 		    *result_unit = XTRACT_HERTZ;
 		    *result_min = 0.f;
 		    *result_max = XTRACT_ANY;
+                    break;
 		case XTRACT_ODD_EVEN_RATIO:
 		    *result_unit = XTRACT_NONE;
 		    *result_min = 0.f;
 		    *result_max = 1.f; 
+                    break;
 		case XTRACT_LOUDNESS:
 		case XTRACT_FLATNESS:
 		case XTRACT_TONALITY:
 		case XTRACT_CREST:
 		case XTRACT_SPECTRAL_INHARMONICITY:
 		case XTRACT_POWER:
 		case XTRACT_SHARPNESS:
 		case XTRACT_SPECTRAL_SLOPE:
+                case XTRACT_LPC:
+                case XTRACT_LPCC:
 		default:
 		    *result_unit = XTRACT_UNKNOWN;
 		    *result_min = XTRACT_UNKNOWN;
 		    *result_max = XTRACT_UNKNOWN; 
+                    break;
 	    }
 	}
 	else {
 
 	    result_min = NULL;

 		case XTRACT_AMDF:
 		case XTRACT_ASDF:
 		case XTRACT_DCT:
 		    *result_format = XTRACT_ARBITRARY_SERIES;
 		    *result_unit = XTRACT_ANY;
+                    break;
 		case XTRACT_BARK_COEFFICIENTS:
 		    *result_format = XTRACT_BARK_COEFFS;
 		    *result_unit = XTRACT_UNKNOWN; /* FIX: check */
+                    break;
 		case XTRACT_PEAK_SPECTRUM:
 		case XTRACT_SPECTRUM:
 		case XTRACT_HARMONIC_SPECTRUM:
 		    *result_format = XTRACT_SPECTRAL;
 		    *result_unit = XTRACT_ANY_AMPLITUDE_HERTZ;
+                    break;
 		case XTRACT_AUTOCORRELATION_FFT:
+                    break;
 		case XTRACT_MFCC:
 		    *result_format = XTRACT_MEL_COEFFS;
 		    *result_unit = XTRACT_UNKNOWN; /* FIX: check */
+                    break;
+                case XTRACT_LPC:
+                    *result_format = XTRACT_LPC_COEFFS;
+                    *result_unit = XTRACT_UNKNOWN;
+                    break;
+                case XTRACT_LPCC:
+                    *result_format = XTRACT_LPCC_COEFFS;
+                    *result_unit = XTRACT_UNKNOWN;
+                    break;
 		default:
 		    break;
 	    }
 	}
     }