Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
607d0272
Commit
607d0272
authored
May 14, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dshow: fix warnings
parent
b5386f68
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
22 deletions
+21
-22
modules/access/dshow/dshow.cpp
modules/access/dshow/dshow.cpp
+8
-6
modules/access/dshow/filter.cpp
modules/access/dshow/filter.cpp
+13
-16
No files found.
modules/access/dshow/dshow.cpp
View file @
607d0272
...
...
@@ -2013,7 +2013,7 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
* config variable callback
*****************************************************************************/
static
int
FindDevicesCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_name
,
vlc_value_t
newval
,
vlc_value_t
oldval
,
void
*
)
vlc_value_t
,
vlc_value_t
,
void
*
)
{
module_config_t
*
p_item
;
bool
b_audio
=
false
;
...
...
@@ -2075,7 +2075,7 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
}
static
int
ConfigDevicesCallback
(
vlc_object_t
*
p_this
,
char
const
*
psz_name
,
vlc_value_t
newval
,
vlc_value_t
oldval
,
void
*
)
vlc_value_t
newval
,
vlc_value_t
,
void
*
)
{
module_config_t
*
p_item
;
bool
b_audio
=
false
;
...
...
@@ -2285,8 +2285,9 @@ static void ShowTunerProperties( vlc_object_t *p_this,
static
void
ConfigTuner
(
vlc_object_t
*
p_this
,
ICaptureGraphBuilder2
*
p_graph
,
IBaseFilter
*
p_device_filter
)
{
int
i_channel
,
i_country
,
i_input
,
i_amtuner_mode
,
i_standard
,
i_frequency
;
int
i_channel
,
i_country
,
i_input
,
i_amtuner_mode
,
i_standard
;
long
l_modes
=
0
;
unsigned
i_frequency
;
IAMTVTuner
*
p_TV
;
HRESULT
hr
;
...
...
@@ -2380,9 +2381,10 @@ static void ConfigTuner( vlc_object_t *p_this, ICaptureGraphBuilder2 *p_graph,
goto
free_on_error
;
}
msg_Dbg
(
p_this
,
"Frequency range supproted from %d to %d."
,
ModeCaps
.
MinFrequency
,
ModeCaps
.
MaxFrequency
);
msg_Dbg
(
p_this
,
"Video standards supproted by the tuner: "
);
for
(
int
i
=
0
;
i
<
ARRAY_SIZE
(
ppsz_standards_list_text
);
i
++
)
{
msg_Dbg
(
p_this
,
"Frequency range supported from %ld to %ld."
,
ModeCaps
.
MinFrequency
,
ModeCaps
.
MaxFrequency
);
msg_Dbg
(
p_this
,
"Video standards supported by the tuner: "
);
for
(
size_t
i
=
0
;
i
<
ARRAY_SIZE
(
ppsz_standards_list_text
);
i
++
)
{
if
(
ModeCaps
.
StandardsSupported
&
i_standards_list
[
i
])
msg_Dbg
(
p_this
,
"%s, "
,
ppsz_standards_list_text
[
i
]);
}
...
...
modules/access/dshow/filter.cpp
View file @
607d0272
...
...
@@ -330,7 +330,7 @@ STDMETHODIMP_(ULONG) CapturePin::Release()
};
/* IPin methods */
STDMETHODIMP
CapturePin
::
Connect
(
IPin
*
pReceivePin
,
STDMETHODIMP
CapturePin
::
Connect
(
IPin
*
,
const
AM_MEDIA_TYPE
*
pmt
)
{
if
(
State_Running
==
p_filter
->
state
)
...
...
@@ -562,7 +562,7 @@ STDMETHODIMP CapturePin::EnumMediaTypes( IEnumMediaTypes **ppEnum )
return
NOERROR
;
}
STDMETHODIMP
CapturePin
::
QueryInternalConnections
(
IPin
*
*
apPin
,
ULONG
*
nPin
)
STDMETHODIMP
CapturePin
::
QueryInternalConnections
(
IPin
*
*
,
ULONG
*
)
{
#ifdef DEBUG_DSHOW_L1
msg_Dbg
(
p_input
,
"CapturePin::QueryInternalConnections"
);
...
...
@@ -602,9 +602,7 @@ STDMETHODIMP CapturePin::EndFlush( void )
return
S_OK
;
}
STDMETHODIMP
CapturePin
::
NewSegment
(
REFERENCE_TIME
tStart
,
REFERENCE_TIME
tStop
,
double
dRate
)
STDMETHODIMP
CapturePin
::
NewSegment
(
REFERENCE_TIME
,
REFERENCE_TIME
,
double
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CapturePin::NewSegment"
);
...
...
@@ -613,7 +611,7 @@ STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME tStart,
}
/* IMemInputPin methods */
STDMETHODIMP
CapturePin
::
GetAllocator
(
IMemAllocator
**
ppAllocator
)
STDMETHODIMP
CapturePin
::
GetAllocator
(
IMemAllocator
**
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CapturePin::GetAllocator"
);
...
...
@@ -621,8 +619,7 @@ STDMETHODIMP CapturePin::GetAllocator( IMemAllocator **ppAllocator )
return
VFW_E_NO_ALLOCATOR
;
}
STDMETHODIMP
CapturePin
::
NotifyAllocator
(
IMemAllocator
*
pAllocator
,
BOOL
bReadOnly
)
STDMETHODIMP
CapturePin
::
NotifyAllocator
(
IMemAllocator
*
,
BOOL
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CapturePin::NotifyAllocator"
);
...
...
@@ -630,7 +627,7 @@ STDMETHODIMP CapturePin::NotifyAllocator( IMemAllocator *pAllocator,
return
S_OK
;
}
STDMETHODIMP
CapturePin
::
GetAllocatorRequirements
(
ALLOCATOR_PROPERTIES
*
pProps
)
STDMETHODIMP
CapturePin
::
GetAllocatorRequirements
(
ALLOCATOR_PROPERTIES
*
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CapturePin::GetAllocatorRequirements"
);
...
...
@@ -774,7 +771,7 @@ STDMETHODIMP_(ULONG) CaptureFilter::Release()
};
/* IPersist method */
STDMETHODIMP
CaptureFilter
::
GetClassID
(
CLSID
*
pClsID
)
STDMETHODIMP
CaptureFilter
::
GetClassID
(
CLSID
*
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CaptureFilter::GetClassID"
);
...
...
@@ -783,7 +780,7 @@ STDMETHODIMP CaptureFilter::GetClassID(CLSID *pClsID)
};
/* IMediaFilter methods */
STDMETHODIMP
CaptureFilter
::
GetState
(
DWORD
dwMSecs
,
FILTER_STATE
*
State
)
STDMETHODIMP
CaptureFilter
::
GetState
(
DWORD
,
FILTER_STATE
*
State
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CaptureFilter::GetState %i"
,
state
);
...
...
@@ -792,7 +789,7 @@ STDMETHODIMP CaptureFilter::GetState(DWORD dwMSecs, FILTER_STATE *State)
*
State
=
state
;
return
S_OK
;
};
STDMETHODIMP
CaptureFilter
::
SetSyncSource
(
IReferenceClock
*
pClock
)
STDMETHODIMP
CaptureFilter
::
SetSyncSource
(
IReferenceClock
*
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CaptureFilter::SetSyncSource"
);
...
...
@@ -829,7 +826,7 @@ STDMETHODIMP CaptureFilter::Pause()
state
=
State_Paused
;
return
S_OK
;
};
STDMETHODIMP
CaptureFilter
::
Run
(
REFERENCE_TIME
tStart
)
STDMETHODIMP
CaptureFilter
::
Run
(
REFERENCE_TIME
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CaptureFilter::Run"
);
...
...
@@ -850,7 +847,7 @@ STDMETHODIMP CaptureFilter::EnumPins( IEnumPins ** ppEnum )
*
ppEnum
=
new
CaptureEnumPins
(
p_input
,
this
,
NULL
);
return
*
ppEnum
==
NULL
?
E_OUTOFMEMORY
:
NOERROR
;
};
STDMETHODIMP
CaptureFilter
::
FindPin
(
LPCWSTR
Id
,
IPin
**
ppPin
)
STDMETHODIMP
CaptureFilter
::
FindPin
(
LPCWSTR
,
IPin
**
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CaptureFilter::FindPin"
);
...
...
@@ -871,7 +868,7 @@ STDMETHODIMP CaptureFilter::QueryFilterInfo( FILTER_INFO * pInfo )
return
NOERROR
;
};
STDMETHODIMP
CaptureFilter
::
JoinFilterGraph
(
IFilterGraph
*
pGraph
,
LPCWSTR
pName
)
LPCWSTR
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CaptureFilter::JoinFilterGraph"
);
...
...
@@ -881,7 +878,7 @@ STDMETHODIMP CaptureFilter::JoinFilterGraph( IFilterGraph * pGraph,
return
NOERROR
;
};
STDMETHODIMP
CaptureFilter
::
QueryVendorInfo
(
LPWSTR
*
pVendorInfo
)
STDMETHODIMP
CaptureFilter
::
QueryVendorInfo
(
LPWSTR
*
)
{
#ifdef DEBUG_DSHOW
msg_Dbg
(
p_input
,
"CaptureFilter::QueryVendorInfo"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment