Revert of [Chromecast] Process streams with different post-processing.

chromecast/media/cma/backend/alsa/stream_mixer_alsa.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_H_
 #define CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_H_
 
 #include <alsa/asoundlib.h>
 #include <stdint.h>
 
@@ skipping 10 matching lines @@
 #include "chromecast/media/cma/backend/alsa/stream_mixer_alsa_input.h"
 #include "chromecast/public/cast_media_shlib.h"
 
 namespace media {
 class AudioBus;
 }  // namespace media
 
 namespace chromecast {
 namespace media {
 class AlsaWrapper;
-class FilterGroup;
 
 // Mixer implementation. The mixer has one or more input queues; these can be
 // added/removed at any time. When an input source pushes frames to an input
 // queue, the queue should call StreamMixerAlsa::WriteFrames(); this causes
 // the mixer to attempt to mix and write out as many frames as possible. To do
 // this, the mixer determines how many frames can be read from all inputs (ie,
 // it gets the maximum number of frames that can be read from each input, and
 // uses the minimum value). Assuming that all primary inputs have some data
 // available, the calculated number of frames are pulled from each input (maybe
 // resampled, if the input's incoming sample rate is not equal to the mixer's
@@ skipping 19 matching lines @@
 
     // Returns the sample rate of this stream *before* data is resampled to
     // match the sample rate expected by the mixer. The returned value must be
     // positive.
     virtual int input_samples_per_second() const = 0;
 
     // Returns true if the stream is primary. Primary streams will be given
     // precedence for sample rates and will dictate when data is polled.
     virtual bool primary() const = 0;
 
-    // Returns a string describing the content type class.
-    // Should be from chromecast/media/base/audio_device_ids.h
-    // or media/audio/audio_device_description.h
-    virtual std::string device_id() const = 0;
-
     // Returns true if PrepareToDelete() has been called.
     virtual bool IsDeleting() const = 0;
 
     // Initializes the InputQueue after the mixer is set up. At this point the
     // input can correctly determine the mixer's output sample rate.
     virtual void Initialize(const MediaPipelineBackendAlsa::RenderingDelay&
                                 mixer_rendering_delay) = 0;
 
-    // Sets and gets the FilterGroup the InputQueue matches.
-    // This is determined at creation to save time matching the InputQueue
-    // to a FilterGroup every time it needs to be mixed.
-    virtual void set_filter_group(FilterGroup* filter_group) = 0;
-    virtual FilterGroup* filter_group() = 0;
-
     // Returns the maximum number of frames that can be read from this input
     // stream without filling with zeros. This should return 0 if the queue is
     // empty and EOS has not been queued.
     virtual int MaxReadSize() = 0;
 
     // Pulls data from the input stream. The input stream should populate |dest|
     // with |frames| frames of data to be mixed. The mixer expects data to be
     // at a sample rate of |output_samples_per_second()|, so each input stream
     // should resample as necessary before returning. |frames| is guaranteed to
     // be no larger than the value returned by the most recent call to
@@ skipping 100 matching lines @@
   // May be called on any thread.
   void DeleteInputQueue(InputQueue* input);
   // Runs on mixer thread to complete input queue deletion.
   void DeleteInputQueueInternal(InputQueue* input);
   // Called after a timeout period to close the PCM handle if no inputs are
   // present.
   void CheckClose();
 
   void WriteFrames();
   bool TryWriteFrames();
-  void WriteMixedPcm(std::vector<uint8_t>* interleaved, int frames);
+  void WriteMixedPcm(const ::media::AudioBus& mixed, int frames,
+      bool is_silence);
   void UpdateRenderingDelay(int newly_pushed_frames);
-  size_t InterleavedSize(int frames);
   ssize_t BytesPerOutputFormatSample();
-  void ResizeBuffersIfNecessary(int chunk_size);
 
   static bool single_threaded_for_test_;
 
   std::unique_ptr<AlsaWrapper> alsa_;
   std::unique_ptr<base::Thread> mixer_thread_;
   scoped_refptr<base::SingleThreadTaskRunner> mixer_task_runner_;
 
   unsigned int fixed_output_samples_per_second_;
   unsigned int low_sample_rate_cutoff_;
   int requested_output_samples_per_second_;
@@ skipping 10 matching lines @@
   bool alsa_period_explicitly_set;
   snd_pcm_uframes_t alsa_period_size_;
   snd_pcm_uframes_t alsa_start_threshold_;
   snd_pcm_uframes_t alsa_avail_min_;
 
   State state_;
 
   std::vector<std::unique_ptr<InputQueue>> inputs_;
   std::vector<std::unique_ptr<InputQueue>> ignored_inputs_;
   MediaPipelineBackendAlsa::RenderingDelay rendering_delay_;
+  // Buffer to write final interleaved data before sending to snd_pcm_writei().
+  std::vector<uint8_t> interleaved_;
+
+  // Buffers that hold audio data while it is mixed, before it is passed to the
+  // ALSA layer. These are kept as members of this class to minimize copies and
+  // allocations.
+  std::unique_ptr<::media::AudioBus> temp_;
+  std::unique_ptr<::media::AudioBus> mixed_;
 
   std::unique_ptr<base::Timer> retry_write_frames_timer_;
 
   int check_close_timeout_;
   std::unique_ptr<base::Timer> check_close_timer_;
 
-  std::vector<std::unique_ptr<FilterGroup>> filter_groups_;
   std::vector<CastMediaShlib::LoopbackAudioObserver*> loopback_observers_;
 
+  std::unique_ptr<AudioFilterInterface> pre_loopback_filter_;
+  std::unique_ptr<AudioFilterInterface> post_loopback_filter_;
+  int silence_frames_filtered_ = 0;
+
   DISALLOW_COPY_AND_ASSIGN(StreamMixerAlsa);
 };
 
 }  // namespace media
 }  // namespace chromecast
 
 #endif  // CHROMECAST_MEDIA_CMA_BACKEND_ALSA_STREAM_MIXER_ALSA_H_