From 292d1705a3c21107156ec5c1bb28455966fa3f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= <ferjmoreno@gmail.com>
Date: Tue, 16 Apr 2019 17:30:22 +0200
Subject: [PATCH] Keep a map between channel position and channel index for
 decoded audio

---
 components/script/dom/baseaudiocontext.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index cebda5a26dd..ab01398db55 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.rs
@@ -53,6 +53,7 @@ use servo_media::audio::graph::NodeId;
 use servo_media::ServoMedia;
 use servo_media_auto::Backend;
 use std::cell::Cell;
+use std::collections::hash_map::Entry;
 use std::collections::{HashMap, VecDeque};
 use std::mem;
 use std::rc::Rc;
@@ -435,6 +436,11 @@ impl BaseAudioContextMethods for BaseAudioContext {
             let decoded_audio = Arc::new(Mutex::new(Vec::new()));
             let decoded_audio_ = decoded_audio.clone();
             let decoded_audio__ = decoded_audio.clone();
+            // servo-media returns an audio channel position along
+            // with the AudioDecoderCallback progress callback, which
+            // may not be the same as the index of the decoded_audio
+            // Vec.
+            let channels = Arc::new(Mutex::new(HashMap::new()));
             let this = Trusted::new(self);
             let this_ = this.clone();
             let (task_source, canceller) = window
@@ -450,8 +456,13 @@ impl BaseAudioContextMethods for BaseAudioContext {
                         .unwrap()
                         .resize(channel_count as usize, Vec::new());
                 })
-                .progress(move |buffer, channel| {
+                .progress(move |buffer, channel_pos| {
                     let mut decoded_audio = decoded_audio_.lock().unwrap();
+                    let mut channels = channels.lock().unwrap();
+                    let channel = match channels.entry(channel_pos) {
+                        Entry::Occupied(entry) => *entry.get(),
+                        Entry::Vacant(entry) => *entry.insert(decoded_audio.len()),
+                    };
                     decoded_audio[(channel - 1) as usize].extend_from_slice((*buffer).as_ref());
                 })
                 .eos(move || {