Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
fdk-aac
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
fdk-aac
Commits
34fb0535
Commit
34fb0535
authored
Apr 20, 2016
by
Glenn Kasten
Committed by
Gerrit Code Review
Apr 20, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Remove redundant parentheses around == comparison operator"
parents
c203653d
76b428d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
libAACdec/src/block.cpp
libAACdec/src/block.cpp
+1
-2
libAACdec/src/rvlcconceal.cpp
libAACdec/src/rvlcconceal.cpp
+2
-2
libAACenc/src/aacenc_lib.cpp
libAACenc/src/aacenc_lib.cpp
+1
-1
libSBRenc/src/sbr_encoder.cpp
libSBRenc/src/sbr_encoder.cpp
+2
-2
No files found.
libAACdec/src/block.cpp
View file @
34fb0535
...
@@ -329,8 +329,7 @@ AAC_DECODER_ERROR CBlock_ReadSectionData(HANDLE_FDK_BITSTREAM bs,
...
@@ -329,8 +329,7 @@ AAC_DECODER_ERROR CBlock_ReadSectionData(HANDLE_FDK_BITSTREAM bs,
if
(
numLinesInSecIdx
>=
MAX_SFB_HCR
)
{
if
(
numLinesInSecIdx
>=
MAX_SFB_HCR
)
{
return
AAC_DEC_PARSE_ERROR
;
return
AAC_DEC_PARSE_ERROR
;
}
}
if
(
if
(
sect_cb
==
BOOKSCL
)
(
sect_cb
==
BOOKSCL
)
)
{
{
return
AAC_DEC_INVALID_CODE_BOOK
;
return
AAC_DEC_INVALID_CODE_BOOK
;
}
else
{
}
else
{
...
...
libAACdec/src/rvlcconceal.cpp
View file @
34fb0535
...
@@ -459,7 +459,7 @@ void BidirectionalEstimation_UseScfOfPrevFrameAsReference (
...
@@ -459,7 +459,7 @@ void BidirectionalEstimation_UseScfOfPrevFrameAsReference (
break
;
break
;
case
NOISE_HCB
:
case
NOISE_HCB
:
if
(
(
pAacDecoderStaticChannelInfo
->
concealmentInfo
.
aRvlcPreviousCodebook
[
bnds
]
==
NOISE_HCB
)
)
{
if
(
pAacDecoderStaticChannelInfo
->
concealmentInfo
.
aRvlcPreviousCodebook
[
bnds
]
==
NOISE_HCB
)
{
commonMin
=
FDKmin
(
pAacDecoderChannelInfo
->
pComData
->
overlay
.
aac
.
aRvlcScfFwd
[
bnds
],
pAacDecoderChannelInfo
->
pComData
->
overlay
.
aac
.
aRvlcScfBwd
[
bnds
]);
commonMin
=
FDKmin
(
pAacDecoderChannelInfo
->
pComData
->
overlay
.
aac
.
aRvlcScfFwd
[
bnds
],
pAacDecoderChannelInfo
->
pComData
->
overlay
.
aac
.
aRvlcScfBwd
[
bnds
]);
pAacDecoderChannelInfo
->
pDynData
->
aScaleFactor
[
bnds
]
=
FDKmin
(
commonMin
,
pAacDecoderStaticChannelInfo
->
concealmentInfo
.
aRvlcPreviousScaleFactor
[
bnds
]);
pAacDecoderChannelInfo
->
pDynData
->
aScaleFactor
[
bnds
]
=
FDKmin
(
commonMin
,
pAacDecoderStaticChannelInfo
->
concealmentInfo
.
aRvlcPreviousScaleFactor
[
bnds
]);
}
else
{
}
else
{
...
@@ -669,7 +669,7 @@ void PredictiveInterpolation (
...
@@ -669,7 +669,7 @@ void PredictiveInterpolation (
break
;
break
;
case
NOISE_HCB
:
case
NOISE_HCB
:
if
(
(
pAacDecoderStaticChannelInfo
->
concealmentInfo
.
aRvlcPreviousCodebook
[
bnds
]
==
NOISE_HCB
)
)
{
if
(
pAacDecoderStaticChannelInfo
->
concealmentInfo
.
aRvlcPreviousCodebook
[
bnds
]
==
NOISE_HCB
)
{
commonMin
=
FDKmin
(
pAacDecoderChannelInfo
->
pComData
->
overlay
.
aac
.
aRvlcScfFwd
[
bnds
],
pAacDecoderChannelInfo
->
pComData
->
overlay
.
aac
.
aRvlcScfBwd
[
bnds
]);
commonMin
=
FDKmin
(
pAacDecoderChannelInfo
->
pComData
->
overlay
.
aac
.
aRvlcScfFwd
[
bnds
],
pAacDecoderChannelInfo
->
pComData
->
overlay
.
aac
.
aRvlcScfBwd
[
bnds
]);
pAacDecoderChannelInfo
->
pDynData
->
aScaleFactor
[
bnds
]
=
FDKmin
(
commonMin
,
pAacDecoderStaticChannelInfo
->
concealmentInfo
.
aRvlcPreviousScaleFactor
[
bnds
]);
pAacDecoderChannelInfo
->
pDynData
->
aScaleFactor
[
bnds
]
=
FDKmin
(
commonMin
,
pAacDecoderStaticChannelInfo
->
concealmentInfo
.
aRvlcPreviousScaleFactor
[
bnds
]);
}
}
...
...
libAACenc/src/aacenc_lib.cpp
View file @
34fb0535
...
@@ -1046,7 +1046,7 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder,
...
@@ -1046,7 +1046,7 @@ static AACENC_ERROR aacEncInit(HANDLE_AACENCODER hAacEncoder,
}
}
/* Clear input buffer */
/* Clear input buffer */
if
(
(
InitFlags
==
AACENC_INIT_ALL
)
)
{
if
(
InitFlags
==
AACENC_INIT_ALL
)
{
FDKmemclear
(
hAacEncoder
->
inputBuffer
,
sizeof
(
INT_PCM
)
*
hAacEncoder
->
nMaxAacChannels
*
INPUTBUFFER_SIZE
);
FDKmemclear
(
hAacEncoder
->
inputBuffer
,
sizeof
(
INT_PCM
)
*
hAacEncoder
->
nMaxAacChannels
*
INPUTBUFFER_SIZE
);
}
}
...
...
libSBRenc/src/sbr_encoder.cpp
View file @
34fb0535
...
@@ -1851,10 +1851,10 @@ INT sbrEncoder_Init(
...
@@ -1851,10 +1851,10 @@ INT sbrEncoder_Init(
if
(
(
aot
==
AOT_PS
)
||
(
aot
==
AOT_MP2_PS
)
||
(
aot
==
AOT_DABPLUS_PS
)
||
(
aot
==
AOT_DRM_MPEG_PS
)
)
{
if
(
(
aot
==
AOT_PS
)
||
(
aot
==
AOT_MP2_PS
)
||
(
aot
==
AOT_DABPLUS_PS
)
||
(
aot
==
AOT_DRM_MPEG_PS
)
)
{
usePs
=
1
;
usePs
=
1
;
}
}
if
(
(
aot
==
AOT_ER_AAC_ELD
)
)
{
if
(
aot
==
AOT_ER_AAC_ELD
)
{
lowDelay
=
1
;
lowDelay
=
1
;
}
}
else
if
(
(
aot
==
AOT_ER_AAC_LD
)
)
{
else
if
(
aot
==
AOT_ER_AAC_LD
)
{
error
=
1
;
error
=
1
;
goto
bail
;
goto
bail
;
}
}
...
...
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