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
658db7a8
Commit
658db7a8
authored
Jun 25, 2005
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Most compiler warning fixed
parent
c5c9ae6f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
7 deletions
+12
-7
modules/codec/dmo/buffer.c
modules/codec/dmo/buffer.c
+1
-1
modules/codec/dmo/dmo.c
modules/codec/dmo/dmo.c
+8
-6
modules/codec/dmo/dmo.h
modules/codec/dmo/dmo.h
+3
-0
No files found.
modules/codec/dmo/buffer.c
View file @
658db7a8
...
...
@@ -88,7 +88,7 @@ static long STDCALL Release( IUnknown *This )
static
long
STDCALL
SetLength
(
IMediaBuffer
*
This
,
uint32_t
cbLength
)
{
CMediaBuffer
*
p_mb
=
(
CMediaBuffer
*
)
This
;
if
(
cbLength
>
p_mb
->
i_max_size
)
return
E_INVALIDARG
;
if
(
cbLength
>
(
uint32_t
)
p_mb
->
i_max_size
)
return
E_INVALIDARG
;
p_mb
->
p_block
->
i_buffer
=
cbLength
;
return
S_OK
;
}
...
...
modules/codec/dmo/dmo.c
View file @
658db7a8
...
...
@@ -391,7 +391,8 @@ static int DecOpen( vlc_object_t *p_this )
{
BITMAPINFOHEADER
*
p_bih
;
DMO_MEDIA_TYPE
mt
;
int
i_chroma
=
VLC_FOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
),
i_planes
=
1
,
i_bpp
=
16
;
unsigned
i_chroma
=
VLC_FOURCC
(
'Y'
,
'U'
,
'Y'
,
'2'
);
int
i_planes
=
1
,
i_bpp
=
16
;
int
i
=
0
;
/* Find out which chroma to use */
...
...
@@ -549,7 +550,7 @@ static int LoadDMO( vlc_object_t *p_this, HINSTANCE *p_hmsdmo_dll,
GETCLASS
GetClass
;
IClassFactory
*
cFactory
=
NULL
;
IUnknown
*
cObject
=
NULL
;
codec_dll
*
codecs_table
=
b_out
?
encoders_table
:
decoders_table
;
co
nst
co
dec_dll
*
codecs_table
=
b_out
?
encoders_table
:
decoders_table
;
int
i_codec
;
/* Look for a DMO which can handle the requested codec */
...
...
@@ -634,9 +635,10 @@ static int LoadDMO( vlc_object_t *p_this, HINSTANCE *p_hmsdmo_dll,
}
return
VLC_SUCCESS
;
loader:
#endif
/* LOADER */
loader:
for
(
i_codec
=
0
;
codecs_table
[
i_codec
].
i_fourcc
!=
0
;
i_codec
++
)
{
if
(
codecs_table
[
i_codec
].
i_fourcc
==
p_fmt
->
i_codec
)
...
...
@@ -788,7 +790,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
#endif
return
NULL
;
}
else
if
(
i_result
==
DMO_E_NOTACCEPTING
)
else
if
(
i_result
==
(
int
)
DMO_E_NOTACCEPTING
)
{
/* Need to call ProcessOutput */
msg_Dbg
(
p_dec
,
"ProcessInput(): not accepting"
);
...
...
@@ -1113,7 +1115,7 @@ static int EncoderSetVideoType( encoder_t *p_enc, IMediaObject *p_dmo )
memcpy
(
p_vih
,
dmo_type
.
pbFormat
,
dmo_type
.
cbFormat
);
memcpy
(
((
uint8_t
*
)
p_vih
)
+
dmo_type
.
cbFormat
,
p_data
,
i_data
);
DMOFreeMediaType
(
&
dmo_type
);
dmo_type
.
pbFormat
=
p_vih
;
dmo_type
.
pbFormat
=
(
char
*
)
p_vih
;
dmo_type
.
cbFormat
=
i_vih
;
msg_Dbg
(
p_enc
,
"found extra data: %i"
,
i_data
);
...
...
@@ -1452,7 +1454,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data )
#endif
return
NULL
;
}
else
if
(
i_result
==
DMO_E_NOTACCEPTING
)
else
if
(
i_result
==
(
int
)
DMO_E_NOTACCEPTING
)
{
/* Need to call ProcessOutput */
msg_Dbg
(
p_enc
,
"ProcessInput(): not accepting"
);
...
...
modules/codec/dmo/dmo.h
View file @
658db7a8
...
...
@@ -37,6 +37,9 @@ static const GUID MEDIASUBTYPE_YV12 = {0x32315659, 0x0000, 0x0010, {0x80, 0x00,
static
const
GUID
MEDIASUBTYPE_RGB24
=
{
0xe436eb7d
,
0x524f
,
0x11ce
,
{
0x9f
,
0x53
,
0x00
,
0x20
,
0xaf
,
0x0b
,
0xa7
,
0x70
}};
static
const
GUID
MEDIASUBTYPE_RGB565
=
{
0xe436eb7b
,
0x524f
,
0x11ce
,
{
0x9f
,
0x53
,
0x00
,
0x20
,
0xaf
,
0x0b
,
0xa7
,
0x70
}};
void
*
CoTaskMemAlloc
(
unsigned
long
cb
);
void
CoTaskMemFree
(
void
*
cb
);
#define IUnknown IUnknownHack
#define IClassFactory IClassFactoryHack
typedef
struct
_IUnknown
IUnknown
;
...
...
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