Changeset 33105 for gs2-extensions/music-ir-src

Timestamp:

2019-05-24T00:16:49+12:00 (5 years ago)

Author:

davidb

Message:

Some initial work in support Essentia computed audio features using Python bindings

Location:

gs2-extensions/music-ir-src/trunk

Files:

• bin/script/pessentia (added)
• perllib/plugins/MusicIRPlugin.pm (modified) (9 diffs)
• perllib/plugins/pEssentiaExtractor.pm (added)

gs2-extensions/music-ir-src/trunk/perllib/plugins/MusicIRPlugin.pm

@@ -27 +27 @@
 package MusicIRPlugin;
 
-use BasePlugin;
+use BaseImporter;
 use jAudioExtractor;
 use jSongMinerExtractor;
+use pEssentiaExtractor;
 
 use strict;
@@ -38 +39 @@
 
 sub BEGIN {
-    @MusicIRPlugin::ISA = ('BasePlugin', 'jAudioExtractor', 'jSongMinerExtractor');
+    @MusicIRPlugin::ISA = ('BaseImporter', 'jAudioExtractor', 'jSongMinerExtractor', 'pEssentiaExtractor');
 }
 
@@ -44 +45 @@
     [ 
       { 'name' => "compute_mir_features",
-    'desc' => "{BasePlugin.compute_mir_features}",
+    'desc' => "{BaseImporter.compute_mir_features}",
+    'type' => "enum",
+    'list' => [{'name' => "true",  'desc' => "{common.true}"},
+           {'name' => "false", 'desc' => "{common.false}"}],
+    'deft' => "false",
+    'reqd' => "no" },
+      { 'name' => "compute_essentia_features",
+    'desc' => "{BaseImporter.compute_essentia_features}",
     'type' => "enum",
     'list' => [{'name' => "true",  'desc' => "{common.true}"},
@@ -51 +59 @@
     'reqd' => "no" },
       { 'name' => "retrieve_mir_metadata",
-    'desc' => "{BasePlugin.retrieve_mir_metadata}",
+    'desc' => "{BaseImporter.retrieve_mir_metadata}",
     'type' => "enum",
     'list' => [{'name' => "true",  'desc' => "{common.true}"},
@@ -58 +66 @@
     'reqd' => "no" },
       { 'name' => "process_exp",
-    'desc' => "{BasePlugin.process_exp}",
+    'desc' => "{BaseImporter.process_exp}",
     'type' => "regexp",
     'deft' => &get_default_process_exp(),
@@ -83 +91 @@
     my $jae_self = new jAudioExtractor($pluginlist, $inputargs, $hashArgOptLists,1);
     my $jsme_self = new jSongMinerExtractor($pluginlist, $inputargs, $hashArgOptLists,1);
-    my $base_self = new BasePlugin($pluginlist, $inputargs, $hashArgOptLists);
-
-    my $self = BasePlugin::merge_inheritance($jae_self,$jsme_self,$base_self);
+    my $pee_self = new pEssentiaExtractor($pluginlist, $inputargs, $hashArgOptLists,1);
+
+    my $base_self = new BaseImporter($pluginlist, $inputargs, $hashArgOptLists);
+
+    my $self = BaseImporter::merge_inheritance($jae_self,$jsme_self,$base_self);
 
     return bless $self, $class;
@@ -93 +103 @@
     my $self = shift (@_);
     
-    return q^(?i)(\.mp3|\.wave?|\.aif[fc]?|\.au|\.snd|\.og[ga])$^; 
+    return q^(?i)(\.mp3|\.wave?|\.aif[fc]?|\.au|\.snd|\.og[ga]|\.m4a)$^; 
 }
 
@@ -103 +113 @@
     $self->jAudioExtractor::begin(@_);
     $self->jSongMinerExtractor::begin(@_);
+    $self->pEssentiaExtractor::begin(@_);
 }
 
@@ -132 +143 @@
     }
 
+    if ($self->{'compute_essentia_features'} eq "true")
+    {
+    my $utf8_filename_no_path = $self->filepath_to_utf8($filename_no_path);
+    my $url_encoded_filename = &util::rename_file($utf8_filename_no_path, $self->{'file_rename_method'});
+    
+    my $features_filename = $self->compute_essentia_features($filename_full_path);
+    my ($features_ext) = ($features_filename =~ m/\.([^.]+)$/);
+
+    
+    my $mime_type = ($features_ext eq "json") ? "application/json" : "text/plain";
+    $doc_obj->associate_file($features_filename, "pessentia.$features_ext", 
+                 $mime_type, $top_section);
+
+    }
+
 }