Revert r95841 due to failing media_unittests on linux_shared bot.

media/base/filters.h

 // Copyright (c) 2011 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.
 
 // Filters are connected in a strongly typed manner, with downstream filters
 // always reading data from upstream filters.  Upstream filters have no clue
 // who is actually reading from them, and return the results via callbacks.
 //
 //                         DemuxerStream(Video) <- VideoDecoder <- VideoRenderer
 // DataSource <- Demuxer <
@@ skipping 14 matching lines @@
 
 #include <limits>
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_old.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "media/base/audio_decoder_config.h"
-#include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_frame.h"
 
 struct AVStream;
 
 namespace media {
 
 class Buffer;
 class Decoder;
 class DemuxerStream;
@@ skipping 15 matching lines @@
   AUTO,
 };
 
 // Used for completing asynchronous methods.
 typedef Callback0::Type FilterCallback;
 typedef base::Callback<void(PipelineStatus)> FilterStatusCB;
 
 // This function copies |cb|, calls Reset() on |cb|, and then calls Run()
 // on the copy. This is used in the common case where you need to clear
 // a callback member variable before running the callback.
-MEDIA_EXPORT void ResetAndRunCB(FilterStatusCB* cb, PipelineStatus status);
+void ResetAndRunCB(FilterStatusCB* cb, PipelineStatus status);
 
 // Used for updating pipeline statistics.
 typedef Callback1<const PipelineStatistics&>::Type StatisticsCallback;
 
-class MEDIA_EXPORT Filter : public base::RefCountedThreadSafe<Filter> {
+class Filter : public base::RefCountedThreadSafe<Filter> {
  public:
   Filter();
 
   // Sets the private member |host_|. This is the first method called by
   // the FilterHost after a filter is created.  The host holds a strong
   // reference to the filter.  The reference held by the host is guaranteed
   // to be released before the host object is destroyed by the pipeline.
   virtual void set_host(FilterHost* host);
 
   virtual FilterHost* host();
@@ skipping 37 matching lines @@
   virtual ~Filter();
 
   FilterHost* host() const { return host_; }
 
  private:
   FilterHost* host_;
 
   DISALLOW_COPY_AND_ASSIGN(Filter);
 };
 
-class MEDIA_EXPORT DataSource : public Filter {
+class DataSource : public Filter {
  public:
   typedef Callback1<size_t>::Type ReadCallback;
   static const size_t kReadError = static_cast<size_t>(-1);
 
   // Reads |size| bytes from |position| into |data|. And when the read is done
   // or failed, |read_callback| is called with the number of bytes read or
   // kReadError in case of error.
   // TODO(hclam): should change |size| to int! It makes the code so messy
   // with size_t and int all over the place..
   virtual void Read(int64 position, size_t size,
                     uint8* data, ReadCallback* read_callback) = 0;
 
   // Returns true and the file size, false if the file size could not be
   // retrieved.
   virtual bool GetSize(int64* size_out) = 0;
 
   // Returns true if we are performing streaming. In this case seeking is
   // not possible.
   virtual bool IsStreaming() = 0;
 
   // Alert the DataSource that the video preload value has been changed.
   virtual void SetPreload(Preload preload) = 0;
 };
 
-class MEDIA_EXPORT DemuxerStream
-    : public base::RefCountedThreadSafe<DemuxerStream> {
+class DemuxerStream : public base::RefCountedThreadSafe<DemuxerStream> {
  public:
   typedef base::Callback<void(Buffer*)> ReadCallback;
 
   enum Type {
     UNKNOWN,
     AUDIO,
     VIDEO,
     NUM_TYPES,  // Always keep this entry as the last one!
   };
 
   // Schedules a read.  When the |read_callback| is called, the downstream
   // filter takes ownership of the buffer by AddRef()'ing the buffer.
   virtual void Read(const ReadCallback& read_callback) = 0;
 
   // Returns an |AVStream*| if supported, or NULL.
   virtual AVStream* GetAVStream();
 
   // Returns the type of stream.
   virtual Type type() = 0;
 
   virtual void EnableBitstreamConverter() = 0;
 
  protected:
   friend class base::RefCountedThreadSafe<DemuxerStream>;
   virtual ~DemuxerStream();
 };
 
-class MEDIA_EXPORT Demuxer : public Filter {
+class Demuxer : public Filter {
  public:
   // Returns the given stream type, or NULL if that type is not present.
   virtual scoped_refptr<DemuxerStream> GetStream(DemuxerStream::Type type) = 0;
 
   // Alert the Demuxer that the video preload value has been changed.
   virtual void SetPreload(Preload preload) = 0;
 
   // Returns the starting time for the media file.
   virtual base::TimeDelta GetStartTime() const = 0;
 };
 
 
-class MEDIA_EXPORT VideoDecoder : public Filter {
+class VideoDecoder : public Filter {
  public:
   // Initialize a VideoDecoder with the given DemuxerStream, executing the
   // callback upon completion.
   // stats_callback is used to update global pipeline statistics.
   virtual void Initialize(DemuxerStream* stream, FilterCallback* callback,
                           StatisticsCallback* stats_callback) = 0;
 
   // Renderer provides an output buffer for Decoder to write to. These buffers
   // will be recycled to renderer via the permanent callback.
   //
@@ skipping 28 matching lines @@
   }
 
   VideoDecoder();
   virtual ~VideoDecoder();
 
  private:
   ConsumeVideoFrameCB consume_video_frame_callback_;
 };
 
 
-class MEDIA_EXPORT AudioDecoder : public Filter {
+class AudioDecoder : public Filter {
  public:
   // Initialize a AudioDecoder with the given DemuxerStream, executing the
   // callback upon completion.
   // stats_callback is used to update global pipeline statistics.
   virtual void Initialize(DemuxerStream* stream, FilterCallback* callback,
                           StatisticsCallback* stats_callback) = 0;
 
   virtual AudioDecoderConfig config() = 0;
 
   // Renderer provides an output buffer for Decoder to write to. These buffers
@@ skipping 14 matching lines @@
   virtual ~AudioDecoder();
 
   // Executes the permanent callback to pass off decoded audio.
   void ConsumeAudioSamples(scoped_refptr<Buffer> buffer);
 
  private:
   ConsumeAudioSamplesCB consume_audio_samples_callback_;
 };
 
 
-class MEDIA_EXPORT VideoRenderer : public Filter {
+class VideoRenderer : public Filter {
  public:
   // Initialize a VideoRenderer with the given VideoDecoder, executing the
   // callback upon completion.
   virtual void Initialize(VideoDecoder* decoder, FilterCallback* callback,
                           StatisticsCallback* stats_callback) = 0;
 
   // Returns true if this filter has received and processed an end-of-stream
   // buffer.
   virtual bool HasEnded() = 0;
 };
 
 
-class MEDIA_EXPORT AudioRenderer : public Filter {
+class AudioRenderer : public Filter {
  public:
   // Initialize a AudioRenderer with the given AudioDecoder, executing the
   // callback upon completion.
   virtual void Initialize(AudioDecoder* decoder, FilterCallback* callback) = 0;
 
   // Returns true if this filter has received and processed an end-of-stream
   // buffer.
   virtual bool HasEnded() = 0;
 
   // Sets the output volume.
   virtual void SetVolume(float volume) = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_FILTERS_H_