Index: media/base/filters.h |
=================================================================== |
--- media/base/filters.h (revision 95843) |
+++ media/base/filters.h (working copy) |
@@ -32,7 +32,6 @@ |
#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" |
@@ -68,12 +67,12 @@ |
// 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(); |
@@ -131,7 +130,7 @@ |
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); |
@@ -156,8 +155,7 @@ |
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; |
@@ -185,7 +183,7 @@ |
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; |
@@ -198,7 +196,7 @@ |
}; |
-class MEDIA_EXPORT VideoDecoder : public Filter { |
+class VideoDecoder : public Filter { |
public: |
// Initialize a VideoDecoder with the given DemuxerStream, executing the |
// callback upon completion. |
@@ -247,7 +245,7 @@ |
}; |
-class MEDIA_EXPORT AudioDecoder : public Filter { |
+class AudioDecoder : public Filter { |
public: |
// Initialize a AudioDecoder with the given DemuxerStream, executing the |
// callback upon completion. |
@@ -282,7 +280,7 @@ |
}; |
-class MEDIA_EXPORT VideoRenderer : public Filter { |
+class VideoRenderer : public Filter { |
public: |
// Initialize a VideoRenderer with the given VideoDecoder, executing the |
// callback upon completion. |
@@ -295,7 +293,7 @@ |
}; |
-class MEDIA_EXPORT AudioRenderer : public Filter { |
+class AudioRenderer : public Filter { |
public: |
// Initialize a AudioRenderer with the given AudioDecoder, executing the |
// callback upon completion. |