Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
b5ec6383
Commit
b5ec6383
authored
Jan 27, 2011
by
Justin Ruggles
Committed by
Mans Rullgard
Jan 28, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosmetics: indentation and spacing
parent
9d06d7bc
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
19 deletions
+18
-19
aacdec.c
libavcodec/aacdec.c
+2
-2
ac3dec.c
libavcodec/ac3dec.c
+2
-2
dca.c
libavcodec/dca.c
+6
-7
nellymoserdec.c
libavcodec/nellymoserdec.c
+1
-1
wmadec.c
libavcodec/wmadec.c
+7
-7
No files found.
libavcodec/aacdec.c
View file @
b5ec6383
...
...
@@ -568,8 +568,8 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
// -1024 - Compensate wrong IMDCT method.
// 60 - Required to scale values to the correct range [-32768,32767]
// for float to int16 conversion. (1 << (60 / 4)) == 32768
ac
->
sf_scale
=
1
.
/
-
1024
.;
ac
->
sf_offset
=
60
;
ac
->
sf_scale
=
1
.
/
-
1024
.;
ac
->
sf_offset
=
60
;
ff_aac_tableinit
();
...
...
libavcodec/ac3dec.c
View file @
b5ec6383
...
...
@@ -195,8 +195,8 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
dsputil_init
(
&
s
->
dsp
,
avctx
);
av_lfg_init
(
&
s
->
dith_state
,
0
);
/* set
bias values
for float to int16 conversion */
s
->
mul_bias
=
32767
.
0
f
;
/* set
scale value
for float to int16 conversion */
s
->
mul_bias
=
32767
.
0
f
;
/* allow downmixing to stereo or mono */
if
(
avctx
->
channels
>
0
&&
avctx
->
request_channels
>
0
&&
...
...
libavcodec/dca.c
View file @
b5ec6383
...
...
@@ -1838,14 +1838,13 @@ static av_cold int dca_decode_init(AVCodecContext * avctx)
s
->
samples_chanptr
[
i
]
=
s
->
samples
+
i
*
256
;
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16
;
s
->
scale_bias
=
1
.
0
;
/* allow downmixing to stereo */
if
(
avctx
->
channels
>
0
&&
avctx
->
request_channels
<
avctx
->
channels
&&
avctx
->
request_channels
==
2
)
{
avctx
->
channels
=
avctx
->
request_channels
;
}
s
->
scale_bias
=
1
.
0
;
/* allow downmixing to stereo */
if
(
avctx
->
channels
>
0
&&
avctx
->
request_channels
<
avctx
->
channels
&&
avctx
->
request_channels
==
2
)
{
avctx
->
channels
=
avctx
->
request_channels
;
}
return
0
;
}
...
...
libavcodec/nellymoserdec.c
View file @
b5ec6383
...
...
@@ -135,7 +135,7 @@ static av_cold int decode_init(AVCodecContext * avctx) {
dsputil_init
(
&
s
->
dsp
,
avctx
);
s
->
scale_bias
=
1
.
0
/
(
1
*
8
);
s
->
scale_bias
=
1
.
0
/
(
1
*
8
);
/* Generate overlap window */
if
(
!
ff_sine_128
[
127
])
...
...
libavcodec/wmadec.c
View file @
b5ec6383
...
...
@@ -789,13 +789,13 @@ static int wma_decode_frame(WMACodecContext *s, int16_t *samples)
/* convert frame to integer */
n
=
s
->
frame_len
;
incr
=
s
->
nb_channels
;
for
(
ch
=
0
;
ch
<
MAX_CHANNELS
;
ch
++
)
output
[
ch
]
=
s
->
frame_out
[
ch
];
s
->
dsp
.
float_to_int16_interleave
(
samples
,
output
,
n
,
incr
);
for
(
ch
=
0
;
ch
<
incr
;
ch
++
)
{
/* prepare for next block */
memmove
(
&
s
->
frame_out
[
ch
][
0
],
&
s
->
frame_out
[
ch
][
n
],
n
*
sizeof
(
float
));
}
for
(
ch
=
0
;
ch
<
MAX_CHANNELS
;
ch
++
)
output
[
ch
]
=
s
->
frame_out
[
ch
];
s
->
dsp
.
float_to_int16_interleave
(
samples
,
output
,
n
,
incr
);
for
(
ch
=
0
;
ch
<
incr
;
ch
++
)
{
/* prepare for next block */
memmove
(
&
s
->
frame_out
[
ch
][
0
],
&
s
->
frame_out
[
ch
][
n
],
n
*
sizeof
(
float
));
}
#ifdef TRACE
dump_shorts
(
s
,
"samples"
,
samples
,
n
*
s
->
nb_channels
);
...
...
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