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
3d371f41
Commit
3d371f41
authored
Sep 12, 2011
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ws_snd: misc cosmetic clean-ups
parent
659c719b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
14 deletions
+11
-14
ws-snd1.c
libavcodec/ws-snd1.c
+11
-14
No files found.
libavcodec/ws-snd1.c
View file @
3d371f41
...
...
@@ -25,7 +25,7 @@
/**
* @file
* Westwood SNDx codecs
.
* Westwood SNDx codecs
*
* Reference documents about VQA format and its audio codecs
* can be found here:
...
...
@@ -34,12 +34,11 @@
static
const
int8_t
ws_adpcm_4bit
[]
=
{
-
9
,
-
8
,
-
6
,
-
5
,
-
4
,
-
3
,
-
2
,
-
1
,
0
,
1
,
2
,
3
,
4
,
5
,
6
,
8
};
0
,
1
,
2
,
3
,
4
,
5
,
6
,
8
};
static
av_cold
int
ws_snd_decode_init
(
AVCodecContext
*
avctx
)
static
av_cold
int
ws_snd_decode_init
(
AVCodecContext
*
avctx
)
{
// WSSNDContext *c = avctx->priv_data;
if
(
avctx
->
channels
!=
1
)
{
av_log_ask_for_sample
(
avctx
,
"unsupported number of channels
\n
"
);
return
AVERROR
(
EINVAL
);
...
...
@@ -49,13 +48,11 @@ static av_cold int ws_snd_decode_init(AVCodecContext * avctx)
return
0
;
}
static
int
ws_snd_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
data_size
,
AVPacket
*
avpkt
)
static
int
ws_snd_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
data_size
,
AVPacket
*
avpkt
)
{
const
uint8_t
*
buf
=
avpkt
->
data
;
int
buf_size
=
avpkt
->
size
;
// WSSNDContext *c = avctx->priv_data;
int
buf_size
=
avpkt
->
size
;
int
in_size
,
out_size
;
int
sample
=
128
;
...
...
@@ -71,7 +68,7 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
}
out_size
=
AV_RL16
(
&
buf
[
0
]);
in_size
=
AV_RL16
(
&
buf
[
2
]);
in_size
=
AV_RL16
(
&
buf
[
2
]);
buf
+=
4
;
if
(
out_size
>
*
data_size
)
{
...
...
@@ -93,8 +90,8 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
while
(
samples
<
samples_end
&&
buf
-
avpkt
->
data
<
buf_size
)
{
int
code
,
smp
,
size
;
uint8_t
count
;
code
=
(
*
buf
)
>>
6
;
count
=
(
*
buf
)
&
0x3F
;
code
=
*
buf
>>
6
;
count
=
*
buf
&
0x3F
;
buf
++
;
/* make sure we don't write past the output buffer */
...
...
@@ -112,7 +109,7 @@ static int ws_snd_decode_frame(AVCodecContext *avctx,
if
((
buf
-
avpkt
->
data
)
+
size
>
buf_size
)
break
;
switch
(
code
)
{
switch
(
code
)
{
case
0
:
/* ADPCM 2-bit */
for
(
count
++
;
count
>
0
;
count
--
)
{
code
=
*
buf
++
;
...
...
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