Bug 891705 - [MediaEncoder] Implement WebM 1.0 container writer. r=giles, r=gps, r=rillian

This is an integrated patch which includes:
1. Bug 891705: [MediaEncoder] Implement WebM 1.0 container writer. r=giles, r=gps
2. Bug 950567: [MediaEncoder] Phase-in libmkv library. r=giles
3. bug 883749: Implement Vorbis encoding. r=rillian
4. bug 881840: Implement VP8 track encoder. r=rillian

Author: randylin

browser/confvars.sh

@@ -64,6 +64,7 @@ MOZ_PAY=1
 # Enable activities. These are used for FxOS developers currently.
 MOZ_ACTIVITIES=1
 MOZ_JSDOWNLOADS=1
+MOZ_WEBM_ENCODER=1
 # Enable exact rooting on desktop.
 JSGC_USE_EXACT_ROOTING=1
 

config/external/moz.build

@@ -27,6 +27,9 @@ if CONFIG['MOZ_OPUS']:
 if CONFIG['MOZ_WEBM']:
     external_dirs += ['media/libnestegg']
 
+if CONFIG['MOZ_WEBM_ENCODER']:
+    external_dirs += ['media/libmkv']
+
 if CONFIG['MOZ_VPX'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
     external_dirs += ['media/libvpx']
 

configure.in

@@ -5546,6 +5546,11 @@ if test -n "$MOZ_OPUS"; then
     AC_DEFINE(MOZ_OPUS)
 fi
 
+if test -n "$MOZ_WEBM_ENCODER"; then
+    AC_DEFINE(MOZ_WEBM_ENCODER)
+fi
+AC_SUBST(MOZ_WEBM_ENCODER)
+
 dnl ==================================
 dnl = Check alsa availability on Linux
 dnl ==================================

content/media/encoder/MediaEncoder.cpp

@@ -14,6 +14,11 @@
 #endif
 #ifdef MOZ_OPUS
 #include "OpusTrackEncoder.h"
+
+#endif
+
+#ifdef MOZ_VORBIS
+#include "VorbisTrackEncoder.h"
 #endif
 #ifdef MOZ_WEBM_ENCODER
 #include "VorbisTrackEncoder.h"

content/media/encoder/TrackEncoder.cpp

@@ -128,6 +128,20 @@ AudioTrackEncoder::InterleaveTrackData(AudioChunk& aChunk,
   }
 }
 
+/*static*/
+void
+AudioTrackEncoder::DeInterleaveTrackData(AudioDataValue* aInput,
+                                         int32_t aDuration,
+                                         int32_t aChannels,
+                                         AudioDataValue* aOutput)
+{
+  for (int32_t i = 0; i < aChannels; ++i) {
+    for(int32_t j = 0; j < aDuration; ++j) {
+      aOutput[i * aDuration + j] = aInput[i + j * aChannels];
+    }
+  }
+}
+
 void
 VideoTrackEncoder::NotifyQueuedTrackChanges(MediaStreamGraph* aGraph,
                                             TrackID aID,

content/media/encoder/TrackEncoder.h

@@ -158,6 +158,13 @@ class AudioTrackEncoder : public TrackEncoder
                                   uint32_t aOutputChannels,
                                   AudioDataValue* aOutput);
 
+  /**
+   * De-interleaves the aInput data and stores the result into aOutput.
+   * No up-mix or down-mix operations inside.
+   */
+  static void DeInterleaveTrackData(AudioDataValue* aInput, int32_t aDuration,
+                                    int32_t aChannels, AudioDataValue* aOutput);
+
 protected:
   /**
    * Number of samples per channel in a pcm buffer. This is also the value of

content/media/encoder/TrackMetadataBase.h

@@ -18,6 +18,7 @@ class TrackMetadataBase
   enum MetadataKind {
     METADATA_OPUS,    // Represent the Opus metadata
     METADATA_VP8,
+    METADATA_VORBIS,
     METADATA_AVC,
     METADATA_AAC,
     METADATA_UNKNOWN  // Metadata Kind not set