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
0f44edaa
Commit
0f44edaa
authored
17 years ago
by
Måns Rullgård
Browse files
Options
Downloads
Patches
Plain Diff
cosmetic: libfaad.c indentation
Originally committed as revision 11607 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
dbbc5732
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavcodec/libfaad.c
+37
-37
37 additions, 37 deletions
libavcodec/libfaad.c
with
37 additions
and
37 deletions
libavcodec/libfaad.c
+
37
−
37
View file @
0f44edaa
...
@@ -58,36 +58,36 @@ typedef struct {
...
@@ -58,36 +58,36 @@ typedef struct {
faacDecHandle
FAADAPI
(
*
faacDecOpen
)(
void
);
faacDecHandle
FAADAPI
(
*
faacDecOpen
)(
void
);
faacDecConfigurationPtr
FAADAPI
(
*
faacDecGetCurrentConfiguration
)(
faacDecHandle
hDecoder
);
faacDecConfigurationPtr
FAADAPI
(
*
faacDecGetCurrentConfiguration
)(
faacDecHandle
hDecoder
);
#ifndef FAAD2_VERSION
#ifndef FAAD2_VERSION
int
FAADAPI
(
*
faacDecSetConfiguration
)(
faacDecHandle
hDecoder
,
int
FAADAPI
(
*
faacDecSetConfiguration
)(
faacDecHandle
hDecoder
,
faacDecConfigurationPtr
config
);
faacDecConfigurationPtr
config
);
int
FAADAPI
(
*
faacDecInit
)(
faacDecHandle
hDecoder
,
int
FAADAPI
(
*
faacDecInit
)(
faacDecHandle
hDecoder
,
unsigned
char
*
buffer
,
unsigned
char
*
buffer
,
unsigned
long
*
samplerate
,
unsigned
long
*
samplerate
,
unsigned
long
*
channels
);
unsigned
long
*
channels
);
int
FAADAPI
(
*
faacDecInit2
)(
faacDecHandle
hDecoder
,
unsigned
char
*
pBuffer
,
int
FAADAPI
(
*
faacDecInit2
)(
faacDecHandle
hDecoder
,
unsigned
char
*
pBuffer
,
unsigned
long
SizeOfDecoderSpecificInfo
,
unsigned
long
SizeOfDecoderSpecificInfo
,
unsigned
long
*
samplerate
,
unsigned
long
*
channels
);
unsigned
long
*
samplerate
,
unsigned
long
*
channels
);
int
FAADAPI
(
*
faacDecDecode
)(
faacDecHandle
hDecoder
,
int
FAADAPI
(
*
faacDecDecode
)(
faacDecHandle
hDecoder
,
unsigned
char
*
buffer
,
unsigned
char
*
buffer
,
unsigned
long
*
bytesconsumed
,
unsigned
long
*
bytesconsumed
,
short
*
sample_buffer
,
short
*
sample_buffer
,
unsigned
long
*
samples
);
unsigned
long
*
samples
);
#else
#else
unsigned
char
FAADAPI
(
*
faacDecSetConfiguration
)(
faacDecHandle
hDecoder
,
unsigned
char
FAADAPI
(
*
faacDecSetConfiguration
)(
faacDecHandle
hDecoder
,
faacDecConfigurationPtr
config
);
faacDecConfigurationPtr
config
);
long
FAADAPI
(
*
faacDecInit
)(
faacDecHandle
hDecoder
,
long
FAADAPI
(
*
faacDecInit
)(
faacDecHandle
hDecoder
,
unsigned
char
*
buffer
,
unsigned
char
*
buffer
,
unsigned
long
buffer_size
,
unsigned
long
buffer_size
,
unsigned
long
*
samplerate
,
unsigned
long
*
samplerate
,
unsigned
char
*
channels
);
unsigned
char
*
channels
);
char
FAADAPI
(
*
faacDecInit2
)(
faacDecHandle
hDecoder
,
unsigned
char
*
pBuffer
,
char
FAADAPI
(
*
faacDecInit2
)(
faacDecHandle
hDecoder
,
unsigned
char
*
pBuffer
,
unsigned
long
SizeOfDecoderSpecificInfo
,
unsigned
long
SizeOfDecoderSpecificInfo
,
unsigned
long
*
samplerate
,
unsigned
char
*
channels
);
unsigned
long
*
samplerate
,
unsigned
char
*
channels
);
void
*
FAADAPI
(
*
faacDecDecode
)(
faacDecHandle
hDecoder
,
void
*
FAADAPI
(
*
faacDecDecode
)(
faacDecHandle
hDecoder
,
faacDecFrameInfo
*
hInfo
,
faacDecFrameInfo
*
hInfo
,
unsigned
char
*
buffer
,
unsigned
char
*
buffer
,
unsigned
long
buffer_size
);
unsigned
long
buffer_size
);
char
*
FAADAPI
(
*
faacDecGetErrorMessage
)(
unsigned
char
errcode
);
char
*
FAADAPI
(
*
faacDecGetErrorMessage
)(
unsigned
char
errcode
);
#endif
#endif
void
FAADAPI
(
*
faacDecClose
)(
faacDecHandle
hDecoder
);
void
FAADAPI
(
*
faacDecClose
)(
faacDecHandle
hDecoder
);
...
@@ -106,7 +106,7 @@ static void channel_setup(AVCodecContext *avctx)
...
@@ -106,7 +106,7 @@ static void channel_setup(AVCodecContext *avctx)
#ifdef FAAD2_VERSION
#ifdef FAAD2_VERSION
FAACContext
*
s
=
avctx
->
priv_data
;
FAACContext
*
s
=
avctx
->
priv_data
;
if
(
avctx
->
request_channels
>
0
&&
avctx
->
request_channels
==
2
&&
if
(
avctx
->
request_channels
>
0
&&
avctx
->
request_channels
==
2
&&
avctx
->
request_channels
<
avctx
->
channels
)
{
avctx
->
request_channels
<
avctx
->
channels
)
{
faacDecConfigurationPtr
faac_cfg
;
faacDecConfigurationPtr
faac_cfg
;
avctx
->
channels
=
2
;
avctx
->
channels
=
2
;
faac_cfg
=
s
->
faacDecGetCurrentConfiguration
(
s
->
faac_handle
);
faac_cfg
=
s
->
faacDecGetCurrentConfiguration
(
s
->
faac_handle
);
...
@@ -194,7 +194,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
...
@@ -194,7 +194,7 @@ static int faac_decode_frame(AVCodecContext *avctx,
if
(
frame_info
.
error
>
0
)
{
if
(
frame_info
.
error
>
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"faac: frame decoding failed: %s
\n
"
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"faac: frame decoding failed: %s
\n
"
,
s
->
faacDecGetErrorMessage
(
frame_info
.
error
));
s
->
faacDecGetErrorMessage
(
frame_info
.
error
));
return
-
1
;
return
-
1
;
}
}
...
@@ -231,12 +231,12 @@ static int faac_decode_init(AVCodecContext *avctx)
...
@@ -231,12 +231,12 @@ static int faac_decode_init(AVCodecContext *avctx)
if
(
!
s
->
handle
)
if
(
!
s
->
handle
)
{
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"FAAD library: %s could not be opened!
\n
%s
\n
"
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"FAAD library: %s could not be opened!
\n
%s
\n
"
,
libfaadname
,
dlerror
());
libfaadname
,
dlerror
());
return
-
1
;
return
-
1
;
}
}
#define dfaac(a, b) \
#define dfaac(a, b)
\
do { static const char* n = AV_STRINGIFY(faacDec ## a); \
do { static const char* n = AV_STRINGIFY(faacDec ## a);
\
if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0)
if ((s->faacDec ## a = b dlsym( s->handle, n )) == NULL) { err = n; break; } } while(0)
for
(;;)
{
for
(;;)
{
#else
/* !CONFIG_LIBFAADBIN */
#else
/* !CONFIG_LIBFAADBIN */
#define dfaac(a, b) s->faacDec ## a = faacDec ## a
#define dfaac(a, b) s->faacDec ## a = faacDec ## a
...
@@ -249,25 +249,25 @@ static int faac_decode_init(AVCodecContext *avctx)
...
@@ -249,25 +249,25 @@ static int faac_decode_init(AVCodecContext *avctx)
FAADAPI
(
*
)(
faacDecHandle
)));
FAADAPI
(
*
)(
faacDecHandle
)));
#ifndef FAAD2_VERSION
#ifndef FAAD2_VERSION
dfaac
(
SetConfiguration
,
(
int
FAADAPI
(
*
)(
faacDecHandle
,
dfaac
(
SetConfiguration
,
(
int
FAADAPI
(
*
)(
faacDecHandle
,
faacDecConfigurationPtr
)));
faacDecConfigurationPtr
)));
dfaac
(
Init
,
(
int
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
dfaac
(
Init
,
(
int
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
unsigned
long
*
,
unsigned
long
*
)));
unsigned
long
*
,
unsigned
long
*
)));
dfaac
(
Init2
,
(
int
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
dfaac
(
Init2
,
(
int
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
unsigned
long
,
unsigned
long
*
,
unsigned
long
,
unsigned
long
*
,
unsigned
long
*
)));
unsigned
long
*
)));
dfaac
(
Decode
,
(
int
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
dfaac
(
Decode
,
(
int
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
unsigned
long
*
,
short
*
,
unsigned
long
*
)));
unsigned
long
*
,
short
*
,
unsigned
long
*
)));
#else
#else
dfaac
(
SetConfiguration
,
(
unsigned
char
FAADAPI
(
*
)(
faacDecHandle
,
dfaac
(
SetConfiguration
,
(
unsigned
char
FAADAPI
(
*
)(
faacDecHandle
,
faacDecConfigurationPtr
)));
faacDecConfigurationPtr
)));
dfaac
(
Init
,
(
long
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
dfaac
(
Init
,
(
long
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
unsigned
long
,
unsigned
long
*
,
unsigned
char
*
)));
unsigned
long
,
unsigned
long
*
,
unsigned
char
*
)));
dfaac
(
Init2
,
(
char
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
dfaac
(
Init2
,
(
char
FAADAPI
(
*
)(
faacDecHandle
,
unsigned
char
*
,
unsigned
long
,
unsigned
long
*
,
unsigned
long
,
unsigned
long
*
,
unsigned
char
*
)));
unsigned
char
*
)));
dfaac
(
Decode
,
(
void
*
FAADAPI
(
*
)(
faacDecHandle
,
faacDecFrameInfo
*
,
dfaac
(
Decode
,
(
void
*
FAADAPI
(
*
)(
faacDecHandle
,
faacDecFrameInfo
*
,
unsigned
char
*
,
unsigned
long
)));
unsigned
char
*
,
unsigned
long
)));
dfaac
(
GetErrorMessage
,
(
char
*
FAADAPI
(
*
)(
unsigned
char
)));
dfaac
(
GetErrorMessage
,
(
char
*
FAADAPI
(
*
)(
unsigned
char
)));
#endif
#endif
#undef dfacc
#undef dfacc
...
@@ -278,7 +278,7 @@ static int faac_decode_init(AVCodecContext *avctx)
...
@@ -278,7 +278,7 @@ static int faac_decode_init(AVCodecContext *avctx)
if
(
err
)
{
if
(
err
)
{
dlclose
(
s
->
handle
);
dlclose
(
s
->
handle
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"FAAD library: cannot resolve %s in %s!
\n
"
,
av_log
(
avctx
,
AV_LOG_ERROR
,
"FAAD library: cannot resolve %s in %s!
\n
"
,
err
,
libfaadname
);
err
,
libfaadname
);
return
-
1
;
return
-
1
;
}
}
#endif
#endif
...
...
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