Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
4aa85033
Commit
4aa85033
authored
Mar 21, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sonicdec: update to new buffer API
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
85d7f546
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
sonic.c
libavcodec/sonic.c
+4
-8
No files found.
libavcodec/sonic.c
View file @
4aa85033
...
@@ -45,7 +45,6 @@
...
@@ -45,7 +45,6 @@
#define RIGHT_SIDE 2
#define RIGHT_SIDE 2
typedef
struct
SonicContext
{
typedef
struct
SonicContext
{
AVFrame
frame
;
int
lossless
,
decorrelation
;
int
lossless
,
decorrelation
;
int
num_taps
,
downsampling
;
int
num_taps
,
downsampling
;
...
@@ -767,9 +766,6 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
...
@@ -767,9 +766,6 @@ static av_cold int sonic_decode_init(AVCodecContext *avctx)
s
->
channels
=
avctx
->
channels
;
s
->
channels
=
avctx
->
channels
;
s
->
samplerate
=
avctx
->
sample_rate
;
s
->
samplerate
=
avctx
->
sample_rate
;
avcodec_get_frame_defaults
(
&
s
->
frame
);
avctx
->
coded_frame
=
&
s
->
frame
;
if
(
!
avctx
->
extradata
)
if
(
!
avctx
->
extradata
)
{
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"No mandatory headers present
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"No mandatory headers present
\n
"
);
...
@@ -879,13 +875,14 @@ static int sonic_decode_frame(AVCodecContext *avctx,
...
@@ -879,13 +875,14 @@ static int sonic_decode_frame(AVCodecContext *avctx,
GetBitContext
gb
;
GetBitContext
gb
;
int
i
,
quant
,
ch
,
j
,
ret
;
int
i
,
quant
,
ch
,
j
,
ret
;
int16_t
*
samples
;
int16_t
*
samples
;
AVFrame
*
frame
=
data
;
if
(
buf_size
==
0
)
return
0
;
if
(
buf_size
==
0
)
return
0
;
s
->
frame
.
nb_samples
=
s
->
frame_size
/
avctx
->
channels
;
frame
->
nb_samples
=
s
->
frame_size
/
avctx
->
channels
;
if
((
ret
=
ff_get_buffer
(
avctx
,
&
s
->
frame
,
0
))
<
0
)
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
))
<
0
)
return
ret
;
return
ret
;
samples
=
(
int16_t
*
)
s
->
frame
.
data
[
0
];
samples
=
(
int16_t
*
)
frame
->
data
[
0
];
// av_log(NULL, AV_LOG_INFO, "buf_size: %d\n", buf_size);
// av_log(NULL, AV_LOG_INFO, "buf_size: %d\n", buf_size);
...
@@ -958,7 +955,6 @@ static int sonic_decode_frame(AVCodecContext *avctx,
...
@@ -958,7 +955,6 @@ static int sonic_decode_frame(AVCodecContext *avctx,
align_get_bits
(
&
gb
);
align_get_bits
(
&
gb
);
*
got_frame_ptr
=
1
;
*
got_frame_ptr
=
1
;
*
(
AVFrame
*
)
data
=
s
->
frame
;
return
(
get_bits_count
(
&
gb
)
+
7
)
/
8
;
return
(
get_bits_count
(
&
gb
)
+
7
)
/
8
;
}
}
...
...
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