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
c11ca610
Commit
c11ca610
authored
Jun 23, 2017
by
Kyle Swanson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/g722enc: force mono channel layout
Signed-off-by:
Kyle Swanson
<
k@ylo.ph
>
parent
3c702517
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
16 deletions
+11
-16
g722enc.c
libavcodec/g722enc.c
+11
-16
No files found.
libavcodec/g722enc.c
View file @
c11ca610
...
...
@@ -61,11 +61,6 @@ static av_cold int g722_encode_init(AVCodecContext * avctx)
G722Context
*
c
=
avctx
->
priv_data
;
int
ret
;
if
(
avctx
->
channels
!=
1
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Only mono tracks are allowed.
\n
"
);
return
AVERROR_INVALIDDATA
;
}
c
->
band
[
0
].
scale_factor
=
8
;
c
->
band
[
1
].
scale_factor
=
2
;
c
->
prev_samples_pos
=
22
;
...
...
@@ -381,15 +376,15 @@ static int g722_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
}
AVCodec
ff_adpcm_g722_encoder
=
{
.
name
=
"g722"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"G.722 ADPCM"
),
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
id
=
AV_CODEC_ID_ADPCM_G722
,
.
priv_data_size
=
sizeof
(
G722Context
),
.
init
=
g722_encode_init
,
.
close
=
g722_encode_close
,
.
encode2
=
g722_encode_frame
,
.
capabilities
=
AV_CODEC_CAP_SMALL_LAST_FRAME
,
.
sample_fmts
=
(
const
enum
AVSampleFormat
[]){
AV_SAMPLE_FMT_S16
,
AV_SAMPLE_FMT_NONE
},
.
name
=
"g722"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"G.722 ADPCM"
),
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
id
=
AV_CODEC_ID_ADPCM_G722
,
.
priv_data_size
=
sizeof
(
G722Context
),
.
init
=
g722_encode_init
,
.
close
=
g722_encode_close
,
.
encode2
=
g722_encode_frame
,
.
capabilities
=
AV_CODEC_CAP_SMALL_LAST_FRAME
,
.
sample_fmts
=
(
const
enum
AVSampleFormat
[]){
AV_SAMPLE_FMT_S16
,
AV_SAMPLE_FMT_NONE
}
,
.
channel_layouts
=
(
const
uint64_t
[]){
AV_CH_LAYOUT_MONO
,
0
},
};
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