comparison src/descriptors.c @ 205:f6fcf3bec020

Add xtract_midicent() convenience function to convert from frequency to MIDI cent

             *argv_unit = XTRACT_HERTZ;
             break;
         case XTRACT_F0:
         case XTRACT_FAILSAFE_F0:
         case XTRACT_WAVELET_F0:
+        case XTRACT_MIDICENT:
             *argv_min = XTRACT_SR_LOWER_LIMIT;
             *argv_max = XTRACT_SR_UPPER_LIMIT;
             *argv_def = XTRACT_SR_DEFAULT;
             *argv_unit = XTRACT_HERTZ;
             break;

             break;
         case XTRACT_LOWEST_VALUE:
         case XTRACT_F0:
         case XTRACT_FAILSAFE_F0:
         case XTRACT_WAVELET_F0:
+        case XTRACT_MIDICENT:
             *argv_donor = XTRACT_ANY;
             break;
         case XTRACT_MFCC:
             *argv_donor = XTRACT_INIT_MFCC;
             break;

         case XTRACT_DIFFERENCE_VECTOR:
             *data_format = XTRACT_SUBFRAMES;
             break;
         case XTRACT_ATTACK_TIME:
         case XTRACT_DECAY_TIME:
+        case XTRACT_MIDICENT:
         default:
             *data_format = XTRACT_NO_DATA;
             break;
         }
 

             strcpy(desc, "Extract the fundamental frequency of a signal (wavelet method)");
             strcpy(p_desc,
                    "Extract the fundamental frequency of an audio signal (wavelet method)");
             strcpy(author, "Antoine Schmitt");
             break;
+        case XTRACT_MIDICENT:
+                strcpy(name, "midicent");
+                strcpy(p_name, "Frequency to MIDI Cent conversion");
+                strcpy(desc, "Convert frequency in Hertz to Pitch in MIDI cents");
+                strcpy(p_desc, "Convert frequency in Hertz to Pitch in MIDI cents");
+                strcpy(author, "Jamie Bullock");
+                break;
         case XTRACT_TONALITY:
             strcpy(name, "tonality");
             strcpy(p_name, "Tonality");
             strcpy(desc, "Extract the tonality of a spectrum");
             strcpy(p_desc, "Extract the tonality an audio spectrum");

         case XTRACT_SPECTRAL_INHARMONICITY:
         case XTRACT_LOWEST_VALUE:
         case XTRACT_F0:
         case XTRACT_FAILSAFE_F0:
         case XTRACT_WAVELET_F0:
+        case XTRACT_MIDICENT:
         case XTRACT_FLATNESS_DB:
         case XTRACT_TONALITY:
             *argc = 1;
             *argv_type = XTRACT_FLOAT;
             break;

         case XTRACT_SUM:
         case XTRACT_HPS:
         case XTRACT_F0:
         case XTRACT_FAILSAFE_F0:
         case XTRACT_WAVELET_F0:
+        case XTRACT_MIDICENT:
         case XTRACT_FLUX:
         case XTRACT_LNORM:
         case XTRACT_NONZERO_COUNT:
             *is_scalar = XTRACT_TRUE;
             break;

         case XTRACT_SUM:
         case XTRACT_HPS:
         case XTRACT_F0:
         case XTRACT_FAILSAFE_F0:
         case XTRACT_WAVELET_F0:
+        case XTRACT_MIDICENT:
         case XTRACT_NONZERO_COUNT:
         case XTRACT_AUTOCORRELATION:
         case XTRACT_AMDF:
         case XTRACT_ASDF:
         case XTRACT_BARK_COEFFICIENTS:

             case XTRACT_ROLLOFF:
                 *result_unit = XTRACT_HERTZ;
                 *result_min = 0.0;
                 *result_max = XTRACT_SR_UPPER_LIMIT / 2.0;
                 break;
+            case XTRACT_MIDICENT:
+                *result_unit = XTRACT_MIDI_CENT;
+                *result_min = 0.0;
+                *result_max = 12700;
             case XTRACT_ZCR:
                 *result_unit = XTRACT_HERTZ;
                 *result_min = 0.0;
                 *result_max = XTRACT_ANY;
                 break;