Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
26989ea2
Commit
26989ea2
authored
Oct 28, 2013
by
Ilkka Ollakka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
transcode: fix logic/code when reinitialize filter on channel/rate change
Only check samplerate and physical_channels for now
parent
f07b45fc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
3 deletions
+10
-3
modules/stream_out/transcode/audio.c
modules/stream_out/transcode/audio.c
+10
-3
No files found.
modules/stream_out/transcode/audio.c
View file @
26989ea2
...
...
@@ -73,7 +73,8 @@ static int transcode_audio_initialize_filters( sout_stream_t *p_stream, sout_str
id
->
p_decoder
->
p_module
=
NULL
;
return
VLC_EGENERIC
;
}
memcpy
(
fmt_last
,
&
p_sys
->
fmt_audio
,
sizeof
(
audio_sample_format_t
)
);
p_sys
->
fmt_audio
.
i_rate
=
fmt_last
->
i_rate
;
p_sys
->
fmt_audio
.
i_physical_channels
=
fmt_last
->
i_physical_channels
;
return
VLC_SUCCESS
;
}
...
...
@@ -227,11 +228,17 @@ int transcode_audio_process( sout_stream_t *p_stream,
p_audio_buf
->
i_dts
=
p_audio_buf
->
i_pts
;
/* Check if audio format has changed, and filters need reinit */
if
(
unlikely
(
AOUT_FMTS_IDENTICAL
(
&
id
->
p_decoder
->
fmt_out
.
audio
,
&
p_sys
->
fmt_audio
)
)
)
if
(
unlikely
(
(
id
->
p_decoder
->
fmt_out
.
audio
.
i_rate
!=
p_sys
->
fmt_audio
.
i_rate
)
||
(
id
->
p_decoder
->
fmt_out
.
audio
.
i_physical_channels
!=
p_sys
->
fmt_audio
.
i_physical_channels
)
)
)
{
msg_
Dbg
(
p_stream
,
"Audio changed, trying to reinitialize filters"
);
msg_
Info
(
p_stream
,
"Audio changed, trying to reinitialize filters"
);
if
(
id
->
p_af_chain
!=
NULL
)
aout_FiltersDelete
(
(
vlc_object_t
*
)
NULL
,
id
->
p_af_chain
);
/* decoders don't set audio.i_format, but audio filters use it */
id
->
p_decoder
->
fmt_out
.
audio
.
i_format
=
id
->
p_decoder
->
fmt_out
.
i_codec
;
aout_FormatPrepare
(
&
id
->
p_decoder
->
fmt_out
.
audio
);
if
(
transcode_audio_initialize_filters
(
p_stream
,
id
,
p_sys
,
&
id
->
p_decoder
->
fmt_out
.
audio
)
!=
VLC_SUCCESS
)
return
VLC_EGENERIC
;
...
...
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