# HG changeset patch
# User Chris Cannam
# Date 1456424367 0
# Node ID 9a10c3ffff47a28c2ff7e7ed35c91011bb68b1d4
# Parent  e2519bd033e70efee833a937f0f2ccaa7bcbfc9b
Update summary code and tests -- fix multiple outputs when requesting both summary and non-summary for the same output; and values have been changed because of the coded file cache bit depth change. Also skip network-dependent tests if there is no network.

diff -r e2519bd033e7 -r 9a10c3ffff47 runner/FeatureExtractionManager.cpp
--- a/runner/FeatureExtractionManager.cpp	Thu Feb 25 13:02:57 2016 +0000
+++ b/runner/FeatureExtractionManager.cpp	Thu Feb 25 18:19:27 2016 +0000
@@ -323,6 +323,8 @@
                  << " (adapter step and block size " << m_blockSize << ")"
                  << endl;
 
+//            cerr << "NOTE: That transform is: " << transform.toXmlString() << endl;
+            
             if (pida) {
                 cerr << "NOTE: PluginInputDomainAdapter timestamp adjustment is "
 
@@ -382,8 +384,11 @@
 
         m_transformPluginMap[transform] = plugin;
 
+//        cerr << "NOTE: Assigned plugin " << plugin << " for transform: " << transform.toXmlString() << endl;
+
         if (!(originalTransform == transform)) {
             m_transformPluginMap[originalTransform] = plugin;
+//            cerr << "NOTE: Also assigned plugin " << plugin << " for original transform: " << originalTransform.toXmlString() << endl;
         }
 
     } else {
@@ -742,7 +747,7 @@
 
         PluginMap::iterator pi = m_plugins.find(plugin);
 
-        std::cerr << "Calling reset on " << plugin << std::endl;
+//        std::cerr << "Calling reset on " << plugin << std::endl;
         plugin->reset();
 
         for (TransformWriterMap::iterator ti = pi->second.begin();
@@ -923,6 +928,7 @@
         }
 
         if (!m_summaries.empty()) {
+            // Summaries requested on the command line, for all transforms
             PluginSummarisingAdapter *adapter =
                 dynamic_cast<PluginSummarisingAdapter *>(plugin);
             if (!adapter) {
@@ -939,12 +945,13 @@
                     featureSet = adapter->getSummaryForAllOutputs
                         (getSummaryType(*sni),
                          PluginSummarisingAdapter::ContinuousTimeAverage);
-                    writeFeatures(audioSource, plugin, featureSet,//!!! *sni);
+                    writeFeatures(audioSource, plugin, featureSet,
                                   Transform::stringToSummaryType(sni->c_str()));
                 }
             }
         }
 
+        // Summaries specified in transform definitions themselves
         writeSummaries(audioSource, plugin);
     }
 
@@ -966,11 +973,15 @@
         
         const Transform &transform = ti->first;
 
+//        cerr << "FeatureExtractionManager::writeSummaries: plugin is " << plugin
+//             << ", found transform: " << transform.toXmlString() << endl;
+        
         Transform::SummaryType summaryType = transform.getSummaryType();
         PluginSummarisingAdapter::SummaryType pType =
             (PluginSummarisingAdapter::SummaryType)summaryType;
 
         if (transform.getSummaryType() == Transform::NoSummary) {
+//            cerr << "(no summary, continuing)" << endl;
             continue;
         }
 
@@ -984,7 +995,7 @@
         Plugin::FeatureSet featureSet = adapter->getSummaryForAllOutputs
             (pType, PluginSummarisingAdapter::ContinuousTimeAverage);
 
-//        cout << "summary type " << int(pType) << " for transform:" << endl << transform.toXmlString().toStdString()<< endl << "... feature set with " << featureSet.size() << " elts" << endl;
+//        cerr << "summary type " << int(pType) << " for transform:" << endl << transform.toXmlString().toStdString()<< endl << "... feature set with " << featureSet.size() << " elts" << endl;
 
         writeFeatures(audioSource, plugin, featureSet, summaryType);
     }
@@ -998,21 +1009,25 @@
     // caller should have ensured plugin is in m_plugins
     PluginMap::iterator pi = m_plugins.find(plugin);
 
+    // Write features from the feature set passed in, according to the
+    // transforms listed for the given plugin with the given summary type
+    
     for (TransformWriterMap::const_iterator ti = pi->second.begin();
          ti != pi->second.end(); ++ti) {
         
         const Transform &transform = ti->first;
         const vector<FeatureWriter *> &writers = ti->second;
-        
-        if (transform.getSummaryType() != Transform::NoSummary &&
-            m_summaries.empty() &&
-            summaryType == Transform::NoSummary) {
-            continue;
-        }
 
-        if (transform.getSummaryType() != Transform::NoSummary &&
-            summaryType != Transform::NoSummary &&
-            transform.getSummaryType() != summaryType) {
+//        cerr << "writeFeatures: plugin " << plugin << " has transform: " << transform.toXmlString() << endl;
+
+        if (transform.getSummaryType() == Transform::NoSummary &&
+            !m_summaries.empty()) {
+//            cerr << "transform has no summary, but summaries requested on command line, so going for it anyway" << endl;
+        } else if (transform.getSummaryType() != summaryType) {
+            // Either we're not writing a summary and the transform
+            // has one, or we're writing a summary but the transform
+            // has none or a different one; either way, skip it
+//            cerr << "summary type differs from passed-in one " << summaryType << endl;
             continue;
         }
 
@@ -1030,6 +1045,8 @@
         Plugin::FeatureSet::const_iterator fsi = features.find(outputIndex);
         if (fsi == features.end()) continue;
 
+//        cerr << "this transform has " << writers.size() << " writer(s)" << endl;
+        
         for (int j = 0; j < (int)writers.size(); ++j) {
             writers[j]->write
                 (audioSource, transform, desc, fsi->second,
diff -r e2519bd033e7 -r 9a10c3ffff47 runner/FeatureExtractionManager.h
--- a/runner/FeatureExtractionManager.h	Thu Feb 25 13:02:57 2016 +0000
+++ b/runner/FeatureExtractionManager.h	Thu Feb 25 18:19:27 2016 +0000
@@ -114,8 +114,8 @@
     OutputIndexMap m_pluginOutputIndices;
 
     typedef set<std::string> SummaryNameSet;
-    SummaryNameSet m_summaries;
-    bool m_summariesOnly;
+    SummaryNameSet m_summaries; // requested on command line for all transforms
+    bool m_summariesOnly; // command line flag
     Vamp::HostExt::PluginSummarisingAdapter::SegmentBoundaries m_boundaries;
 
     AudioFileReader *prepareReader(QString audioSource);
diff -r e2519bd033e7 -r 9a10c3ffff47 runner/main.cpp
--- a/runner/main.cpp	Thu Feb 25 13:02:57 2016 +0000
+++ b/runner/main.cpp	Thu Feb 25 18:19:27 2016 +0000
@@ -857,8 +857,7 @@
     if (!requestedSummaryTypes.empty()) {
         if (!manager.setSummaryTypes(requestedSummaryTypes,
                                      boundaries)) {
-            cerr << myname
-                 << ": failed to set requested summary types" << endl;
+            cerr << myname << ": failed to set requested summary types" << endl;
             exit(1);
         }
     }
diff -r e2519bd033e7 -r 9a10c3ffff47 tests/test-multiple-audio/expected/all-files.csv
--- a/tests/test-multiple-audio/expected/all-files.csv	Thu Feb 25 13:02:57 2016 +0000
+++ b/tests/test-multiple-audio/expected/all-files.csv	Thu Feb 25 18:19:27 2016 +0000
@@ -1,36 +1,36 @@
 "./../audio/20sec-silence.wav",0.000000000,20.015600906,mean,61.1636,"(mean value, continuous-time average)"
 ,0.000000000,20.015600906,median,0,"(median value, continuous-time average)"
 ,0.000000000,20.015600906,mode,0,"(modal value, continuous-time average)"
-,0.000000000,20.015600906,mean,893.139,"(mean value, continuous-time average)"
-"./../audio/3clicks.mp3",0.000000000,5.061950112,mean,169.206,"(mean value, continuous-time average)"
-,0.000000000,5.061950112,median,170,"(median value, continuous-time average)"
-,0.000000000,5.061950112,mode,162,"(modal value, continuous-time average)"
-,0.000000000,5.061950112,mean,699.101,"(mean value, continuous-time average)"
-"./../audio/3clicks.ogg",0.000000000,4.992290248,mean,169.505,"(mean value, continuous-time average)"
-,0.000000000,4.992290248,median,170,"(median value, continuous-time average)"
-,0.000000000,4.992290248,mode,174,"(modal value, continuous-time average)"
-,0.000000000,4.992290248,mean,724.777,"(mean value, continuous-time average)"
+,0.000000000,20.015600906,mean,1406.56,"(mean value, continuous-time average)"
+"./../audio/3clicks.mp3",0.000000000,5.061950112,mean,174.507,"(mean value, continuous-time average)"
+,0.000000000,5.061950112,median,173,"(median value, continuous-time average)"
+,0.000000000,5.061950112,mode,173,"(modal value, continuous-time average)"
+,0.000000000,5.061950112,mean,1510.95,"(mean value, continuous-time average)"
+"./../audio/3clicks.ogg",0.000000000,4.992290248,mean,169.481,"(mean value, continuous-time average)"
+,0.000000000,4.992290248,median,156,"(median value, continuous-time average)"
+,0.000000000,4.992290248,mode,132,"(modal value, continuous-time average)"
+,0.000000000,4.992290248,mean,1480.59,"(mean value, continuous-time average)"
 "./../audio/3clicks8.wav",0.000000000,4.992290248,mean,169.391,"(mean value, continuous-time average)"
 ,0.000000000,4.992290248,median,169,"(median value, continuous-time average)"
 ,0.000000000,4.992290248,mode,164,"(modal value, continuous-time average)"
-,0.000000000,4.992290248,mean,703.191,"(mean value, continuous-time average)"
+,0.000000000,4.992290248,mean,1403.77,"(mean value, continuous-time average)"
 "./../audio/3clicks8quiet.wav",0.000000000,4.992290248,mean,169.058,"(mean value, continuous-time average)"
 ,0.000000000,4.992290248,median,169,"(median value, continuous-time average)"
 ,0.000000000,4.992290248,mode,165,"(modal value, continuous-time average)"
-,0.000000000,4.992290248,mean,673.623,"(mean value, continuous-time average)"
-"./../audio/6clicks.ogg",0.000000000,9.961360543,mean,167.58,"(mean value, continuous-time average)"
-,0.000000000,9.961360543,median,167,"(median value, continuous-time average)"
-,0.000000000,9.961360543,mode,170,"(modal value, continuous-time average)"
-,0.000000000,9.961360543,mean,714.928,"(mean value, continuous-time average)"
+,0.000000000,4.992290248,mean,1342.8,"(mean value, continuous-time average)"
+"./../audio/6clicks.ogg",0.000000000,9.961360543,mean,168.686,"(mean value, continuous-time average)"
+,0.000000000,9.961360543,median,158,"(median value, continuous-time average)"
+,0.000000000,9.961360543,mode,138,"(modal value, continuous-time average)"
+,0.000000000,9.961360543,mean,1423.64,"(mean value, continuous-time average)"
 "./../audio/6clicks8.wav",0.000000000,9.961360543,mean,170.174,"(mean value, continuous-time average)"
 ,0.000000000,9.961360543,median,169,"(median value, continuous-time average)"
 ,0.000000000,9.961360543,mode,164,"(modal value, continuous-time average)"
-,0.000000000,9.961360543,mean,698.921,"(mean value, continuous-time average)"
-"./../audio/id3v2-iso-8859-1.mp3",0.000000000,5.015510203,mean,170.655,"(mean value, continuous-time average)"
-,0.000000000,5.015510203,median,171,"(median value, continuous-time average)"
-,0.000000000,5.015510203,mode,171,"(modal value, continuous-time average)"
-,0.000000000,5.015510203,mean,690.028,"(mean value, continuous-time average)"
-"./../audio/id3v2-ucs-2.mp3",0.000000000,5.061950112,mean,169.206,"(mean value, continuous-time average)"
-,0.000000000,5.061950112,median,170,"(median value, continuous-time average)"
-,0.000000000,5.061950112,mode,162,"(modal value, continuous-time average)"
-,0.000000000,5.061950112,mean,699.101,"(mean value, continuous-time average)"
+,0.000000000,9.961360543,mean,1411.85,"(mean value, continuous-time average)"
+"./../audio/id3v2-iso-8859-1.mp3",0.000000000,5.015510203,mean,176.083,"(mean value, continuous-time average)"
+,0.000000000,5.015510203,median,172,"(median value, continuous-time average)"
+,0.000000000,5.015510203,mode,164,"(modal value, continuous-time average)"
+,0.000000000,5.015510203,mean,1492.7,"(mean value, continuous-time average)"
+"./../audio/id3v2-ucs-2.mp3",0.000000000,5.061950112,mean,174.507,"(mean value, continuous-time average)"
+,0.000000000,5.061950112,median,173,"(median value, continuous-time average)"
+,0.000000000,5.061950112,mode,173,"(modal value, continuous-time average)"
+,0.000000000,5.061950112,mean,1510.95,"(mean value, continuous-time average)"
diff -r e2519bd033e7 -r 9a10c3ffff47 tests/test-multiple-audio/expected/multiplexed.csv
--- a/tests/test-multiple-audio/expected/multiplexed.csv	Thu Feb 25 13:02:57 2016 +0000
+++ b/tests/test-multiple-audio/expected/multiplexed.csv	Thu Feb 25 18:19:27 2016 +0000
@@ -1,4 +1,4 @@
-"3clicks.mp3",0.000000000,9.961360543,mean,168.319,"(mean value, continuous-time average)"
-,0.000000000,9.961360543,median,167,"(median value, continuous-time average)"
-,0.000000000,9.961360543,mode,170,"(modal value, continuous-time average)"
-,0.000000000,9.961360543,mean,710.597,"(mean value, continuous-time average)"
+"3clicks.mp3",0.000000000,9.961360543,mean,168.908,"(mean value, continuous-time average)"
+,0.000000000,9.961360543,median,162,"(median value, continuous-time average)"
+,0.000000000,9.961360543,mode,144,"(modal value, continuous-time average)"
+,0.000000000,9.961360543,mean,1418.17,"(mean value, continuous-time average)"
diff -r e2519bd033e7 -r 9a10c3ffff47 tests/test-multiple-audio/expected/playlist.csv
--- a/tests/test-multiple-audio/expected/playlist.csv	Thu Feb 25 13:02:57 2016 +0000
+++ b/tests/test-multiple-audio/expected/playlist.csv	Thu Feb 25 18:19:27 2016 +0000
@@ -1,8 +1,8 @@
-"3clicks.mp3",0.000000000,5.061950112,mean,169.206,"(mean value, continuous-time average)"
-,0.000000000,5.061950112,median,170,"(median value, continuous-time average)"
-,0.000000000,5.061950112,mode,162,"(modal value, continuous-time average)"
-,0.000000000,5.061950112,mean,699.101,"(mean value, continuous-time average)"
-"6clicks.ogg",0.000000000,9.961360543,mean,167.58,"(mean value, continuous-time average)"
-,0.000000000,9.961360543,median,167,"(median value, continuous-time average)"
-,0.000000000,9.961360543,mode,170,"(modal value, continuous-time average)"
-,0.000000000,9.961360543,mean,714.928,"(mean value, continuous-time average)"
+"3clicks.mp3",0.000000000,5.061950112,mean,174.507,"(mean value, continuous-time average)"
+,0.000000000,5.061950112,median,173,"(median value, continuous-time average)"
+,0.000000000,5.061950112,mode,173,"(modal value, continuous-time average)"
+,0.000000000,5.061950112,mean,1510.95,"(mean value, continuous-time average)"
+"6clicks.ogg",0.000000000,9.961360543,mean,168.686,"(mean value, continuous-time average)"
+,0.000000000,9.961360543,median,158,"(median value, continuous-time average)"
+,0.000000000,9.961360543,mode,138,"(modal value, continuous-time average)"
+,0.000000000,9.961360543,mean,1423.64,"(mean value, continuous-time average)"
diff -r e2519bd033e7 -r 9a10c3ffff47 tests/test-multiple-audio/test-multiple-audio.sh
--- a/tests/test-multiple-audio/test-multiple-audio.sh	Thu Feb 25 13:02:57 2016 +0000
+++ b/tests/test-multiple-audio/test-multiple-audio.sh	Thu Feb 25 18:19:27 2016 +0000
@@ -2,14 +2,21 @@
 
 . ../include.sh
 
-tmpfile=$mypath/tmp_1_$$
+tmpfile1=$mypath/tmp_1_$$
+tmpfile2=$mypath/tmp_2_$$
 
-trap "rm -f $tmpfile" 0
+trap "rm -f $tmpfile1 $tmpfile2" 0
 
 transform=$mypath/transforms/detectionfunction.n3 
 
 urlbase=http://vamp-plugins.org/sonic-annotator/testfiles
 
+have_network=yes
+if ! ping -c 1 8.8.8.8 2>/dev/null ; then
+    echo "(network appears unavailable, skipping networking tests)"
+    have_network=no
+fi
+
 
 # 1. Recursive local directory
 
@@ -17,11 +24,11 @@
 # would have to regenerate it if we added more test audio files. Note
 # that the -r flag is not supposed to pick up playlist files, only
 # audio files
-$r -t $transform -w csv --csv-stdout -r --summary-only $audiopath > $tmpfile 2>/dev/null || \
+$r -t $transform -w csv --csv-stdout -r --summary-only $audiopath > $tmpfile1 2>/dev/null || \
     fail "Fails to run transform $transform with recursive dir option"
 
 expected=$mypath/expected/all-files
-csvcompare $tmpfile $expected.csv || \
+csvcompare $tmpfile1 $expected.csv || \
     faildiff "Output mismatch for transform $transform with summaries and recursive dir option" $tmpfile $expected.csv
 
 
@@ -30,82 +37,101 @@
 # Here we strip any leading path from the audio file in the output,
 # because the playlist reader will have resolved files to absolute
 # paths and those will differ between systems
-$r -t $transform -w csv --csv-stdout $audiopath/playlist.m3u --summary-only 2>/dev/null | sed 's,^"[^"]*/,",' > $tmpfile || \
+$r -t $transform -w csv --csv-stdout $audiopath/playlist.m3u --summary-only 2>/dev/null > "$tmpfile2" || \
     fail "Fails to run transform $transform with playlist input"
 
+cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
+
 expected=$mypath/expected/playlist
-csvcompare $tmpfile $expected.csv || \
-    faildiff "Output mismatch for transform $transform with summaries and playlist input" $tmpfile $expected.csv
+csvcompare $tmpfile1 $expected.csv || \
+    faildiff "Output mismatch for transform $transform with summaries and playlist input" $tmpfile1 $expected.csv
 
 
 # 3. Multiple files supplied directly on command line
 
 # Strip paths again, just so we can use the same output comparison
 # file as above
-$r -t $transform -w csv --csv-stdout $audiopath/3clicks.mp3 $audiopath/6clicks.ogg --summary-only 2>/dev/null | sed 's,^"[^"]*/,",' > $tmpfile || \
+$r -t $transform -w csv --csv-stdout $audiopath/3clicks.mp3 $audiopath/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
     fail "Fails to run transform $transform with 2-file input"
 
+cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
+
 expected=$mypath/expected/playlist
-csvcompare $tmpfile $expected.csv || \
-    faildiff "Output mismatch for transform $transform with summaries and 2-file input" $tmpfile $expected.csv
+csvcompare $tmpfile1 $expected.csv || \
+    faildiff "Output mismatch for transform $transform with summaries and 2-file input" $tmpfile1 $expected.csv
 
 
 # 4. Multiple files supplied directly on command line, with file: URL
 
-$r -t $transform -w csv --csv-stdout $audiopath/3clicks.mp3 file://`pwd`/$audiopath/6clicks.ogg --summary-only 2>/dev/null | sed 's,^"[^"]*/,",' > $tmpfile || \
+$r -t $transform -w csv --csv-stdout $audiopath/3clicks.mp3 file://`pwd`/$audiopath/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
     fail "Fails to run transform $transform with 2-file input"
 
-expected=$mypath/expected/playlist
-csvcompare $tmpfile $expected.csv || \
-    faildiff "Output mismatch for transform $transform with summaries and 2-file input using file:// URL" $tmpfile $expected.csv
-
-
-# 5. Remote playlist file referring to remote audio files
-
-$r -t $transform -w csv --csv-stdout $urlbase/playlist.m3u --summary-only 2>/dev/null | sed 's,^"[^"]*/,",' > $tmpfile || \
-    fail "Fails to run transform $transform with remote playlist input"
+cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
 
 expected=$mypath/expected/playlist
-csvcompare $tmpfile $expected.csv || \
-    faildiff "Output mismatch for transform $transform with summaries and remote playlist input" $tmpfile $expected.csv
+csvcompare $tmpfile1 $expected.csv || \
+    faildiff "Output mismatch for transform $transform with summaries and 2-file input using file:// URL" $tmpfile1 $expected.csv
 
 
-# 6. Local playlist file referring to mixture of remote and local audio files
+if [ "$have_network" = "yes" ]; then
 
-$r -t $transform -w csv --csv-stdout $audiopath/remote-playlist.m3u --summary-only 2>/dev/null | sed 's,^"[^"]*/,",' > $tmpfile || \
-    fail "Fails to run transform $transform with playlist of remote files"
+    # 5. Remote playlist file referring to remote audio files
 
-expected=$mypath/expected/playlist
-csvcompare $tmpfile $expected.csv || \
-    faildiff "Output mismatch for transform $transform with summaries and remote playlist input" $tmpfile $expected.csv
+    $r -t $transform -w csv --csv-stdout $urlbase/playlist.m3u --summary-only 2>/dev/null > $tmpfile2 || \
+	fail "Fails to run transform $transform with remote playlist input"
 
+    cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
 
-# 7. Multiple remote files supplied directly on command line
+    expected=$mypath/expected/playlist
+    csvcompare $tmpfile1 $expected.csv || \
+	faildiff "Output mismatch for transform $transform with summaries and remote playlist input" $tmpfile1 $expected.csv
 
-$r -t $transform -w csv --csv-stdout $urlbase/3clicks.mp3 $urlbase/6clicks.ogg --summary-only 2>/dev/null | sed 's,^"[^"]*/,",' > $tmpfile || \
-    fail "Fails to run transform $transform with 2-file remote input"
 
-expected=$mypath/expected/playlist
-csvcompare $tmpfile $expected.csv || \
-    faildiff "Output mismatch for transform $transform with summaries and 2-file input" $tmpfile $expected.csv
+    # 6. Local playlist file referring to mixture of remote and local audio files
 
+    $r -t $transform -w csv --csv-stdout $audiopath/remote-playlist.m3u --summary-only 2>/dev/null > $tmpfile2 || \
+	fail "Fails to run transform $transform with playlist of remote files"
 
-# 8. Mixture of remote and local files supplied on command line
+    cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
 
-$r -t $transform -w csv --csv-stdout $audiopath/3clicks.mp3 $urlbase/6clicks.ogg --summary-only 2>/dev/null | sed 's,^"[^"]*/,",' > $tmpfile || \
-    fail "Fails to run transform $transform with 2-file remote input"
+    expected=$mypath/expected/playlist
+    csvcompare $tmpfile1 $expected.csv || \
+	faildiff "Output mismatch for transform $transform with summaries and remote playlist input" $tmpfile1 $expected.csv
 
-expected=$mypath/expected/playlist
-csvcompare $tmpfile $expected.csv || \
-    faildiff "Output mismatch for transform $transform with summaries and mixed local/remote 2-file input" $tmpfile $expected.csv
 
+    # 7. Multiple remote files supplied directly on command line
+
+    $r -t $transform -w csv --csv-stdout $urlbase/3clicks.mp3 $urlbase/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
+	fail "Fails to run transform $transform with 2-file remote input"
+
+    cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
+
+    expected=$mypath/expected/playlist
+    csvcompare $tmpfile1 $expected.csv || \
+	faildiff "Output mismatch for transform $transform with summaries and 2-file input" $tmpfile1 $expected.csv
+
+
+    # 8. Mixture of remote and local files supplied on command line
+
+    $r -t $transform -w csv --csv-stdout $audiopath/3clicks.mp3 $urlbase/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
+	fail "Fails to run transform $transform with 2-file remote input"
+
+    cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
+
+    expected=$mypath/expected/playlist
+    csvcompare $tmpfile1 $expected.csv || \
+	faildiff "Output mismatch for transform $transform with summaries and mixed local/remote 2-file input" $tmpfile1 $expected.csv
+
+fi
 
 # 9. As 3, but multiplexing rather than extracting separately from each file
 
-$r -t $transform --multiplex -w csv --csv-stdout $audiopath/3clicks.mp3 $audiopath/6clicks.ogg --summary-only 2>/dev/null | sed 's,^"[^"]*/,",' > $tmpfile || \
+$r -t $transform --multiplex -w csv --csv-stdout $audiopath/3clicks.mp3 $audiopath/6clicks.ogg --summary-only 2>/dev/null > $tmpfile2 || \
     fail "Fails to run transform $transform with 2-file input"
 
+cat "$tmpfile2" | sed 's,^"[^"]*/,",' > "$tmpfile1"
+
 expected=$mypath/expected/multiplexed
-csvcompare $tmpfile $expected.csv || \
-    faildiff "Output mismatch for transform $transform with summaries and 2-file multiplexed input" $tmpfile $expected.csv
+csvcompare $tmpfile1 $expected.csv || \
+    faildiff "Output mismatch for transform $transform with summaries and 2-file multiplexed input" $tmpfile1 $expected.csv
 
diff -r e2519bd033e7 -r 9a10c3ffff47 tests/test-multiple-audio/transforms/detectionfunction.n3
--- a/tests/test-multiple-audio/transforms/detectionfunction.n3	Thu Feb 25 13:02:57 2016 +0000
+++ b/tests/test-multiple-audio/transforms/detectionfunction.n3	Thu Feb 25 18:19:27 2016 +0000
@@ -13,6 +13,7 @@
 	vamp:output examples:percussiononsets_output_detectionfunction ;
 	vamp:summary_type "median" .
 
+# This is not a summary and so should not appear with --summary-only
 :transform2 a vamp:Transform;
 	vamp:plugin examples:percussiononsets ;
 	vamp:output examples:percussiononsets_output_onsets .
@@ -22,11 +23,19 @@
 	vamp:output examples:percussiononsets_output_detectionfunction ;
 	vamp:summary_type "mode" .
 
+# This has different step and block sizes from the default
+# (:transform0), and so should be listed separately with different
+# values in the output
 :transform4 a vamp:Transform;
 	vamp:plugin examples:percussiononsets ;
 	vamp:output examples:percussiononsets_output_detectionfunction ;
-	vamp:step_size 2048 ;
-	vamp:block_size 4096 ;
+	vamp:step_size 4096 ;
+	vamp:block_size 8192 ;
 	vamp:summary_type "mean" .
 
+# This is not a summary and so should not appear with --summary-only
+:transform5 a vamp:Transform;
+	vamp:plugin examples:percussiononsets ;
+	vamp:output examples:percussiononsets_output_detectionfunction .
+