Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
9134d2df
Commit
9134d2df
authored
Jul 18, 2016
by
Josh de Kock
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libopenmpt: add subsong support
Signed-off-by:
Josh de Kock
<
josh@itanimul.li
>
parent
120f34b6
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
3 deletions
+27
-3
libopenmpt.c
libavformat/libopenmpt.c
+27
-3
No files found.
libavformat/libopenmpt.c
View file @
9134d2df
...
...
@@ -36,15 +36,19 @@ typedef struct OpenMPTContext {
/* options */
int
sample_rate
;
int64_t
layout
;
int
subsong
;
}
OpenMPTContext
;
#define OFFSET(x) offsetof(OpenMPTContext, x)
#define A AV_OPT_FLAG_AUDIO_PARAM
#define D AV_OPT_FLAG_DECODING_PARAM
static
const
AVOption
options
[]
=
{
{
"sample_rate"
,
"set sample rate"
,
OFFSET
(
sample_rate
),
AV_OPT_TYPE_INT
,
{.
i64
=
48000
},
1000
,
INT_MAX
,
A
|
D
},
{
"layout"
,
"set channel layout"
,
OFFSET
(
layout
),
AV_OPT_TYPE_CHANNEL_LAYOUT
,
{.
i64
=
AV_CH_LAYOUT_STEREO
},
0
,
INT64_MAX
,
A
|
D
},
{
NULL
}
{
"sample_rate"
,
"set sample rate"
,
OFFSET
(
sample_rate
),
AV_OPT_TYPE_INT
,
{
.
i64
=
48000
},
1000
,
INT_MAX
,
A
|
D
},
{
"layout"
,
"set channel layout"
,
OFFSET
(
layout
),
AV_OPT_TYPE_CHANNEL_LAYOUT
,
{
.
i64
=
AV_CH_LAYOUT_STEREO
},
0
,
INT64_MAX
,
A
|
D
},
{
"subsong"
,
"set subsong"
,
OFFSET
(
subsong
),
AV_OPT_TYPE_INT
,
{
.
i64
=
-
2
},
-
2
,
INT_MAX
,
A
|
D
,
"subsong"
},
{
"all"
,
"all"
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
-
1
},
0
,
0
,
A
|
D
,
"subsong"
},
{
"auto"
,
"auto"
,
0
,
AV_OPT_TYPE_CONST
,
{
.
i64
=
-
2
},
0
,
0
,
A
|
D
,
"subsong"
},
{
NULL
}
};
static
void
openmpt_logfunc
(
const
char
*
message
,
void
*
userdata
)
...
...
@@ -70,6 +74,8 @@ static int read_header_openmpt(AVFormatContext *s)
OpenMPTContext
*
openmpt
=
s
->
priv_data
;
int64_t
size
=
avio_size
(
s
->
pb
);
char
*
buf
=
av_malloc
(
size
);
int
ret
;
if
(
!
buf
)
return
AVERROR
(
ENOMEM
);
...
...
@@ -88,6 +94,24 @@ static int read_header_openmpt(AVFormatContext *s)
add_meta
(
s
,
"encoder"
,
openmpt_module_get_metadata
(
openmpt
->
module
,
"tracker"
));
add_meta
(
s
,
"comment"
,
openmpt_module_get_metadata
(
openmpt
->
module
,
"message"
));
if
(
openmpt
->
subsong
>=
openmpt_module_get_num_subsongs
(
openmpt
->
module
))
{
openmpt_module_destroy
(
openmpt
->
module
);
av_log
(
s
,
AV_LOG_ERROR
,
"Invalid subsong index: %d
\n
"
,
openmpt
->
subsong
);
return
AVERROR
(
EINVAL
);
}
if
(
openmpt
->
subsong
!=
-
2
)
{
if
(
openmpt
->
subsong
>=
0
)
{
av_dict_set_int
(
&
s
->
metadata
,
"track"
,
openmpt
->
subsong
+
1
,
0
);
}
ret
=
openmpt_module_select_subsong
(
openmpt
->
module
,
openmpt
->
subsong
);
if
(
!
ret
){
openmpt_module_destroy
(
openmpt
->
module
);
av_log
(
s
,
AV_LOG_ERROR
,
"Could not select requested subsong: %d"
,
openmpt
->
subsong
);
return
AVERROR
(
EINVAL
);
}
}
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
{
openmpt_module_destroy
(
openmpt
->
module
);
...
...
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