Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
e42670fc
Commit
e42670fc
authored
Mar 24, 2013
by
Ilkka Ollakka
Browse files
avcodec: on encoding, try to match vlc and avcodec formats
This can avoid unnecessary format conversion.
parent
c62b9b03
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/codec/avcodec/encoder.c
View file @
e42670fc
...
...
@@ -598,21 +598,37 @@ int OpenEncoder( vlc_object_t *p_this )
p_codec
->
sample_fmts
[
0
]
:
AV_SAMPLE_FMT_S16
;
/* Try to match avcodec input format to vlc format so we could avoid one
format conversion */
if
(
GetVlcAudioFormat
(
p_context
->
sample_fmt
)
!=
p_enc
->
fmt_in
.
i_codec
)
{
msg_Dbg
(
p_enc
,
"Trying to find more suitable sample format instead of %s"
,
av_get_sample_fmt_name
(
p_context
->
sample_fmt
)
);
for
(
unsigned
int
i
=
0
;
p_codec
->
sample_fmts
[
i
]
!=
-
1
;
i
++
)
{
if
(
GetVlcAudioFormat
(
p_codec
->
sample_fmts
[
i
]
)
==
p_enc
->
fmt_in
.
i_codec
)
{
p_context
->
sample_fmt
=
p_codec
->
sample_fmts
[
i
];
msg_Dbg
(
p_enc
,
"Using %s as new sample format"
,
av_get_sample_fmt_name
(
p_context
->
sample_fmt
)
);
break
;
}
}
}
// Try if we can use interleaved format for codec input as VLC doesn't really do planar audio yet
// FIXME: Remove when planar/interleaved audio in vlc is equally supported
if
(
av_sample_fmt_is_planar
(
p_context
->
sample_fmt
)
)
{
msg_Dbg
(
p_enc
,
"Trying to find packet sample format instead of %s"
,
av_get_sample_fmt_name
(
p_context
->
sample_fmt
)
);
msg_Dbg
(
p_enc
,
"Trying to find packet sample format instead of
planar
%s"
,
av_get_sample_fmt_name
(
p_context
->
sample_fmt
)
);
for
(
unsigned
int
i
=
0
;
p_codec
->
sample_fmts
[
i
]
!=
-
1
;
i
++
)
{
if
(
!
av_sample_fmt_is_planar
(
p_codec
->
sample_fmts
[
i
]
)
)
{
p_context
->
sample_fmt
=
p_codec
->
sample_fmts
[
i
];
msg_Dbg
(
p_enc
,
"
Using
%s as new sample format"
,
av_get_sample_fmt_name
(
p_context
->
sample_fmt
)
);
msg_Dbg
(
p_enc
,
"
Changing to packet format
%s as new sample format"
,
av_get_sample_fmt_name
(
p_context
->
sample_fmt
)
);
break
;
}
}
}
msg_Dbg
(
p_enc
,
"Ended up using %s as sample format"
,
av_get_sample_fmt_name
(
p_context
->
sample_fmt
)
);
p_enc
->
fmt_in
.
i_codec
=
GetVlcAudioFormat
(
p_context
->
sample_fmt
);
p_context
->
sample_rate
=
p_enc
->
fmt_out
.
audio
.
i_rate
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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