Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
af3201fb
Commit
af3201fb
authored
Apr 21, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless AOUT_PHYSMASK masking in some codecs
parent
a0000ece
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
modules/codec/aes3.c
modules/codec/aes3.c
+1
-1
modules/codec/lpcm.c
modules/codec/lpcm.c
+1
-1
modules/packetizer/mlp.c
modules/packetizer/mlp.c
+1
-1
modules/packetizer/mpeg4audio.c
modules/packetizer/mpeg4audio.c
+1
-2
No files found.
modules/codec/aes3.c
View file @
af3201fb
...
...
@@ -352,7 +352,7 @@ static block_t *Parse( decoder_t *p_dec, int *pi_frame_length, int *pi_bits,
p_dec
->
fmt_out
.
audio
.
i_channels
=
i_channels
;
p_dec
->
fmt_out
.
audio
.
i_original_channels
=
pi_original_channels
[
i_channels
/
2
-
1
];
p_dec
->
fmt_out
.
audio
.
i_physical_channels
=
pi_original_channels
[
i_channels
/
2
-
1
]
&
AOUT_CHAN_PHYSMASK
;
p_dec
->
fmt_out
.
audio
.
i_physical_channels
=
pi_original_channels
[
i_channels
/
2
-
1
];
*
pi_frame_length
=
(
p_block
->
i_buffer
-
AES3_HEADER_LEN
)
/
(
(
4
+
i_bits
)
*
i_channels
/
8
);
*
pi_bits
=
i_bits
;
...
...
modules/codec/lpcm.c
View file @
af3201fb
...
...
@@ -357,7 +357,7 @@ static block_t *DecodeFrame( decoder_t *p_dec, block_t **pp_block )
p_dec
->
fmt_out
.
audio
.
i_rate
=
i_rate
;
p_dec
->
fmt_out
.
audio
.
i_channels
=
i_channels
;
p_dec
->
fmt_out
.
audio
.
i_original_channels
=
i_original_channels
;
p_dec
->
fmt_out
.
audio
.
i_physical_channels
=
i_original_channels
&
AOUT_CHAN_PHYSMASK
;
p_dec
->
fmt_out
.
audio
.
i_physical_channels
=
i_original_channels
;
i_frame_length
=
(
p_block
->
i_buffer
-
p_sys
->
i_header_size
-
i_padding
)
/
(
i_channels
+
i_channels_padding
)
*
8
/
i_bits
;
...
...
modules/packetizer/mlp.c
View file @
af3201fb
...
...
@@ -301,7 +301,7 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
p_dec
->
fmt_out
.
audio
.
i_rate
=
p_sys
->
mlp
.
i_rate
;
p_dec
->
fmt_out
.
audio
.
i_channels
=
p_sys
->
mlp
.
i_channels
;
p_dec
->
fmt_out
.
audio
.
i_original_channels
=
p_sys
->
mlp
.
i_channels_conf
;
p_dec
->
fmt_out
.
audio
.
i_physical_channels
=
p_sys
->
mlp
.
i_channels_conf
&
AOUT_CHAN_PHYSMASK
;
p_dec
->
fmt_out
.
audio
.
i_physical_channels
=
p_sys
->
mlp
.
i_channels_conf
;
p_out_buffer
->
i_pts
=
p_out_buffer
->
i_dts
=
date_Get
(
&
p_sys
->
end_date
);
...
...
modules/packetizer/mpeg4audio.c
View file @
af3201fb
...
...
@@ -1211,8 +1211,7 @@ static void SetupOutput( decoder_t *p_dec, block_t *p_block )
#if 0
p_dec->fmt_out.audio.i_original_channels = p_sys->i_channels_conf;
p_dec->fmt_out.audio.i_physical_channels =
p_sys->i_channels_conf & AOUT_CHAN_PHYSMASK;
p_dec->fmt_out.audio.i_physical_channels = p_sys->i_channels_conf;
#endif
p_block
->
i_pts
=
p_block
->
i_dts
=
date_Get
(
&
p_sys
->
end_date
);
...
...
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