Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
audiowmark
Project
Project
Details
Activity
Releases
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
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
audiowmark
Commits
a7ae7b8b
Commit
a7ae7b8b
authored
Feb 05, 2019
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return decoded mp3 data from mp3_try_load().
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
67a4ca2d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
mp3.cc
src/mp3.cc
+4
-2
testmp3.cc
src/testmp3.cc
+11
-1
No files found.
src/mp3.cc
View file @
a7ae7b8b
...
...
@@ -47,6 +47,7 @@ mp3_try_load (const string& filename, WavData& wav_data)
printf
(
"# %zd
\n
"
,
mpg123_outblock
(
mh
));
vector
<
unsigned
char
>
buffer
(
mpg123_outblock
(
mh
));
vector
<
float
>
samples
;
size_t
done
=
0
;
do
...
...
@@ -56,12 +57,13 @@ mp3_try_load (const string& filename, WavData& wav_data)
printf
(
"# done=%zd err=%d
\n
"
,
done
,
err
);
float
*
f
=
reinterpret_cast
<
float
*>
(
&
buffer
[
0
]);
for
(
int
i
=
0
;
i
<
buffer
.
size
()
/
8
;
i
++
)
for
(
int
i
=
0
;
i
<
buffer
.
size
()
/
4
;
i
++
)
{
printf
(
"%f
\n
"
,
f
[
i
*
2
]);
samples
.
push_back
(
f
[
i
]);
}
}
while
(
done
);
wav_data
=
WavData
(
samples
,
channels
,
rate
,
24
);
return
true
;
}
src/testmp3.cc
View file @
a7ae7b8b
...
...
@@ -4,5 +4,15 @@ int
main
(
int
argc
,
char
**
argv
)
{
WavData
wd
;
mp3_try_load
(
argv
[
1
],
wd
);
if
(
argc
>=
2
&&
mp3_try_load
(
argv
[
1
],
wd
))
{
int
sec
=
wd
.
n_values
()
/
wd
.
sample_rate
();
printf
(
"loaded mp3 %s: %d:%02d
\n
"
,
argv
[
1
],
sec
/
60
,
sec
%
60
);
if
(
argc
==
3
)
{
wd
.
save
(
argv
[
2
]);
printf
(
"saved wav: %s
\n
"
,
argv
[
2
]);
}
}
}
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