Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
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
Иван Мажукин
mpd
Commits
142fdc8d
Commit
142fdc8d
authored
Jan 10, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/flac: add options "probesize" and "analyzeduration"
https://bugs.musicpd.org/view.php?id=3876
parent
67778dcd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
74 additions
and
3 deletions
+74
-3
NEWS
NEWS
+2
-0
user.xml
doc/user.xml
+42
-0
FfmpegDecoderPlugin.cxx
src/decoder/plugins/FfmpegDecoderPlugin.cxx
+30
-3
No files found.
NEWS
View file @
142fdc8d
ver 0.20.2 (not yet released)
* decoder
- flac: add options "probesize" and "analyzeduration"
ver 0.20.1 (2017/01/09)
* input
...
...
doc/user.xml
View file @
142fdc8d
...
...
@@ -2206,6 +2206,48 @@ run</programlisting>
Decodes various codecs using
<application>
FFmpeg
</application>
.
</para>
<informaltable>
<tgroup
cols=
"2"
>
<thead>
<row>
<entry>
Setting
</entry>
<entry>
Description
</entry>
</row>
</thead>
<tbody>
<row>
<entry>
<varname>
analyzeduration
</varname>
<parameter>
VALUE
</parameter>
</entry>
<entry>
Sets the FFmpeg muxer option
<varname>
analyzeduration
</varname>
, which specifies
how many microseconds are analyzed to probe the
input. The
<ulink
url=
"https://ffmpeg.org/ffmpeg-formats.html"
>
FFmpeg
formats documentation
</ulink>
has more information.
</entry>
</row>
<row>
<entry>
<varname>
probesize
</varname>
<parameter>
VALUE
</parameter>
</entry>
<entry>
Sets the FFmpeg muxer option
<varname>
probesize
</varname>
, which specifies
probing size in bytes, i.e. the size of the data to
analyze to get stream information. The
<ulink
url=
"https://ffmpeg.org/ffmpeg-formats.html"
>
FFmpeg
formats documentation
</ulink>
has more information.
</entry>
</row>
</tbody>
</tgroup>
</informaltable>
</section>
<section
id=
"flac_decoder"
>
...
...
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @
142fdc8d
...
...
@@ -56,6 +56,11 @@ extern "C" {
#include <assert.h>
#include <string.h>
/**
* Muxer options to be passed to avformat_open_input().
*/
static
AVDictionary
*
avformat_options
=
nullptr
;
static
AVFormatContext
*
FfmpegOpenInput
(
AVIOContext
*
pb
,
const
char
*
filename
,
...
...
@@ -67,7 +72,11 @@ FfmpegOpenInput(AVIOContext *pb,
context
->
pb
=
pb
;
int
err
=
avformat_open_input
(
&
context
,
filename
,
fmt
,
nullptr
);
AVDictionary
*
options
=
nullptr
;
AtScopeExit
(
&
options
)
{
av_dict_free
(
&
options
);
};
av_dict_copy
(
&
options
,
avformat_options
,
0
);
int
err
=
avformat_open_input
(
&
context
,
filename
,
fmt
,
&
options
);
if
(
err
<
0
)
throw
MakeFfmpegError
(
err
,
"avformat_open_input() failed"
);
...
...
@@ -75,12 +84,30 @@ FfmpegOpenInput(AVIOContext *pb,
}
static
bool
ffmpeg_init
(
gcc_unused
const
ConfigBlock
&
block
)
ffmpeg_init
(
const
ConfigBlock
&
block
)
{
FfmpegInit
();
static
constexpr
const
char
*
option_names
[]
=
{
"probesize"
,
"analyzeduration"
,
};
for
(
const
char
*
name
:
option_names
)
{
const
char
*
value
=
block
.
GetBlockValue
(
name
);
if
(
value
!=
nullptr
)
av_dict_set
(
&
avformat_options
,
name
,
value
,
0
);
}
return
true
;
}
static
void
ffmpeg_finish
()
{
av_dict_free
(
&
avformat_options
);
}
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 25, 0)
/* FFmpeg 3.1 */
gcc_pure
...
...
@@ -967,7 +994,7 @@ static const char *const ffmpeg_mime_types[] = {
const
struct
DecoderPlugin
ffmpeg_decoder_plugin
=
{
"ffmpeg"
,
ffmpeg_init
,
nullptr
,
ffmpeg_finish
,
ffmpeg_decode
,
nullptr
,
nullptr
,
...
...
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