generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removing vplib include and VideoInterpolator when not needed

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/268004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@914 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org 2011-11-09 18:11:02 +00:00
parent 488ed92c3b
commit eb4ef17bbd
7 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit.h
View File

@ -18,7 +18,6 @@
#include "../../video_capture_impl.h"
#include "video_capture_qtkit_utility.h"
#include "../../device_info_impl.h"
#include "vplib.h"
// Forward declaraion

1
src/modules/video_capture/main/source/Mac/QuickTime/video_capture_quick_time.cc
View File

@ -21,7 +21,6 @@
#include "thread_wrapper.h"
#include "tick_util.h"
#include "trace.h"
#include "vplib.h"
#include <unistd.h>
namespace webrtc

1
src/modules/video_capture/main/source/Windows/sink_filter_windows.cc
View File

@ -10,7 +10,6 @@
#include "sink_filter_windows.h"
#include "vplib.h"
#include "trace.h"
#include "help_functions_windows.h"

1
src/modules/video_render/main/source/Android/video_render_android_native_opengl2.cc
View File

@ -10,7 +10,6 @@
#include "video_render_android_native_opengl2.h"
#include "critical_section_wrapper.h"
#include "vplib.h"
#include "tick_util.h"
#ifdef ANDROID_LOG

17
src/modules/video_render/main/source/linux/video_x11_channel.cc
View File

@ -23,12 +23,12 @@ static int dispCount = 0;
VideoX11Channel::VideoX11Channel(WebRtc_Word32 id) :
_crit(*CriticalSectionWrapper::CreateCriticalSection()),
_videoInterpolator(NULL), _display(NULL), _shminfo(),
_image(NULL), _window(0L), _width(DEFAULT_RENDER_FRAME_WIDTH),
_height(DEFAULT_RENDER_FRAME_HEIGHT), _outWidth(0), _outHeight(0),
_xPos(0), _yPos(0), _prepared(false), _dispCount(0), _buffer(NULL),
_Id(id)
_crit(*CriticalSectionWrapper::CreateCriticalSection()), _display(NULL),
_shminfo(), _image(NULL), _window(0L),
_width(DEFAULT_RENDER_FRAME_WIDTH),
_height(DEFAULT_RENDER_FRAME_HEIGHT), _outWidth(0), _outHeight(0),
_xPos(0), _yPos(0), _prepared(false), _dispCount(0), _buffer(NULL),
_Id(id)
{
}
@ -41,11 +41,6 @@ VideoX11Channel::~VideoX11Channel()
_crit.Leave();
}
delete &_crit;
if (_videoInterpolator)
{
delete _videoInterpolator;
}
}
WebRtc_Word32 VideoX11Channel::RenderFrame(const WebRtc_UWord32 streamId,

6
src/modules/video_render/main/source/linux/video_x11_channel.h
View File

@ -13,7 +13,6 @@
#include "video_render_defines.h"
#include "vplib.h"
#include <sys/shm.h>
#include <X11/Xlib.h>
@ -26,7 +25,6 @@ class CriticalSectionWrapper;
#define DEFAULT_RENDER_FRAME_WIDTH 352
#define DEFAULT_RENDER_FRAME_HEIGHT 288
typedef char* VideoInterpolator;
class VideoX11Channel: public VideoRenderCallback
{
@ -62,12 +60,12 @@ private:
CreateLocalRenderer(WebRtc_Word32 width, WebRtc_Word32 height);
WebRtc_Word32 RemoveRenderer();
//FIXME a better place for this method? the GetWidthHeight no longer supported by vplib.
//FIXME a better place for this method? the GetWidthHeight no longer
// supported by common_video.
int GetWidthHeight(VideoType type, int bufferSize, int& width,
int& height);
CriticalSectionWrapper& _crit;
VideoInterpolator* _videoInterpolator;
Display* _display;
XShmSegmentInfo _shminfo;

1
src/modules/video_render/main/source/windows/video_render_directdraw.cc
View File

@ -22,7 +22,6 @@ DEFINE_GUID( IID_IDirectDraw7,0x15e65ec0,0x3b9c,0x11d2,0xb9,0x2f,0x00,0x60,0x97,
#include "trace.h"
#include "critical_section_wrapper.h"
//#include "VideoErrors.h"
#include "vplib.h"
// Added
#include "module_common_types.h"