Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
a1380902
Commit
a1380902
authored
May 11, 2018
by
Zebediah Figura
Committed by
Alexandre Julliard
May 11, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mp3dmod: Implement ProcessOutput().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
b5815f1d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
2 deletions
+75
-2
mp3dmod.c
dlls/mp3dmod/mp3dmod.c
+68
-2
mediaobj.idl
include/mediaobj.idl
+7
-0
No files found.
dlls/mp3dmod/mp3dmod.c
View file @
a1380902
...
...
@@ -19,6 +19,7 @@
*/
#include <stdarg.h>
#include <stdio.h>
#include <mpg123.h>
#include "windef.h"
#include "winbase.h"
...
...
@@ -289,11 +290,76 @@ static HRESULT WINAPI MediaObject_ProcessInput(IMediaObject *iface, DWORD index,
return
S_OK
;
}
static
DWORD
get_framesize
(
DMO_MEDIA_TYPE
*
type
)
{
WAVEFORMATEX
*
format
=
(
WAVEFORMATEX
*
)
type
->
pbFormat
;
return
1152
*
format
->
nBlockAlign
;
}
static
HRESULT
WINAPI
MediaObject_ProcessOutput
(
IMediaObject
*
iface
,
DWORD
flags
,
DWORD
count
,
DMO_OUTPUT_DATA_BUFFER
*
buffers
,
DWORD
*
status
)
{
FIXME
(
"(%p)->(%x, %d, %p, %p) stub!
\n
"
,
iface
,
flags
,
count
,
buffers
,
status
);
struct
mp3_decoder
*
This
=
impl_from_IMediaObject
(
iface
);
DWORD
len
,
maxlen
,
framesize
;
int
got_data
=
0
;
size_t
written
;
HRESULT
hr
;
BYTE
*
data
;
int
err
;
return
E_NOTIMPL
;
TRACE
(
"(%p)->(%#x, %d, %p, %p)
\n
"
,
iface
,
flags
,
count
,
buffers
,
status
);
if
(
count
>
1
)
FIXME
(
"Multiple buffers not handled.
\n
"
);
buffers
[
0
].
dwStatus
=
0
;
if
(
!
This
->
buffer
)
return
S_FALSE
;
buffers
[
0
].
dwStatus
|=
DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT
;
hr
=
IMediaBuffer_GetBufferAndLength
(
buffers
[
0
].
pBuffer
,
&
data
,
&
len
);
if
(
FAILED
(
hr
))
return
hr
;
hr
=
IMediaBuffer_GetMaxLength
(
buffers
[
0
].
pBuffer
,
&
maxlen
);
if
(
FAILED
(
hr
))
return
hr
;
framesize
=
get_framesize
(
&
This
->
outtype
);
while
(
1
)
{
if
(
maxlen
-
len
<
framesize
)
{
buffers
[
0
].
dwStatus
|=
DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE
;
break
;
}
while
((
err
=
mpg123_read
(
This
->
mh
,
data
+
len
,
framesize
,
&
written
))
==
MPG123_NEW_FORMAT
);
if
(
err
==
MPG123_NEED_MORE
)
{
IMediaBuffer_Release
(
This
->
buffer
);
This
->
buffer
=
NULL
;
break
;
}
else
if
(
err
==
MPG123_ERR
)
ERR
(
"mpg123_read() failed: %s
\n
"
,
mpg123_strerror
(
This
->
mh
));
else
if
(
err
!=
MPG123_OK
)
ERR
(
"mpg123_read() returned %d
\n
"
,
err
);
if
(
written
<
framesize
)
ERR
(
"short write: %zd/%u
\n
"
,
written
,
framesize
);
got_data
=
1
;
len
+=
framesize
;
hr
=
IMediaBuffer_SetLength
(
buffers
[
0
].
pBuffer
,
len
);
if
(
FAILED
(
hr
))
return
hr
;
}
if
(
got_data
)
{
return
S_OK
;
}
return
S_FALSE
;
}
static
HRESULT
WINAPI
MediaObject_Lock
(
IMediaObject
*
iface
,
LONG
lock
)
...
...
include/mediaobj.idl
View file @
a1380902
...
...
@@ -107,6 +107,13 @@ enum _DMO_SET_TYPE_FLAGS {
DMO_SET_TYPEF_CLEAR
=
0
x00000002
,
}
;
enum
_DMO_OUTPUT_DATA_BUFFERF_FLAGS
{
DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT
=
0
x00000001
,
DMO_OUTPUT_DATA_BUFFERF_TIME
=
0
x00000002
,
DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH
=
0
x00000004
,
DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE
=
0
x01000000
,
}
;
/*****************************************************************************
*
IMediaObject
interface
*/
...
...
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