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
f24cc1b2
Commit
f24cc1b2
authored
Aug 21, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
alacenc: use s16p sample format as input
parent
358078d9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
13 deletions
+12
-13
alacenc.c
libavcodec/alacenc.c
+12
-13
No files found.
libavcodec/alacenc.c
View file @
f24cc1b2
...
...
@@ -78,17 +78,15 @@ typedef struct AlacEncodeContext {
}
AlacEncodeContext
;
static
void
init_sample_buffers
(
AlacEncodeContext
*
s
,
const
int16_t
*
input_samples
)
static
void
init_sample_buffers
(
AlacEncodeContext
*
s
,
int16_t
**
input_samples
)
{
int
ch
,
i
;
for
(
ch
=
0
;
ch
<
s
->
avctx
->
channels
;
ch
++
)
{
const
int16_t
*
sptr
=
input_samples
+
ch
;
for
(
i
=
0
;
i
<
s
->
frame_size
;
i
++
)
{
s
->
sample_buf
[
ch
][
i
]
=
*
sptr
;
sptr
+=
s
->
avctx
->
channels
;
}
int32_t
*
bptr
=
s
->
sample_buf
[
ch
];
const
int16_t
*
sptr
=
input_samples
[
ch
];
for
(
i
=
0
;
i
<
s
->
frame_size
;
i
++
)
bptr
[
i
]
=
sptr
[
i
];
}
}
...
...
@@ -347,8 +345,7 @@ static void alac_entropy_coder(AlacEncodeContext *s)
}
}
static
int
write_frame
(
AlacEncodeContext
*
s
,
AVPacket
*
avpkt
,
const
int16_t
*
samples
)
static
int
write_frame
(
AlacEncodeContext
*
s
,
AVPacket
*
avpkt
,
int16_t
**
samples
)
{
int
i
,
j
;
int
prediction_type
=
0
;
...
...
@@ -358,8 +355,10 @@ static int write_frame(AlacEncodeContext *s, AVPacket *avpkt,
if
(
s
->
verbatim
)
{
write_frame_header
(
s
);
for
(
i
=
0
;
i
<
s
->
frame_size
*
s
->
avctx
->
channels
;
i
++
)
put_sbits
(
pb
,
16
,
*
samples
++
);
/* samples are channel-interleaved in verbatim mode */
for
(
i
=
0
;
i
<
s
->
frame_size
;
i
++
)
for
(
j
=
0
;
j
<
s
->
avctx
->
channels
;
j
++
)
put_sbits
(
pb
,
16
,
samples
[
j
][
i
]);
}
else
{
init_sample_buffers
(
s
,
samples
);
write_frame_header
(
s
);
...
...
@@ -537,7 +536,7 @@ static int alac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
{
AlacEncodeContext
*
s
=
avctx
->
priv_data
;
int
out_bytes
,
max_frame_size
,
ret
;
const
int16_t
*
samples
=
(
const
int16_t
*
)
frame
->
data
[
0
]
;
int16_t
**
samples
=
(
int16_t
**
)
frame
->
extended_data
;
s
->
frame_size
=
frame
->
nb_samples
;
...
...
@@ -577,7 +576,7 @@ AVCodec ff_alac_encoder = {
.
encode2
=
alac_encode_frame
,
.
close
=
alac_encode_close
,
.
capabilities
=
CODEC_CAP_SMALL_LAST_FRAME
,
.
sample_fmts
=
(
const
enum
AVSampleFormat
[]){
AV_SAMPLE_FMT_S16
,
.
sample_fmts
=
(
const
enum
AVSampleFormat
[]){
AV_SAMPLE_FMT_S16
P
,
AV_SAMPLE_FMT_NONE
},
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"ALAC (Apple Lossless Audio Codec)"
),
};
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