Changeset 34411 for gs3-extensions

Timestamp:

2020-09-17T17:59:53+12:00 (4 years ago)

Author:

davidb

Message:

Inclusion of HPCP calc

Location:

gs3-extensions/mars-src/trunk/perllib/plugins

Files:

• EssentiaPlugin.pm (modified) (1 diff)
• pEssentiaExtractor.pm (modified) (1 diff)

gs3-extensions/mars-src/trunk/perllib/plugins/EssentiaPlugin.pm

@@ -135 +135 @@
                  $mime_type, $top_section);
 
+    # HPCP
+    my $hpcp_features_filename = $self->compute_hpcp_features($filename_full_path);
+    my ($hpcp_features_ext) = ($hpcp_features_filename =~ m/\.([^.]+)$/);
+
+    my $hpcp_mime_type = ($hpcp_features_ext eq "json") ? "application/json" : "text/plain";
+    $doc_obj->associate_file($hpcp_features_filename, "hpcp.$features_ext", 
+                 $hpcp_mime_type, $top_section);
+
+
+
     }
 

gs3-extensions/mars-src/trunk/perllib/plugins/pEssentiaExtractor.pm

@@ -279 +279 @@
     return ($target_file_path);
 }
+
+
+sub compute_hpcp_features
+{
+    my $self = shift(@_);
+    my $source_file_path = shift(@_);
+    my $convert_options  = shift(@_) || "";
+
+    my $outhandle = $self->{'outhandle'};
+    my $verbosity = $self->{'verbosity'};
+
+    my $source_file_no_path = &File::Basename::basename($source_file_path);
+
+    # print STDERR "******* Essentia: source_file_path = $source_file_path\n\n\n";
+    
+    $self->init_cache_for_file($source_file_path);
+
+    # Determine the full name and path of the output file
+    my $target_file_path;
+    my $feature_values_file_path;
+    my $feature_descriptions_file_path;
+
+    my $target_file_type="json";
+
+    if ($self->{'enable_cache'}) {
+    my $cached_dir = $self->{'cached_dir'};
+    my $file_root = $self->{'cached_file_root'};
+
+    my $target_file = "$file_root-hpcp.$target_file_type";
+
+    $target_file_path = &util::filename_cat($cached_dir,$target_file);
+    }
+    else {
+    $target_file_path = &util::get_tmp_filename($target_file_type);
+    }
+
+    my $essentia_output_directory = $self->{'essentia_output_directory'};
+
+    my $hpcp_cmd = "essentia-hpcp.py $convert_options \"$source_file_path\" \"$target_file_path\"";
+        
+    # Test the execution path
+    print("EXECUTION CMD: $hpcp_cmd\n");
+    
+    my $print_info = { 'message_prefix' => "HPCP",
+               'message' => "Extracting HPCP audio features from $source_file_no_path" };
+    
+    my ($regenerated,$result,$had_error) 
+        = $self->autorun_general_cmd($hpcp_cmd,$source_file_path,$target_file_path,$print_info);
+    
+
+    return ($target_file_path);
+}