Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
4f242f09
Commit
4f242f09
authored
Jun 07, 2022
by
Rémi Bernon
Committed by
Alexandre Julliard
Jun 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegstreamer: Rename mf_(create|destroy)_wg_sample helpers.
Signed-off-by:
Rémi Bernon
<
rbernon@codeweavers.com
>
parent
240aff38
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
gst_private.h
dlls/winegstreamer/gst_private.h
+2
-2
h264_decoder.c
dlls/winegstreamer/h264_decoder.c
+5
-5
mfplat.c
dlls/winegstreamer/mfplat.c
+2
-2
wma_decoder.c
dlls/winegstreamer/wma_decoder.c
+6
-6
No files found.
dlls/winegstreamer/gst_private.h
View file @
4f242f09
...
...
@@ -120,8 +120,8 @@ extern HRESULT mfplat_DllRegisterServer(void);
IMFMediaType
*
mf_media_type_from_wg_format
(
const
struct
wg_format
*
format
);
void
mf_media_type_to_wg_format
(
IMFMediaType
*
type
,
struct
wg_format
*
format
);
HRESULT
mf_create_wg_sample
(
IMFSample
*
sample
,
struct
wg_sample
**
out
);
void
mf_destroy_wg_sampl
e
(
struct
wg_sample
*
wg_sample
);
HRESULT
wg_sample_create_mf
(
IMFSample
*
sample
,
struct
wg_sample
**
out
);
void
wg_sample_releas
e
(
struct
wg_sample
*
wg_sample
);
HRESULT
wg_transform_push_mf
(
struct
wg_transform
*
transform
,
struct
wg_sample
*
sample
);
HRESULT
wg_transform_read_mf
(
struct
wg_transform
*
transform
,
struct
wg_sample
*
sample
,
...
...
dlls/winegstreamer/h264_decoder.c
View file @
4f242f09
...
...
@@ -540,11 +540,11 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS
if
(
!
decoder
->
wg_transform
)
return
MF_E_TRANSFORM_TYPE_NOT_SET
;
if
(
FAILED
(
hr
=
mf_create_wg_sample
(
sample
,
&
wg_sample
)))
if
(
FAILED
(
hr
=
wg_sample_create_mf
(
sample
,
&
wg_sample
)))
return
hr
;
hr
=
wg_transform_push_mf
(
decoder
->
wg_transform
,
wg_sample
);
mf_destroy_wg_sampl
e
(
wg_sample
);
wg_sample_releas
e
(
wg_sample
);
return
hr
;
}
...
...
@@ -573,17 +573,17 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
samples
[
0
].
dwStatus
=
0
;
if
(
!
samples
[
0
].
pSample
)
return
E_INVALIDARG
;
if
(
FAILED
(
hr
=
mf_create_wg_sample
(
samples
[
0
].
pSample
,
&
wg_sample
)))
if
(
FAILED
(
hr
=
wg_sample_create_mf
(
samples
[
0
].
pSample
,
&
wg_sample
)))
return
hr
;
if
(
wg_sample
->
max_size
<
info
.
cbSize
)
{
mf_destroy_wg_sampl
e
(
wg_sample
);
wg_sample_releas
e
(
wg_sample
);
return
MF_E_BUFFERTOOSMALL
;
}
hr
=
wg_transform_read_mf
(
decoder
->
wg_transform
,
wg_sample
,
&
wg_format
);
mf_destroy_wg_sampl
e
(
wg_sample
);
wg_sample_releas
e
(
wg_sample
);
if
(
hr
==
MF_E_TRANSFORM_STREAM_CHANGE
)
{
...
...
dlls/winegstreamer/mfplat.c
View file @
4f242f09
...
...
@@ -965,7 +965,7 @@ struct mf_sample
struct
wg_sample
wg_sample
;
};
HRESULT
mf_create_wg_sample
(
IMFSample
*
sample
,
struct
wg_sample
**
out
)
HRESULT
wg_sample_create_mf
(
IMFSample
*
sample
,
struct
wg_sample
**
out
)
{
DWORD
current_length
,
max_length
;
struct
mf_sample
*
mf_sample
;
...
...
@@ -995,7 +995,7 @@ out:
return
hr
;
}
void
mf_destroy_wg_sampl
e
(
struct
wg_sample
*
wg_sample
)
void
wg_sample_releas
e
(
struct
wg_sample
*
wg_sample
)
{
struct
mf_sample
*
mf_sample
=
CONTAINING_RECORD
(
wg_sample
,
struct
mf_sample
,
wg_sample
);
...
...
dlls/winegstreamer/wma_decoder.c
View file @
4f242f09
...
...
@@ -534,18 +534,18 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS
if
(
FAILED
(
hr
=
IMFTransform_GetInputStreamInfo
(
iface
,
0
,
&
info
)))
return
hr
;
if
(
FAILED
(
hr
=
mf_create_wg_sample
(
sample
,
&
wg_sample
)))
if
(
FAILED
(
hr
=
wg_sample_create_mf
(
sample
,
&
wg_sample
)))
return
hr
;
/* WMA transform uses fixed size input samples and ignores samples with invalid sizes */
if
(
wg_sample
->
size
%
info
.
cbSize
)
{
mf_destroy_wg_sampl
e
(
wg_sample
);
wg_sample_releas
e
(
wg_sample
);
return
S_OK
;
}
hr
=
wg_transform_push_mf
(
decoder
->
wg_transform
,
wg_sample
);
mf_destroy_wg_sampl
e
(
wg_sample
);
wg_sample_releas
e
(
wg_sample
);
return
hr
;
}
...
...
@@ -576,13 +576,13 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
return
MF_E_TRANSFORM_NEED_MORE_INPUT
;
}
if
(
FAILED
(
hr
=
mf_create_wg_sample
(
samples
[
0
].
pSample
,
&
wg_sample
)))
if
(
FAILED
(
hr
=
wg_sample_create_mf
(
samples
[
0
].
pSample
,
&
wg_sample
)))
return
hr
;
wg_sample
->
size
=
0
;
if
(
wg_sample
->
max_size
<
info
.
cbSize
)
{
mf_destroy_wg_sampl
e
(
wg_sample
);
wg_sample_releas
e
(
wg_sample
);
return
MF_E_BUFFERTOOSMALL
;
}
...
...
@@ -592,7 +592,7 @@ static HRESULT WINAPI transform_ProcessOutput(IMFTransform *iface, DWORD flags,
samples
[
0
].
dwStatus
|=
MFT_OUTPUT_DATA_BUFFER_INCOMPLETE
;
}
mf_destroy_wg_sampl
e
(
wg_sample
);
wg_sample_releas
e
(
wg_sample
);
if
(
hr
==
MF_E_TRANSFORM_STREAM_CHANGE
)
{
...
...
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