Skip to content

Commit

Permalink
cosmetic: renamed interlacemode to deinterlacemode, less confusing
Browse files Browse the repository at this point in the history
  • Loading branch information
CrystalP authored and CrystalP committed Sep 15, 2011
1 parent 17e32d5 commit a9f4307
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 44 deletions.
8 changes: 4 additions & 4 deletions xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
View file
Expand Up @@ -2982,11 +2982,11 @@ bool CLinuxRendererGL::SupportsMultiPassRendering()
return glewIsSupported("GL_EXT_framebuffer_object") && glCreateProgram;
}

bool CLinuxRendererGL::Supports(EINTERLACEMODE mode)
bool CLinuxRendererGL::Supports(EDEINTERLACEMODE mode)
{
if(mode == VS_INTERLACEMODE_OFF
|| mode == VS_INTERLACEMODE_AUTO
|| mode == VS_INTERLACEMODE_FORCE)
if(mode == VS_DEINTERLACEMODE_OFF
|| mode == VS_DEINTERLACEMODE_AUTO
|| mode == VS_DEINTERLACEMODE_FORCE)
return true;

return false;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoRenderers/LinuxRendererGL.h
View file
Expand Up @@ -153,7 +153,7 @@ class CLinuxRendererGL : public CBaseRenderer
// Feature support
virtual bool SupportsMultiPassRendering();
virtual bool Supports(ERENDERFEATURE feature);
virtual bool Supports(EINTERLACEMODE mode);
virtual bool Supports(EDEINTERLACEMODE mode);
virtual bool Supports(EINTERLACEMETHOD method);
virtual bool Supports(ESCALINGMETHOD method);

Expand Down
8 changes: 4 additions & 4 deletions xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
View file
Expand Up @@ -1815,9 +1815,9 @@ bool CLinuxRendererGLES::SupportsMultiPassRendering()
return false;
}

bool CLinuxRendererGLES::Supports(EINTERLACEMODE mode)
bool CLinuxRendererGLES::Supports(EDEINTERLACEMODE mode)
{
if (mode == VS_INTERLACEMODE_OFF)
if (mode == VS_DEINTERLACEMODE_OFF)
return true;

if(m_renderMethod & RENDER_OMXEGL)
Expand All @@ -1826,8 +1826,8 @@ bool CLinuxRendererGLES::Supports(EINTERLACEMODE mode)
if(m_renderMethod & RENDER_CVREF)
return false;

if(mode == VS_INTERLACEMODE_AUTO
|| mode == VS_INTERLACEMODE_FORCE)
if(mode == VS_DEINTERLACEMODE_AUTO
|| mode == VS_DEINTERLACEMODE_FORCE)
return true;

return false;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoRenderers/LinuxRendererGLES.h
View file
Expand Up @@ -148,7 +148,7 @@ class CLinuxRendererGLES : public CBaseRenderer
// Feature support
virtual bool SupportsMultiPassRendering();
virtual bool Supports(ERENDERFEATURE feature);
virtual bool Supports(EINTERLACEMODE mode);
virtual bool Supports(EDEINTERLACEMODE mode);
virtual bool Supports(EINTERLACEMETHOD method);
virtual bool Supports(ESCALINGMETHOD method);

Expand Down
8 changes: 4 additions & 4 deletions xbmc/cores/VideoRenderers/RenderManager.cpp
View file
Expand Up @@ -511,15 +511,15 @@ void CXBMCRenderManager::FlipPage(volatile bool& bStop, double timestamp /* = 0L
m_presentfield = sync;
m_presentstep = PRESENT_FLIP;
m_presentsource = source;
EINTERLACEMODE interlacemode = g_settings.m_currentVideoSettings.m_InterlaceMode;
EDEINTERLACEMODE deinterlacemode = g_settings.m_currentVideoSettings.m_DeinterlaceMode;
EINTERLACEMETHOD interlacemethod = g_settings.m_currentVideoSettings.m_InterlaceMethod;
bool invert = false;

if (interlacemode == VS_INTERLACEMODE_OFF)
if (deinterlacemode == VS_DEINTERLACEMODE_OFF)
m_presentmethod = PRESENT_METHOD_SINGLE;
else
{
if (interlacemode == VS_INTERLACEMODE_AUTO && m_presentfield == FS_NONE)
if (deinterlacemode == VS_DEINTERLACEMODE_AUTO && m_presentfield == FS_NONE)
m_presentmethod = PRESENT_METHOD_SINGLE;
else
{
Expand All @@ -544,7 +544,7 @@ void CXBMCRenderManager::FlipPage(volatile bool& bStop, double timestamp /* = 0L
}

/* default to odd field if we want to deinterlace and don't know better */
if (interlacemode == VS_INTERLACEMODE_FORCE && m_presentfield == FS_NONE)
if (deinterlacemode == VS_DEINTERLACEMODE_FORCE && m_presentfield == FS_NONE)
m_presentfield = FS_TOP;

/* invert present field */
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoRenderers/RenderManager.h
View file
Expand Up @@ -117,7 +117,7 @@ class CXBMCRenderManager
return false;
}

bool Supports(EINTERLACEMODE method)
bool Supports(EDEINTERLACEMODE method)
{
CSharedLock lock(m_sharedSection);
if (m_pRenderer)
Expand Down
8 changes: 4 additions & 4 deletions xbmc/cores/VideoRenderers/WinRenderer.cpp
View file
Expand Up @@ -1051,11 +1051,11 @@ bool CWinRenderer::CreateYV12Texture(int index)
return true;
}

bool CWinRenderer::Supports(EINTERLACEMODE mode)
bool CWinRenderer::Supports(EDEINTERLACEMODE mode)
{
if(mode == VS_INTERLACEMODE_OFF
|| mode == VS_INTERLACEMODE_AUTO
|| mode == VS_INTERLACEMODE_FORCE)
if(mode == VS_DEINTERLACEMODE_OFF
|| mode == VS_DEINTERLACEMODE_AUTO
|| mode == VS_DEINTERLACEMODE_FORCE)
return true;

return false;
Expand Down
2 changes: 1 addition & 1 deletion xbmc/cores/VideoRenderers/WinRenderer.h
View file
Expand Up @@ -183,7 +183,7 @@ class CWinRenderer : public CBaseRenderer
virtual bool IsConfigured() { return m_bConfigured; }

virtual bool Supports(ERENDERFEATURE feature);
virtual bool Supports(EINTERLACEMODE mode);
virtual bool Supports(EDEINTERLACEMODE mode);
virtual bool Supports(EINTERLACEMETHOD method);
virtual bool Supports(ESCALINGMETHOD method);

Expand Down
10 changes: 5 additions & 5 deletions xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
View file
Expand Up @@ -603,13 +603,13 @@ void CVDPAU::SetHWUpscaling()
void CVDPAU::SetDeinterlacing()
{
VdpStatus vdp_st;
EINTERLACEMODE mode = g_settings.m_currentVideoSettings.m_InterlaceMode;
EDEINTERLACEMODE mode = g_settings.m_currentVideoSettings.m_DeinterlaceMode;
EINTERLACEMETHOD method = g_settings.m_currentVideoSettings.m_InterlaceMethod;

VdpVideoMixerFeature feature[] = { VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL,
VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL,
VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE };
if (mode == VS_INTERLACEMODE_OFF)
if (mode == VS_DEINTERLACEMODE_OFF)
{
VdpBool enabled[]={0,0,0};
vdp_st = vdp_video_mixer_set_feature_enables(videoMixer, ARSIZE(feature), feature, enabled);
Expand Down Expand Up @@ -1142,7 +1142,7 @@ int CVDPAU::Decode(AVCodecContext *avctx, AVFrame *pFrame)
outRectVid.y1 = OutHeight;
}

EINTERLACEMODE mode = g_settings.m_currentVideoSettings.m_InterlaceMode;
EDEINTERLACEMODE mode = g_settings.m_currentVideoSettings.m_DeinterlaceMode;
EINTERLACEMETHOD method = g_settings.m_currentVideoSettings.m_InterlaceMethod;

if(pFrame)
Expand Down Expand Up @@ -1178,8 +1178,8 @@ int CVDPAU::Decode(AVCodecContext *avctx, AVFrame *pFrame)
m_DVDVideoPics.pop();
}

if (mode == VS_INTERLACEMODE_FORCE
|| (mode == VS_INTERLACEMODE_AUTO && m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED))
if (mode == VS_DEINTERLACEMODE_FORCE
|| (mode == VS_DEINTERLACEMODE_AUTO && m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED))
{
if((method == VS_INTERLACEMETHOD_AUTO
|| method == VS_INTERLACEMETHOD_VDPAU_BOB
Expand Down
8 changes: 4 additions & 4 deletions xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
View file
Expand Up @@ -501,11 +501,11 @@ void CDVDPlayerVideo::Process()
m_pVideoCodec->SetDropState(bRequestDrop);

// ask codec to do deinterlacing if possible
EINTERLACEMODE mIntMode = g_settings.m_currentVideoSettings.m_InterlaceMode;
EDEINTERLACEMODE mDeintMode = g_settings.m_currentVideoSettings.m_DeinterlaceMode;
EINTERLACEMETHOD mInt = g_settings.m_currentVideoSettings.m_InterlaceMethod;
unsigned int mFilters = 0;

if (mIntMode != VS_INTERLACEMODE_OFF)
if (mDeintMode != VS_DEINTERLACEMODE_OFF)
{
if(mInt == VS_INTERLACEMETHOD_AUTO && !g_renderManager.Supports(VS_INTERLACEMETHOD_DXVA_ANY))
mFilters = CDVDVideoCodec::FILTER_DEINTERLACE_ANY | CDVDVideoCodec::FILTER_DEINTERLACE_HALFED;
Expand All @@ -514,7 +514,7 @@ void CDVDPlayerVideo::Process()
else if(mInt == VS_INTERLACEMETHOD_DEINTERLACE_HALF)
mFilters = CDVDVideoCodec::FILTER_DEINTERLACE_ANY | CDVDVideoCodec::FILTER_DEINTERLACE_HALFED;

if (mIntMode == VS_INTERLACEMODE_AUTO && mFilters)
if (mDeintMode == VS_DEINTERLACEMODE_AUTO && mFilters)
mFilters |= CDVDVideoCodec::FILTER_DEINTERLACE_FLAGGED;
}

Expand Down Expand Up @@ -611,7 +611,7 @@ void CDVDPlayerVideo::Process()

//Deinterlace if codec said format was interlaced or if we have selected we want to deinterlace
//this video
if ((mIntMode == VS_INTERLACEMODE_AUTO && (picture.iFlags & DVP_FLAG_INTERLACED)) || mIntMode == VS_INTERLACEMODE_FORCE)
if ((mDeintMode == VS_DEINTERLACEMODE_AUTO && (picture.iFlags & DVP_FLAG_INTERLACED)) || mDeintMode == VS_DEINTERLACEMODE_FORCE)
{
if(!(mFilters & CDVDVideoCodec::FILTER_DEINTERLACE_ANY))
{
Expand Down
4 changes: 2 additions & 2 deletions xbmc/settings/Settings.cpp
View file
Expand Up @@ -678,8 +678,8 @@ bool CSettings::LoadSettings(const CStdString& strSettingsFile)
if (pElement)
{
int interlaceMode;
GetInteger(pElement, "interlacemode", interlaceMode, VS_INTERLACEMODE_OFF, VS_INTERLACEMODE_OFF, VS_INTERLACEMODE_FORCE);
m_defaultVideoSettings.m_InterlaceMode = (EINTERLACEMODE)interlaceMode;
GetInteger(pElement, "interlacemode", interlaceMode, VS_DEINTERLACEMODE_OFF, VS_DEINTERLACEMODE_OFF, VS_DEINTERLACEMODE_FORCE);
m_defaultVideoSettings.m_DeinterlaceMode = (EDEINTERLACEMODE)interlaceMode;
int interlaceMethod;
GetInteger(pElement, "interlacemethod", interlaceMethod, VS_INTERLACEMETHOD_AUTO, VS_INTERLACEMETHOD_AUTO, VS_INTERLACEMETHOD_INVERSE_TELECINE);
m_defaultVideoSettings.m_InterlaceMethod = (EINTERLACEMETHOD)interlaceMethod;
Expand Down
4 changes: 2 additions & 2 deletions xbmc/settings/VideoSettings.cpp
View file
Expand Up @@ -31,7 +31,7 @@

CVideoSettings::CVideoSettings()
{
m_InterlaceMode = VS_INTERLACEMODE_OFF;
m_DeinterlaceMode = VS_DEINTERLACEMODE_OFF;
m_InterlaceMethod = VS_INTERLACEMETHOD_AUTO;
m_ScalingMethod = VS_SCALINGMETHOD_LINEAR;
m_ViewMode = VIEW_MODE_NORMAL;
Expand Down Expand Up @@ -63,7 +63,7 @@ CVideoSettings::CVideoSettings()

bool CVideoSettings::operator!=(const CVideoSettings &right) const
{
if (m_InterlaceMode != right.m_InterlaceMode) return true;
if (m_DeinterlaceMode != right.m_DeinterlaceMode) return true;
if (m_InterlaceMethod != right.m_InterlaceMethod) return true;
if (m_ScalingMethod != right.m_ScalingMethod) return true;
if (m_ViewMode != right.m_ViewMode) return true;
Expand Down
10 changes: 5 additions & 5 deletions xbmc/settings/VideoSettings.h
View file
Expand Up @@ -29,11 +29,11 @@
#pragma once
#endif // _MSC_VER > 1000

enum EINTERLACEMODE
enum EDEINTERLACEMODE
{
VS_INTERLACEMODE_OFF=0,
VS_INTERLACEMODE_AUTO=1,
VS_INTERLACEMODE_FORCE=2
VS_DEINTERLACEMODE_OFF=0,
VS_DEINTERLACEMODE_AUTO=1,
VS_DEINTERLACEMODE_FORCE=2
};

enum EINTERLACEMETHOD
Expand Down Expand Up @@ -97,7 +97,7 @@ class CVideoSettings

bool operator!=(const CVideoSettings &right) const;

EINTERLACEMODE m_InterlaceMode;
EDEINTERLACEMODE m_DeinterlaceMode;
EINTERLACEMETHOD m_InterlaceMethod;
ESCALINGMETHOD m_ScalingMethod;
int m_ViewMode; // current view mode
Expand Down
12 changes: 6 additions & 6 deletions xbmc/video/dialogs/GUIDialogVideoSettings.cpp
View file
Expand Up @@ -66,7 +66,7 @@ CGUIDialogVideoSettings::~CGUIDialogVideoSettings(void)
#define VIDEO_SETTINGS_NONLIN_STRETCH 21
#define VIDEO_SETTINGS_POSTPROCESS 22
#define VIDEO_SETTINGS_VERTICAL_SHIFT 23
#define VIDEO_SETTINGS_INTERLACEMODE 24
#define VIDEO_SETTINGS_DEINTERLACEMODE 24

void CGUIDialogVideoSettings::CreateSettings()
{
Expand All @@ -76,20 +76,20 @@ void CGUIDialogVideoSettings::CreateSettings()
// create our settings
{
vector<pair<int, int> > entries;
entries.push_back(make_pair(VS_INTERLACEMODE_OFF , 16039));
entries.push_back(make_pair(VS_INTERLACEMODE_AUTO , 16040));
entries.push_back(make_pair(VS_INTERLACEMODE_FORCE , 16041));
entries.push_back(make_pair(VS_DEINTERLACEMODE_OFF , 16039));
entries.push_back(make_pair(VS_DEINTERLACEMODE_AUTO , 16040));
entries.push_back(make_pair(VS_DEINTERLACEMODE_FORCE , 16041));

/* remove unsupported methods */
for(vector<pair<int, int> >::iterator it = entries.begin(); it != entries.end();)
{
if(g_renderManager.Supports((EINTERLACEMODE)it->first))
if(g_renderManager.Supports((EDEINTERLACEMODE)it->first))
it++;
else
it = entries.erase(it);
}

AddSpin(VIDEO_SETTINGS_INTERLACEMODE, 16037, (int*)&g_settings.m_currentVideoSettings.m_InterlaceMode, entries);
AddSpin(VIDEO_SETTINGS_DEINTERLACEMODE, 16037, (int*)&g_settings.m_currentVideoSettings.m_DeinterlaceMode, entries);
}
{
vector<pair<int, int> > entries;
Expand Down

0 comments on commit a9f4307

Please sign in to comment.