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
7b11525d
Commit
7b11525d
authored
Nov 21, 2014
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mft: Rename function pointer.
They collide with the actual functions
parent
f4bf662c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
15 deletions
+15
-15
modules/codec/mft.c
modules/codec/mft.c
+15
-15
No files found.
modules/codec/mft.c
View file @
7b11525d
...
@@ -64,13 +64,13 @@ vlc_module_end()
...
@@ -64,13 +64,13 @@ vlc_module_end()
typedef
struct
typedef
struct
{
{
HINSTANCE
mfplat_dll
;
HINSTANCE
mfplat_dll
;
HRESULT
(
STDCALL
*
MFTEnumEx
)(
GUID
guidCategory
,
UINT32
Flags
,
HRESULT
(
STDCALL
*
fptr_
MFTEnumEx
)(
GUID
guidCategory
,
UINT32
Flags
,
const
MFT_REGISTER_TYPE_INFO
*
pInputType
,
const
MFT_REGISTER_TYPE_INFO
*
pInputType
,
const
MFT_REGISTER_TYPE_INFO
*
pOutputType
,
const
MFT_REGISTER_TYPE_INFO
*
pOutputType
,
IMFActivate
***
pppMFTActivate
,
UINT32
*
pcMFTActivate
);
IMFActivate
***
pppMFTActivate
,
UINT32
*
pcMFTActivate
);
HRESULT
(
STDCALL
*
MFCreateSample
)(
IMFSample
**
ppIMFSample
);
HRESULT
(
STDCALL
*
fptr_
MFCreateSample
)(
IMFSample
**
ppIMFSample
);
HRESULT
(
STDCALL
*
MFCreateMemoryBuffer
)(
DWORD
cbMaxLength
,
IMFMediaBuffer
**
ppBuffer
);
HRESULT
(
STDCALL
*
fptr_
MFCreateMemoryBuffer
)(
DWORD
cbMaxLength
,
IMFMediaBuffer
**
ppBuffer
);
HRESULT
(
STDCALL
*
MFCreateAlignedMemoryBuffer
)(
DWORD
cbMaxLength
,
DWORD
fAlignmentFlags
,
IMFMediaBuffer
**
ppBuffer
);
HRESULT
(
STDCALL
*
fptr_
MFCreateAlignedMemoryBuffer
)(
DWORD
cbMaxLength
,
DWORD
fAlignmentFlags
,
IMFMediaBuffer
**
ppBuffer
);
}
MFHandle
;
}
MFHandle
;
struct
decoder_sys_t
struct
decoder_sys_t
...
@@ -461,13 +461,13 @@ static int AllocateInputSample(decoder_t *p_dec, DWORD stream_id, IMFSample** re
...
@@ -461,13 +461,13 @@ static int AllocateInputSample(decoder_t *p_dec, DWORD stream_id, IMFSample** re
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
goto
error
;
goto
error
;
hr
=
mf
->
MFCreateSample
(
&
input_sample
);
hr
=
mf
->
fptr_
MFCreateSample
(
&
input_sample
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
goto
error
;
goto
error
;
IMFMediaBuffer
*
input_media_buffer
=
NULL
;
IMFMediaBuffer
*
input_media_buffer
=
NULL
;
DWORD
allocation_size
=
__MAX
(
input_info
.
cbSize
,
size
);
DWORD
allocation_size
=
__MAX
(
input_info
.
cbSize
,
size
);
hr
=
mf
->
MFCreateMemoryBuffer
(
allocation_size
,
&
input_media_buffer
);
hr
=
mf
->
fptr_
MFCreateMemoryBuffer
(
allocation_size
,
&
input_media_buffer
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
goto
error
;
goto
error
;
...
@@ -518,7 +518,7 @@ static int AllocateOutputSample(decoder_t *p_dec, DWORD stream_id, IMFSample **r
...
@@ -518,7 +518,7 @@ static int AllocateOutputSample(decoder_t *p_dec, DWORD stream_id, IMFSample **r
if
((
output_info
.
dwFlags
&
expected_flags
)
!=
expected_flags
)
if
((
output_info
.
dwFlags
&
expected_flags
)
!=
expected_flags
)
goto
error
;
goto
error
;
hr
=
mf
->
MFCreateSample
(
&
output_sample
);
hr
=
mf
->
fptr_
MFCreateSample
(
&
output_sample
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
goto
error
;
goto
error
;
...
@@ -526,9 +526,9 @@ static int AllocateOutputSample(decoder_t *p_dec, DWORD stream_id, IMFSample **r
...
@@ -526,9 +526,9 @@ static int AllocateOutputSample(decoder_t *p_dec, DWORD stream_id, IMFSample **r
DWORD
allocation_size
=
output_info
.
cbSize
;
DWORD
allocation_size
=
output_info
.
cbSize
;
DWORD
alignment
=
output_info
.
cbAlignment
;
DWORD
alignment
=
output_info
.
cbAlignment
;
if
(
alignment
>
0
)
if
(
alignment
>
0
)
hr
=
mf
->
MFCreateAlignedMemoryBuffer
(
allocation_size
,
alignment
-
1
,
&
output_media_buffer
);
hr
=
mf
->
fptr_
MFCreateAlignedMemoryBuffer
(
allocation_size
,
alignment
-
1
,
&
output_media_buffer
);
else
else
hr
=
mf
->
MFCreateMemoryBuffer
(
allocation_size
,
&
output_media_buffer
);
hr
=
mf
->
fptr_
MFCreateMemoryBuffer
(
allocation_size
,
&
output_media_buffer
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
goto
error
;
goto
error
;
...
@@ -1060,7 +1060,7 @@ static int FindMFT(decoder_t *p_dec)
...
@@ -1060,7 +1060,7 @@ static int FindMFT(decoder_t *p_dec)
MFT_REGISTER_TYPE_INFO
input_type
=
{
*
p_sys
->
major_type
,
*
p_sys
->
subtype
};
MFT_REGISTER_TYPE_INFO
input_type
=
{
*
p_sys
->
major_type
,
*
p_sys
->
subtype
};
IMFActivate
**
activate_objects
=
NULL
;
IMFActivate
**
activate_objects
=
NULL
;
UINT32
activate_objects_count
=
0
;
UINT32
activate_objects_count
=
0
;
hr
=
mf
->
MFTEnumEx
(
category
,
flags
,
&
input_type
,
NULL
,
&
activate_objects
,
&
activate_objects_count
);
hr
=
mf
->
fptr_
MFTEnumEx
(
category
,
flags
,
&
input_type
,
NULL
,
&
activate_objects
,
&
activate_objects_count
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -1092,11 +1092,11 @@ static int LoadMFTLibrary(MFHandle *mf)
...
@@ -1092,11 +1092,11 @@ static int LoadMFTLibrary(MFHandle *mf)
if
(
!
mf
->
mfplat_dll
)
if
(
!
mf
->
mfplat_dll
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
mf
->
MFTEnumEx
=
(
void
*
)
GetProcAddress
(
mf
->
mfplat_dll
,
"MFTEnumEx"
);
mf
->
fptr_
MFTEnumEx
=
(
void
*
)
GetProcAddress
(
mf
->
mfplat_dll
,
"MFTEnumEx"
);
mf
->
MFCreateSample
=
(
void
*
)
GetProcAddress
(
mf
->
mfplat_dll
,
"MFCreateSample"
);
mf
->
fptr_
MFCreateSample
=
(
void
*
)
GetProcAddress
(
mf
->
mfplat_dll
,
"MFCreateSample"
);
mf
->
MFCreateMemoryBuffer
=
(
void
*
)
GetProcAddress
(
mf
->
mfplat_dll
,
"MFCreateMemoryBuffer"
);
mf
->
fptr_
MFCreateMemoryBuffer
=
(
void
*
)
GetProcAddress
(
mf
->
mfplat_dll
,
"MFCreateMemoryBuffer"
);
mf
->
MFCreateAlignedMemoryBuffer
=
(
void
*
)
GetProcAddress
(
mf
->
mfplat_dll
,
"MFCreateAlignedMemoryBuffer"
);
mf
->
fptr_
MFCreateAlignedMemoryBuffer
=
(
void
*
)
GetProcAddress
(
mf
->
mfplat_dll
,
"MFCreateAlignedMemoryBuffer"
);
if
(
!
mf
->
MFTEnumEx
||
!
mf
->
MFCreateSample
||
!
mf
->
MFCreateMemoryBuffer
||
!
mf
->
MFCreateAlignedMemoryBuffer
)
if
(
!
mf
->
fptr_MFTEnumEx
||
!
mf
->
fptr_MFCreateSample
||
!
mf
->
fptr_MFCreateMemoryBuffer
||
!
mf
->
fptr_
MFCreateAlignedMemoryBuffer
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
...
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