diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 06:53:57 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 06:53:57 +0000 |
commit | 3e21bd00219f2dd475f36cad70c7e8e5a6c90a4e (patch) | |
tree | a666f584af965358e59dbb99d51f4e1ede810f61 /media/video | |
parent | 80afbdbf6432bae199da3ef53dc02de7160585cc (diff) | |
download | chromium_src-3e21bd00219f2dd475f36cad70c7e8e5a6c90a4e.zip chromium_src-3e21bd00219f2dd475f36cad70c7e8e5a6c90a4e.tar.gz chromium_src-3e21bd00219f2dd475f36cad70c7e8e5a6c90a4e.tar.bz2 |
Create media.dll / libmedia.so.
This is a re-attempt at landing http://codereview.chromium.org/7572040, now with a DEPS roll to pick up the changes made to ffmpeg by http://codereview.chromium.org/7778004/ so that media_unittests run properly on Linux.
TBR=fischman
Review URL: http://codereview.chromium.org/7775004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video')
-rw-r--r-- | media/video/capture/fake_video_capture_device.h | 2 | ||||
-rw-r--r-- | media/video/capture/video_capture_device.h | 3 | ||||
-rw-r--r-- | media/video/capture/video_capture_proxy.h | 3 | ||||
-rw-r--r-- | media/video/ffmpeg_video_decode_engine.h | 2 | ||||
-rw-r--r-- | media/video/picture.h | 5 | ||||
-rw-r--r-- | media/video/video_decode_accelerator.h | 2 | ||||
-rw-r--r-- | media/video/video_decode_engine.h | 5 |
7 files changed, 13 insertions, 9 deletions
diff --git a/media/video/capture/fake_video_capture_device.h b/media/video/capture/fake_video_capture_device.h index 582e55f..d73000d 100644 --- a/media/video/capture/fake_video_capture_device.h +++ b/media/video/capture/fake_video_capture_device.h @@ -16,7 +16,7 @@ namespace media { -class FakeVideoCaptureDevice : public VideoCaptureDevice { +class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice { public: static VideoCaptureDevice* Create(const Name& device_name); virtual ~FakeVideoCaptureDevice(); diff --git a/media/video/capture/video_capture_device.h b/media/video/capture/video_capture_device.h index a2d4ddd..5069fc4 100644 --- a/media/video/capture/video_capture_device.h +++ b/media/video/capture/video_capture_device.h @@ -16,10 +16,11 @@ #include <string> #include "base/time.h" +#include "media/base/media_export.h" namespace media { -class VideoCaptureDevice { +class MEDIA_EXPORT VideoCaptureDevice { public: struct Name { diff --git a/media/video/capture/video_capture_proxy.h b/media/video/capture/video_capture_proxy.h index 3e51fd4..8be8474 100644 --- a/media/video/capture/video_capture_proxy.h +++ b/media/video/capture/video_capture_proxy.h @@ -25,7 +25,8 @@ namespace media { // state from the "main thread" is fundamentally racy. Instead this class keeps // track of the state every time it is called by the VideoCapture (on the VC // thread), and forwards that information to the main thread. -class VideoCaptureHandlerProxy : public VideoCapture::EventHandler { +class MEDIA_EXPORT VideoCaptureHandlerProxy + : public VideoCapture::EventHandler { public: struct VideoCaptureState { VideoCaptureState() : started(false), width(0), height(0), frame_rate(0) {} diff --git a/media/video/ffmpeg_video_decode_engine.h b/media/video/ffmpeg_video_decode_engine.h index b7d7661..3bc80c7 100644 --- a/media/video/ffmpeg_video_decode_engine.h +++ b/media/video/ffmpeg_video_decode_engine.h @@ -17,7 +17,7 @@ struct AVFrame; namespace media { -class FFmpegVideoDecodeEngine : public VideoDecodeEngine { +class MEDIA_EXPORT FFmpegVideoDecodeEngine : public VideoDecodeEngine { public: FFmpegVideoDecodeEngine(); virtual ~FFmpegVideoDecodeEngine(); diff --git a/media/video/picture.h b/media/video/picture.h index ba52818..5d3b775 100644 --- a/media/video/picture.h +++ b/media/video/picture.h @@ -6,13 +6,14 @@ #define MEDIA_VIDEO_PICTURE_H_ #include "base/basictypes.h" +#include "media/base/media_export.h" #include "ui/gfx/size.h" namespace media { // A picture buffer that is composed of a GLES2 texture. // This is the media-namespace equivalent of PP_PictureBuffer_Dev. -class PictureBuffer { +class MEDIA_EXPORT PictureBuffer { public: PictureBuffer(int32 id, gfx::Size size, uint32 texture_id); @@ -41,7 +42,7 @@ class PictureBuffer { // A decoded picture frame. // This is the media-namespace equivalent of PP_Picture_Dev. -class Picture { +class MEDIA_EXPORT Picture { public: Picture(int32 picture_buffer_id, int32 bitstream_buffer_id); diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h index 7ce1785..799dca7 100644 --- a/media/video/video_decode_accelerator.h +++ b/media/video/video_decode_accelerator.h @@ -164,7 +164,7 @@ enum VideoColorFormat { // // No thread-safety guarantees are implied by the use of RefCountedThreadSafe // below. -class VideoDecodeAccelerator +class MEDIA_EXPORT VideoDecodeAccelerator : public base::RefCountedThreadSafe<VideoDecodeAccelerator> { public: // Enumeration of potential errors generated by the API. diff --git a/media/video/video_decode_engine.h b/media/video/video_decode_engine.h index da6aaff..6171232 100644 --- a/media/video/video_decode_engine.h +++ b/media/video/video_decode_engine.h @@ -7,6 +7,7 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" +#include "media/base/media_export.h" #include "media/base/video_decoder_config.h" #include "media/base/video_frame.h" @@ -30,9 +31,9 @@ struct VideoCodecInfo { uint32 surface_height; }; -class VideoDecodeEngine { +class MEDIA_EXPORT VideoDecodeEngine { public: - struct EventHandler { + struct MEDIA_EXPORT EventHandler { public: virtual ~EventHandler() {} virtual void OnInitializeComplete(const VideoCodecInfo& info) = 0; |