diff mbox

[FFmpeg-devel] avcodec/g722enc: force mono channel layout

Message ID 20170623214235.31747-1-k@ylo.ph
State New
Headers show

Commit Message

Kyle Swanson June 23, 2017, 9:42 p.m. UTC 
Signed-off-by: Kyle Swanson <k@ylo.ph>
---
 libavcodec/g722enc.c | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

Comments

Paul B Mahol June 23, 2017, 10:46 p.m. UTC | #1 
On 6/23/17, Kyle Swanson <k@ylo.ph> wrote:
> Signed-off-by: Kyle Swanson <k@ylo.ph>
> ---
>  libavcodec/g722enc.c | 27 +++++++++++----------------
>  1 file changed, 11 insertions(+), 16 deletions(-)
>

Should be fine iff other than mono is really dissalowed.
Kyle Swanson June 23, 2017, 11:08 p.m. UTC | #2 
On Fri, Jun 23, 2017 at 5:46 PM, Paul B Mahol <onemda@gmail.com> wrote:
> On 6/23/17, Kyle Swanson <k@ylo.ph> wrote:
>> Signed-off-by: Kyle Swanson <k@ylo.ph>
>> ---
>>  libavcodec/g722enc.c | 27 +++++++++++----------------
>>  1 file changed, 11 insertions(+), 16 deletions(-)
>>
>
> Should be fine iff other than mono is really dissalowed.

Spec says mono only.
Kyle Swanson June 26, 2017, 2:52 p.m. UTC | #3 
On Fri, Jun 23, 2017 at 5:46 PM, Paul B Mahol <onemda@gmail.com> wrote:

> On 6/23/17, Kyle Swanson <k@ylo.ph> wrote:
> > Signed-off-by: Kyle Swanson <k@ylo.ph>
> > ---
> >  libavcodec/g722enc.c | 27 +++++++++++----------------
> >  1 file changed, 11 insertions(+), 16 deletions(-)
> >
>
> Should be fine iff other than mono is really dissalowed.
>

Pushed, thanks.
diff mbox

Patch

diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c
index 01a3db26fd..473646f45c 100644
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@@ -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},
 };