Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
0e107f78
Commit
0e107f78
authored
14 years ago
by
Alex Converse
Browse files
Options
Downloads
Patches
Plain Diff
psymodel: Const correct FFPsyWindowInfo.
Originally committed as revision 24999 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
76dfe4eb
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libavcodec/aacpsy.c
+1
-1
1 addition, 1 deletion
libavcodec/aacpsy.c
libavcodec/psymodel.c
+1
-1
1 addition, 1 deletion
libavcodec/psymodel.c
libavcodec/psymodel.h
+2
-2
2 additions, 2 deletions
libavcodec/psymodel.h
with
4 additions
and
4 deletions
libavcodec/aacpsy.c
+
1
−
1
View file @
0e107f78
...
...
@@ -387,7 +387,7 @@ static FFPsyWindowInfo psy_3gpp_window(FFPsyContext *ctx,
* Calculate band thresholds as suggested in 3GPP TS26.403
*/
static
void
psy_3gpp_analyze
(
FFPsyContext
*
ctx
,
int
channel
,
const
float
*
coefs
,
FFPsyWindowInfo
*
wi
)
const
float
*
coefs
,
const
FFPsyWindowInfo
*
wi
)
{
AacPsyContext
*
pctx
=
(
AacPsyContext
*
)
ctx
->
model_priv_data
;
AacPsyChannel
*
pch
=
&
pctx
->
ch
[
channel
];
...
...
This diff is collapsed.
Click to expand it.
libavcodec/psymodel.c
+
1
−
1
View file @
0e107f78
...
...
@@ -53,7 +53,7 @@ FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx,
}
void
ff_psy_set_band_info
(
FFPsyContext
*
ctx
,
int
channel
,
const
float
*
coeffs
,
FFPsyWindowInfo
*
wi
)
const
float
*
coeffs
,
const
FFPsyWindowInfo
*
wi
)
{
ctx
->
model
->
analyze
(
ctx
,
channel
,
coeffs
,
wi
);
}
...
...
This diff is collapsed.
Click to expand it.
libavcodec/psymodel.h
+
2
−
2
View file @
0e107f78
...
...
@@ -72,7 +72,7 @@ typedef struct FFPsyModel {
const
char
*
name
;
int
(
*
init
)
(
FFPsyContext
*
apc
);
FFPsyWindowInfo
(
*
window
)(
FFPsyContext
*
ctx
,
const
int16_t
*
audio
,
const
int16_t
*
la
,
int
channel
,
int
prev_type
);
void
(
*
analyze
)(
FFPsyContext
*
ctx
,
int
channel
,
const
float
*
coeffs
,
FFPsyWindowInfo
*
wi
);
void
(
*
analyze
)(
FFPsyContext
*
ctx
,
int
channel
,
const
float
*
coeffs
,
const
FFPsyWindowInfo
*
wi
);
void
(
*
end
)
(
FFPsyContext
*
apc
);
}
FFPsyModel
;
...
...
@@ -116,7 +116,7 @@ FFPsyWindowInfo ff_psy_suggest_window(FFPsyContext *ctx,
* @param wi window information
*/
void
ff_psy_set_band_info
(
FFPsyContext
*
ctx
,
int
channel
,
const
float
*
coeffs
,
FFPsyWindowInfo
*
wi
);
const
FFPsyWindowInfo
*
wi
);
/**
* Cleanup model context at the end.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment