Bug 1215115 - part1: Replace the vorbis by opus in MediaEncoder and also reomve the VorbisTrackEncoder files. r=rillian
authorbechen <bechen@mozilla.com>
Wed, 30 Mar 2016 18:03:05 +0800
changeset 315821 0d41311af46d5b3c2606361018e2d1100161cf44
parent 315820 2da4c57f45951fe964d32c6ca78a6c1dfe02f2a9
child 315822 bf791204fc363ef314613ba4b105d1304c5322b2
push id9480
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 17:12:58 +0000
treeherdermozilla-aurora@0d6a91c76a9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrillian
bugs1215115
milestone48.0a1
Bug 1215115 - part1: Replace the vorbis by opus in MediaEncoder and also reomve the VorbisTrackEncoder files. r=rillian MozReview-Commit-ID: Kjf96Nk2pPk
dom/media/encoder/MediaEncoder.cpp
dom/media/encoder/VorbisTrackEncoder.cpp
dom/media/encoder/VorbisTrackEncoder.h
dom/media/encoder/moz.build
--- a/dom/media/encoder/MediaEncoder.cpp
+++ b/dom/media/encoder/MediaEncoder.cpp
@@ -10,21 +10,17 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/gfx/Point.h" // IntSize
 
 #include"GeckoProfiler.h"
 #include "OggWriter.h"
 #include "OpusTrackEncoder.h"
 
-#ifdef MOZ_VORBIS
-#include "VorbisTrackEncoder.h"
-#endif
 #ifdef MOZ_WEBM_ENCODER
-#include "VorbisTrackEncoder.h"
 #include "VP8TrackEncoder.h"
 #include "WebMWriter.h"
 #endif
 #ifdef MOZ_OMX_ENCODER
 #include "OmxTrackEncoder.h"
 #include "ISOMediaWriter.h"
 #endif
 
@@ -139,18 +135,19 @@ MediaEncoder::CreateEncoder(const nsAStr
   if (!aTrackTypes) {
     LOG(LogLevel::Error, ("NO TrackTypes!!!"));
     return nullptr;
   }
 #ifdef MOZ_WEBM_ENCODER
   else if (MediaEncoder::IsWebMEncoderEnabled() &&
           (aMIMEType.EqualsLiteral(VIDEO_WEBM) ||
           (aTrackTypes & ContainerWriter::CREATE_VIDEO_TRACK))) {
-    if (aTrackTypes & ContainerWriter::CREATE_AUDIO_TRACK) {
-      audioEncoder = new VorbisTrackEncoder();
+    if (aTrackTypes & ContainerWriter::CREATE_AUDIO_TRACK
+        && MediaDecoder::IsOpusEnabled()) {
+      audioEncoder = new OpusTrackEncoder();
       NS_ENSURE_TRUE(audioEncoder, nullptr);
     }
     videoEncoder = new VP8TrackEncoder();
     writer = new WebMWriter(aTrackTypes);
     NS_ENSURE_TRUE(writer, nullptr);
     NS_ENSURE_TRUE(videoEncoder, nullptr);
     mimeType = NS_LITERAL_STRING(VIDEO_WEBM);
   }
deleted file mode 100644
--- a/dom/media/encoder/VorbisTrackEncoder.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "VorbisTrackEncoder.h"
-#include <ogg/ogg.h>
-#include <vorbis/vorbisenc.h>
-#include "WebMWriter.h"
-#include "GeckoProfiler.h"
-
-// One actually used: Encoding using a VBR quality mode. The usable range is -.1
-// (lowest quality, smallest file) to 1. (highest quality, largest file).
-// Example quality mode .4: 44kHz stereo coupled, roughly 128kbps VBR
-// ret = vorbis_encode_init_vbr(&vi,2,44100,.4);
-static const float BASE_QUALITY = 0.4f;
-
-namespace mozilla {
-
-#undef LOG
-LazyLogModule gVorbisTrackEncoderLog("VorbisTrackEncoder");
-#define VORBISLOG(msg, ...) MOZ_LOG(gVorbisTrackEncoderLog, mozilla::LogLevel::Debug, \
-                             (msg, ##__VA_ARGS__))
-
-VorbisTrackEncoder::VorbisTrackEncoder()
-  : AudioTrackEncoder()
-{
-  MOZ_COUNT_CTOR(VorbisTrackEncoder);
-}
-
-VorbisTrackEncoder::~VorbisTrackEncoder()
-{
-  MOZ_COUNT_DTOR(VorbisTrackEncoder);
-  if (mInitialized) {
-    vorbis_block_clear(&mVorbisBlock);
-    vorbis_dsp_clear(&mVorbisDsp);
-    vorbis_info_clear(&mVorbisInfo);
-  }
-}
-
-nsresult
-VorbisTrackEncoder::Init(int aChannels, int aSamplingRate)
-{
-  NS_ENSURE_TRUE(aChannels > 0, NS_ERROR_INVALID_ARG);
-  NS_ENSURE_TRUE(aChannels <= 8, NS_ERROR_INVALID_ARG);
-  NS_ENSURE_TRUE(aSamplingRate >= 8000, NS_ERROR_INVALID_ARG);
-  NS_ENSURE_TRUE(aSamplingRate <= 192000, NS_ERROR_INVALID_ARG);
-
-  // This monitor is used to wake up other methods that are waiting for encoder
-  // to be completely initialized.
-  ReentrantMonitorAutoEnter mon(mReentrantMonitor);
-  mChannels = aChannels;
-  mSamplingRate = aSamplingRate;
-
-  int ret = 0;
-  vorbis_info_init(&mVorbisInfo);
-  double quality = mAudioBitrate ? (double)mAudioBitrate/aSamplingRate :
-                   BASE_QUALITY;
-
-  VORBISLOG("quality %f", quality);
-  ret = vorbis_encode_init_vbr(&mVorbisInfo, mChannels, mSamplingRate,
-                               quality);
-
-  mInitialized = (ret == 0);
-
-  if (mInitialized) {
-    // Set up the analysis state and auxiliary encoding storage
-    vorbis_analysis_init(&mVorbisDsp, &mVorbisInfo);
-    vorbis_block_init(&mVorbisDsp, &mVorbisBlock);
-  }
-
-  mon.NotifyAll();
-
-  return ret == 0 ? NS_OK : NS_ERROR_FAILURE;
-}
-
-void VorbisTrackEncoder::WriteLacing(nsTArray<uint8_t> *aOutput, int32_t aLacing)
-{
-  while (aLacing >= 255) {
-    aLacing -= 255;
-    aOutput->AppendElement(255);
-  }
-  aOutput->AppendElement((uint8_t)aLacing);
-}
-
-already_AddRefed<TrackMetadataBase>
-VorbisTrackEncoder::GetMetadata()
-{
-  PROFILER_LABEL("VorbisTrackEncoder", "GetMetadata",
-    js::ProfileEntry::Category::OTHER);
-  {
-    // Wait if encoder is not initialized.
-    ReentrantMonitorAutoEnter mon(mReentrantMonitor);
-    while (!mCanceled && !mInitialized) {
-      mon.Wait();
-    }
-  }
-
-  if (mCanceled || mEncodingComplete) {
-    return nullptr;
-  }
-
-  // Vorbis codec specific data
-  // http://matroska.org/technical/specs/codecid/index.html
-  RefPtr<VorbisMetadata> meta = new VorbisMetadata();
-  meta->mBitDepth = 32; // float for desktop
-  meta->mChannels = mChannels;
-  meta->mSamplingFrequency = mSamplingRate;
-  ogg_packet header;
-  ogg_packet header_comm;
-  ogg_packet header_code;
-  // Add comment
-  vorbis_comment vorbisComment;
-  vorbis_comment_init(&vorbisComment);
-  vorbis_comment_add_tag(&vorbisComment, "ENCODER",
-    NS_LITERAL_CSTRING("Mozilla VorbisTrackEncoder " MOZ_APP_UA_VERSION).get());
-  vorbis_analysis_headerout(&mVorbisDsp, &vorbisComment,
-                            &header,&header_comm, &header_code);
-  vorbis_comment_clear(&vorbisComment);
-  // number of distinct packets - 1
-  meta->mData.AppendElement(2);
-  // Xiph-style lacing header.bytes, header_comm.bytes
-  WriteLacing(&(meta->mData), header.bytes);
-  WriteLacing(&(meta->mData), header_comm.bytes);
-
-  // Append the three packets
-  meta->mData.AppendElements(header.packet, header.bytes);
-  meta->mData.AppendElements(header_comm.packet, header_comm.bytes);
-  meta->mData.AppendElements(header_code.packet, header_code.bytes);
-
-  return meta.forget();
-}
-
-void
-VorbisTrackEncoder::GetEncodedFrames(EncodedFrameContainer& aData)
-{
-  // vorbis does some data preanalysis, then divvies up blocks for
-  // more involved (potentially parallel) processing. Get a single
-  // block for encoding now.
-  while (vorbis_analysis_blockout(&mVorbisDsp, &mVorbisBlock) == 1) {
-    ogg_packet oggPacket;
-    if (vorbis_analysis(&mVorbisBlock, &oggPacket) == 0) {
-      VORBISLOG("vorbis_analysis_blockout block size %d", oggPacket.bytes);
-      EncodedFrame* audiodata = new EncodedFrame();
-      audiodata->SetFrameType(EncodedFrame::VORBIS_AUDIO_FRAME);
-      audiodata->SetTimeStamp(oggPacket.granulepos * PR_USEC_PER_SEC
-                              / mSamplingRate);
-      nsTArray<uint8_t> frameData;
-      frameData.AppendElements(oggPacket.packet, oggPacket.bytes);
-      audiodata->SwapInFrameData(frameData);
-      aData.AppendEncodedFrame(audiodata);
-    }
-  }
-}
-
-nsresult
-VorbisTrackEncoder::GetEncodedTrack(EncodedFrameContainer& aData)
-{
-  if (mEosSetInEncoder) {
-    return NS_OK;
-  }
-
-  PROFILER_LABEL("VorbisTrackEncoder", "GetEncodedTrack",
-    js::ProfileEntry::Category::OTHER);
-
-  nsAutoPtr<AudioSegment> sourceSegment;
-  sourceSegment = new AudioSegment();
-  {
-    // Move all the samples from mRawSegment to sourceSegment. We only hold
-    // the monitor in this block.
-    ReentrantMonitorAutoEnter mon(mReentrantMonitor);
-
-    // Wait if mEncoder is not initialized, or when not enough raw data, but is
-    // not the end of stream nor is being canceled.
-    while (!mCanceled && mRawSegment.GetDuration() < GetPacketDuration() &&
-           !mEndOfStream) {
-      mon.Wait();
-    }
-    VORBISLOG("GetEncodedTrack passes wait, duration is %lld\n",
-      mRawSegment.GetDuration());
-    if (mCanceled || mEncodingComplete) {
-      return NS_ERROR_FAILURE;
-    }
-
-    sourceSegment->AppendFrom(&mRawSegment);
-  }
-
-  if (mEndOfStream && (sourceSegment->GetDuration() == 0)
-      && !mEosSetInEncoder) {
-    mEncodingComplete = true;
-    mEosSetInEncoder = true;
-    VORBISLOG("[Vorbis] Done encoding.");
-    vorbis_analysis_wrote(&mVorbisDsp, 0);
-    GetEncodedFrames(aData);
-
-    return NS_OK;
-  }
-
-  // Start encoding data.
-  AudioSegment::ChunkIterator iter(*sourceSegment);
-
-  AudioDataValue **vorbisBuffer =
-    vorbis_analysis_buffer(&mVorbisDsp, (int)sourceSegment->GetDuration());
-
-  int framesCopied = 0;
-  AutoTArray<AudioDataValue, 9600> interleavedPcm;
-  AutoTArray<AudioDataValue, 9600> nonInterleavedPcm;
-  interleavedPcm.SetLength(sourceSegment->GetDuration() * mChannels);
-  nonInterleavedPcm.SetLength(sourceSegment->GetDuration() * mChannels);
-  while (!iter.IsEnded()) {
-    AudioChunk chunk = *iter;
-    int frameToCopy = chunk.GetDuration();
-    if (!chunk.IsNull()) {
-      InterleaveTrackData(chunk, frameToCopy, mChannels,
-                          interleavedPcm.Elements() + framesCopied * mChannels);
-    } else { // empty data
-      memset(interleavedPcm.Elements() + framesCopied * mChannels, 0,
-             frameToCopy * mChannels * sizeof(AudioDataValue));
-    }
-    framesCopied += frameToCopy;
-    iter.Next();
-  }
-  // De-interleave the interleavedPcm.
-  DeInterleaveTrackData(interleavedPcm.Elements(), framesCopied, mChannels,
-                        nonInterleavedPcm.Elements());
-  // Copy the nonInterleavedPcm to vorbis buffer.
-  for(uint8_t i = 0; i < mChannels; ++i) {
-    memcpy(vorbisBuffer[i], nonInterleavedPcm.Elements() + framesCopied * i,
-           framesCopied * sizeof(AudioDataValue));
-  }
-
-  // Now the vorbisBuffer contain the all data in non-interleaved.
-  // Tell the library how much we actually submitted.
-  vorbis_analysis_wrote(&mVorbisDsp, framesCopied);
-  VORBISLOG("vorbis_analysis_wrote framesCopied %d\n", framesCopied);
-  GetEncodedFrames(aData);
-
-  return NS_OK;
-}
-
-} // namespace mozilla
deleted file mode 100644
--- a/dom/media/encoder/VorbisTrackEncoder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-*/
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef VorbisTrackEncoder_h_
-#define VorbisTrackEncoder_h_
-
-#include "TrackEncoder.h"
-#include "nsCOMPtr.h"
-#include <vorbis/codec.h>
-
-namespace mozilla {
-
-class VorbisTrackEncoder : public AudioTrackEncoder
-{
-public:
-  VorbisTrackEncoder();
-  virtual ~VorbisTrackEncoder();
-
-  already_AddRefed<TrackMetadataBase> GetMetadata() final override;
-
-  nsresult GetEncodedTrack(EncodedFrameContainer& aData) final override;
-
-protected:
-  /**
-   * http://xiph.org/vorbis/doc/libvorbis/vorbis_analysis_buffer.html
-   * We use 1024 samples for the write buffer; libvorbis will construct packets
-   * with the appropriate duration for the encoding mode internally.
-   */
-  int GetPacketDuration() final override {
-    return 1024;
-  }
-
-  nsresult Init(int aChannels, int aSamplingRate) final override;
-
-private:
-  // Write Xiph-style lacing to aOutput.
-  void WriteLacing(nsTArray<uint8_t> *aOutput, int32_t aLacing);
-
-  // Get the encoded data from vorbis encoder and append into aData.
-  void GetEncodedFrames(EncodedFrameContainer& aData);
-
-  // vorbis codec members
-  // Struct that stores all the static vorbis bitstream settings.
-  vorbis_info mVorbisInfo;
-  // Central working state for the PCM->packet encoder.
-  vorbis_dsp_state mVorbisDsp;
-  // Local working space for PCM->packet encode.
-  vorbis_block mVorbisBlock;
-};
-
-} // namespace mozilla
-
-#endif
--- a/dom/media/encoder/moz.build
+++ b/dom/media/encoder/moz.build
@@ -25,21 +25,19 @@ UNIFIED_SOURCES += [
     'TrackEncoder.cpp',
 ]
 
 if CONFIG['MOZ_OMX_ENCODER']:
     EXPORTS += ['OmxTrackEncoder.h']
     UNIFIED_SOURCES += ['OmxTrackEncoder.cpp']
 
 if CONFIG['MOZ_WEBM_ENCODER']:
-    EXPORTS += ['VorbisTrackEncoder.h',
-                'VP8TrackEncoder.h',
+    EXPORTS += ['VP8TrackEncoder.h',
     ]
-    UNIFIED_SOURCES += ['VorbisTrackEncoder.cpp',
-                        'VP8TrackEncoder.cpp',
+    UNIFIED_SOURCES += ['VP8TrackEncoder.cpp',
     ]
     LOCAL_INCLUDES += ['/media/libyuv/include']
 
 FINAL_LIBRARY = 'xul'
 
 # These includes are from Android JB, for use of MediaCodec.
 LOCAL_INCLUDES += ['/ipc/chromium/src']