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
6446382c
Commit
6446382c
authored
Feb 07, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
faudio: Import upstream release 22.02.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
0894a4ad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
FAudio.h
libs/faudio/include/FAudio.h
+1
-1
FAudio_platform_win32.c
libs/faudio/src/FAudio_platform_win32.c
+13
-3
No files found.
libs/faudio/include/FAudio.h
View file @
6446382c
...
...
@@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT;
#define FAUDIO_ABI_VERSION 0
#define FAUDIO_MAJOR_VERSION 22
#define FAUDIO_MINOR_VERSION
1
#define FAUDIO_MINOR_VERSION
2
#define FAUDIO_PATCH_VERSION 0
#define FAUDIO_COMPILED_VERSION ( \
...
...
libs/faudio/src/FAudio_platform_win32.c
View file @
6446382c
...
...
@@ -399,6 +399,12 @@ uint32_t FAudio_PlatformGetDeviceCount(void)
eConsole
,
&
device
);
if
(
hr
==
E_NOTFOUND
)
{
FAudio_PlatformRelease
();
return
0
;
}
FAudio_assert
(
!
FAILED
(
hr
)
&&
"Failed to get default audio endpoint!"
);
IMMDevice_Release
(
device
);
...
...
@@ -1191,8 +1197,8 @@ static void FAudio_INTERNAL_DecodeWMAMF(
uint32_t
samples
)
{
const
FAudioWaveFormatExtensible
*
wfx
=
(
FAudioWaveFormatExtensible
*
)
voice
->
src
.
format
;
size_t
samples_pos
,
samples_size
,
copy_size
=
0
;
struct
FAudioWMADEC
*
impl
=
voice
->
src
.
wmadec
;
size_t
samples_pos
,
samples_size
,
copy_size
;
HRESULT
hr
;
LOG_FUNC_ENTER
(
voice
->
audio
)
...
...
@@ -1264,8 +1270,12 @@ static void FAudio_INTERNAL_DecodeWMAMF(
impl
->
input_size
=
0
;
}
copy_size
=
FAudio_clamp
(
impl
->
output_pos
-
samples_pos
,
0
,
samples_size
);
FAudio_memcpy
(
decodeCache
,
impl
->
output_buf
+
samples_pos
,
copy_size
);
if
(
impl
->
output_pos
>
samples_pos
)
{
copy_size
=
FAudio_min
(
impl
->
output_pos
-
samples_pos
,
samples_size
);
FAudio_memcpy
(
decodeCache
,
impl
->
output_buf
+
samples_pos
,
copy_size
);
}
FAudio_zero
(
decodeCache
+
copy_size
,
samples_size
-
copy_size
);
LOG_INFO
(
voice
->
audio
,
"decoded %x / %x bytes, copied %x / %x bytes"
,
...
...
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