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
b4edbe9a
Commit
b4edbe9a
authored
Jul 08, 2014
by
Nidhi Makhijani
Committed by
Diego Biurrun
Jul 18, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libgsm: Split decoder and encoder
Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
8b0dd494
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
158 additions
and
116 deletions
+158
-116
Makefile
libavcodec/Makefile
+4
-4
libgsmdec.c
libavcodec/libgsmdec.c
+151
-0
libgsmenc.c
libavcodec/libgsmenc.c
+3
-112
No files found.
libavcodec/Makefile
View file @
b4edbe9a
...
...
@@ -597,10 +597,10 @@ OBJS-$(CONFIG_WTV_DEMUXER) += mpeg4audio.o mpegaudiodata.o
OBJS-$(CONFIG_LIBFAAC_ENCODER)
+=
libfaac.o
OBJS-$(CONFIG_LIBFDK_AAC_DECODER)
+=
libfdk-aacdec.o
OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)
+=
libfdk-aacenc.o
OBJS-$(CONFIG_LIBGSM_DECODER)
+=
libgsm.o
OBJS-$(CONFIG_LIBGSM_ENCODER)
+=
libgsm.o
OBJS-$(CONFIG_LIBGSM_MS_DECODER)
+=
libgsm.o
OBJS-$(CONFIG_LIBGSM_MS_ENCODER)
+=
libgsm.o
OBJS-$(CONFIG_LIBGSM_DECODER)
+=
libgsm
dec
.o
OBJS-$(CONFIG_LIBGSM_ENCODER)
+=
libgsm
enc
.o
OBJS-$(CONFIG_LIBGSM_MS_DECODER)
+=
libgsm
dec
.o
OBJS-$(CONFIG_LIBGSM_MS_ENCODER)
+=
libgsm
enc
.o
OBJS-$(CONFIG_LIBILBC_DECODER)
+=
libilbc.o
OBJS-$(CONFIG_LIBILBC_ENCODER)
+=
libilbc.o
OBJS-$(CONFIG_LIBMP3LAME_ENCODER)
+=
libmp3lame.o
mpegaudiodecheader.o
...
...
libavcodec/libgsmdec.c
0 → 100644
View file @
b4edbe9a
/*
* Interface to libgsm for GSM decoding
* Copyright (c) 2005 Alban Bedel <albeu@free.fr>
* Copyright (c) 2006, 2007 Michel Bardiaux <mbardiaux@mediaxim.be>
*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
* @file
* Interface to libgsm for GSM decoding
*/
// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
#include "config.h"
#if HAVE_GSM_H
#include <gsm.h>
#else
#include <gsm/gsm.h>
#endif
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "avcodec.h"
#include "internal.h"
#include "gsm.h"
typedef
struct
LibGSMDecodeContext
{
struct
gsm_state
*
state
;
}
LibGSMDecodeContext
;
static
av_cold
int
libgsm_decode_init
(
AVCodecContext
*
avctx
)
{
LibGSMDecodeContext
*
s
=
avctx
->
priv_data
;
avctx
->
channels
=
1
;
avctx
->
channel_layout
=
AV_CH_LAYOUT_MONO
;
avctx
->
sample_rate
=
8000
;
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16
;
s
->
state
=
gsm_create
();
switch
(
avctx
->
codec_id
)
{
case
AV_CODEC_ID_GSM
:
avctx
->
frame_size
=
GSM_FRAME_SIZE
;
avctx
->
block_align
=
GSM_BLOCK_SIZE
;
break
;
case
AV_CODEC_ID_GSM_MS
:
{
int
one
=
1
;
gsm_option
(
s
->
state
,
GSM_OPT_WAV49
,
&
one
);
avctx
->
frame_size
=
2
*
GSM_FRAME_SIZE
;
avctx
->
block_align
=
GSM_MS_BLOCK_SIZE
;
}
}
return
0
;
}
static
av_cold
int
libgsm_decode_close
(
AVCodecContext
*
avctx
)
{
LibGSMDecodeContext
*
s
=
avctx
->
priv_data
;
gsm_destroy
(
s
->
state
);
s
->
state
=
NULL
;
return
0
;
}
static
int
libgsm_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
{
int
i
,
ret
;
LibGSMDecodeContext
*
s
=
avctx
->
priv_data
;
AVFrame
*
frame
=
data
;
uint8_t
*
buf
=
avpkt
->
data
;
int
buf_size
=
avpkt
->
size
;
int16_t
*
samples
;
if
(
buf_size
<
avctx
->
block_align
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Packet is too small
\n
"
);
return
AVERROR_INVALIDDATA
;
}
/* get output buffer */
frame
->
nb_samples
=
avctx
->
frame_size
;
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
ret
;
}
samples
=
(
int16_t
*
)
frame
->
data
[
0
];
for
(
i
=
0
;
i
<
avctx
->
frame_size
/
GSM_FRAME_SIZE
;
i
++
)
{
if
((
ret
=
gsm_decode
(
s
->
state
,
buf
,
samples
))
<
0
)
return
-
1
;
buf
+=
GSM_BLOCK_SIZE
;
samples
+=
GSM_FRAME_SIZE
;
}
*
got_frame_ptr
=
1
;
return
avctx
->
block_align
;
}
static
void
libgsm_flush
(
AVCodecContext
*
avctx
)
{
LibGSMDecodeContext
*
s
=
avctx
->
priv_data
;
int
one
=
1
;
gsm_destroy
(
s
->
state
);
s
->
state
=
gsm_create
();
if
(
avctx
->
codec_id
==
AV_CODEC_ID_GSM_MS
)
gsm_option
(
s
->
state
,
GSM_OPT_WAV49
,
&
one
);
}
AVCodec
ff_libgsm_decoder
=
{
.
name
=
"libgsm"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libgsm GSM"
),
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
id
=
AV_CODEC_ID_GSM
,
.
priv_data_size
=
sizeof
(
LibGSMDecodeContext
),
.
init
=
libgsm_decode_init
,
.
close
=
libgsm_decode_close
,
.
decode
=
libgsm_decode_frame
,
.
flush
=
libgsm_flush
,
.
capabilities
=
CODEC_CAP_DR1
,
};
AVCodec
ff_libgsm_ms_decoder
=
{
.
name
=
"libgsm_ms"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libgsm GSM Microsoft variant"
),
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
id
=
AV_CODEC_ID_GSM_MS
,
.
priv_data_size
=
sizeof
(
LibGSMDecodeContext
),
.
init
=
libgsm_decode_init
,
.
close
=
libgsm_decode_close
,
.
decode
=
libgsm_decode_frame
,
.
flush
=
libgsm_flush
,
.
capabilities
=
CODEC_CAP_DR1
,
};
libavcodec/libgsm.c
→
libavcodec/libgsm
enc
.c
View file @
b4edbe9a
/*
* Interface to libgsm for
gsm encoding/de
coding
* Interface to libgsm for
GSM en
coding
* Copyright (c) 2005 Alban Bedel <albeu@free.fr>
* Copyright (c) 2006, 2007 Michel Bardiaux <mbardiaux@mediaxim.be>
*
...
...
@@ -22,7 +22,7 @@
/**
* @file
* Interface to libgsm for
gsm encoding/de
coding
* Interface to libgsm for
GSM en
coding
*/
// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
...
...
@@ -34,8 +34,8 @@
#include <gsm/gsm.h>
#endif
#include "libavutil/channel_layout.h"
#include "libavutil/common.h"
#include "avcodec.h"
#include "internal.h"
#include "gsm.h"
...
...
@@ -135,112 +135,3 @@ AVCodec ff_libgsm_ms_encoder = {
.
sample_fmts
=
(
const
enum
AVSampleFormat
[]){
AV_SAMPLE_FMT_S16
,
AV_SAMPLE_FMT_NONE
},
};
typedef
struct
LibGSMDecodeContext
{
struct
gsm_state
*
state
;
}
LibGSMDecodeContext
;
static
av_cold
int
libgsm_decode_init
(
AVCodecContext
*
avctx
)
{
LibGSMDecodeContext
*
s
=
avctx
->
priv_data
;
avctx
->
channels
=
1
;
avctx
->
channel_layout
=
AV_CH_LAYOUT_MONO
;
avctx
->
sample_rate
=
8000
;
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16
;
s
->
state
=
gsm_create
();
switch
(
avctx
->
codec_id
)
{
case
AV_CODEC_ID_GSM
:
avctx
->
frame_size
=
GSM_FRAME_SIZE
;
avctx
->
block_align
=
GSM_BLOCK_SIZE
;
break
;
case
AV_CODEC_ID_GSM_MS
:
{
int
one
=
1
;
gsm_option
(
s
->
state
,
GSM_OPT_WAV49
,
&
one
);
avctx
->
frame_size
=
2
*
GSM_FRAME_SIZE
;
avctx
->
block_align
=
GSM_MS_BLOCK_SIZE
;
}
}
return
0
;
}
static
av_cold
int
libgsm_decode_close
(
AVCodecContext
*
avctx
)
{
LibGSMDecodeContext
*
s
=
avctx
->
priv_data
;
gsm_destroy
(
s
->
state
);
s
->
state
=
NULL
;
return
0
;
}
static
int
libgsm_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
{
int
i
,
ret
;
LibGSMDecodeContext
*
s
=
avctx
->
priv_data
;
AVFrame
*
frame
=
data
;
uint8_t
*
buf
=
avpkt
->
data
;
int
buf_size
=
avpkt
->
size
;
int16_t
*
samples
;
if
(
buf_size
<
avctx
->
block_align
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Packet is too small
\n
"
);
return
AVERROR_INVALIDDATA
;
}
/* get output buffer */
frame
->
nb_samples
=
avctx
->
frame_size
;
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
,
0
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
ret
;
}
samples
=
(
int16_t
*
)
frame
->
data
[
0
];
for
(
i
=
0
;
i
<
avctx
->
frame_size
/
GSM_FRAME_SIZE
;
i
++
)
{
if
((
ret
=
gsm_decode
(
s
->
state
,
buf
,
samples
))
<
0
)
return
-
1
;
buf
+=
GSM_BLOCK_SIZE
;
samples
+=
GSM_FRAME_SIZE
;
}
*
got_frame_ptr
=
1
;
return
avctx
->
block_align
;
}
static
void
libgsm_flush
(
AVCodecContext
*
avctx
)
{
LibGSMDecodeContext
*
s
=
avctx
->
priv_data
;
int
one
=
1
;
gsm_destroy
(
s
->
state
);
s
->
state
=
gsm_create
();
if
(
avctx
->
codec_id
==
AV_CODEC_ID_GSM_MS
)
gsm_option
(
s
->
state
,
GSM_OPT_WAV49
,
&
one
);
}
AVCodec
ff_libgsm_decoder
=
{
.
name
=
"libgsm"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libgsm GSM"
),
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
id
=
AV_CODEC_ID_GSM
,
.
priv_data_size
=
sizeof
(
LibGSMDecodeContext
),
.
init
=
libgsm_decode_init
,
.
close
=
libgsm_decode_close
,
.
decode
=
libgsm_decode_frame
,
.
flush
=
libgsm_flush
,
.
capabilities
=
CODEC_CAP_DR1
,
};
AVCodec
ff_libgsm_ms_decoder
=
{
.
name
=
"libgsm_ms"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"libgsm GSM Microsoft variant"
),
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
id
=
AV_CODEC_ID_GSM_MS
,
.
priv_data_size
=
sizeof
(
LibGSMDecodeContext
),
.
init
=
libgsm_decode_init
,
.
close
=
libgsm_decode_close
,
.
decode
=
libgsm_decode_frame
,
.
flush
=
libgsm_flush
,
.
capabilities
=
CODEC_CAP_DR1
,
};
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