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
9ff6d079
Commit
9ff6d079
authored
Sep 08, 2011
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adpcmenc: Set bits_per_coded_sample
parent
b304244b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
adpcmenc.c
libavcodec/adpcmenc.c
+2
-0
utils.c
libavcodec/utils.c
+2
-0
No files found.
libavcodec/adpcmenc.c
View file @
9ff6d079
...
@@ -86,6 +86,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx)
...
@@ -86,6 +86,8 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx)
FF_ALLOC_OR_GOTO
(
avctx
,
s
->
trellis_hash
,
65536
*
sizeof
(
*
s
->
trellis_hash
),
error
);
FF_ALLOC_OR_GOTO
(
avctx
,
s
->
trellis_hash
,
65536
*
sizeof
(
*
s
->
trellis_hash
),
error
);
}
}
avctx
->
bits_per_coded_sample
=
av_get_bits_per_sample
(
avctx
->
codec
->
id
);
switch
(
avctx
->
codec
->
id
)
{
switch
(
avctx
->
codec
->
id
)
{
case
CODEC_ID_ADPCM_IMA_WAV
:
case
CODEC_ID_ADPCM_IMA_WAV
:
avctx
->
frame_size
=
(
BLKSIZE
-
4
*
avctx
->
channels
)
*
8
/
(
4
*
avctx
->
channels
)
+
1
;
/* each 16 bits sample gives one nibble */
avctx
->
frame_size
=
(
BLKSIZE
-
4
*
avctx
->
channels
)
*
8
/
(
4
*
avctx
->
channels
)
+
1
;
/* each 16 bits sample gives one nibble */
...
...
libavcodec/utils.c
View file @
9ff6d079
...
@@ -1121,6 +1121,8 @@ int av_get_bits_per_sample(enum CodecID codec_id){
...
@@ -1121,6 +1121,8 @@ int av_get_bits_per_sample(enum CodecID codec_id){
case
CODEC_ID_ADPCM_SBPRO_4
:
case
CODEC_ID_ADPCM_SBPRO_4
:
case
CODEC_ID_ADPCM_CT
:
case
CODEC_ID_ADPCM_CT
:
case
CODEC_ID_ADPCM_IMA_WAV
:
case
CODEC_ID_ADPCM_IMA_WAV
:
case
CODEC_ID_ADPCM_IMA_QT
:
case
CODEC_ID_ADPCM_SWF
:
case
CODEC_ID_ADPCM_MS
:
case
CODEC_ID_ADPCM_MS
:
case
CODEC_ID_ADPCM_YAMAHA
:
case
CODEC_ID_ADPCM_YAMAHA
:
return
4
;
return
4
;
...
...
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