Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
f5a756ef
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f5a756ef
编写于
5月 03, 2007
作者:
D
Diego Biurrun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Give libamr decoders/encoders a lib prefix in the name.
Originally committed as revision 8880 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
23aee960
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
37 addition
and
37 deletion
+37
-37
configure
configure
+16
-16
libavcodec/Makefile
libavcodec/Makefile
+1
-1
libavcodec/allcodecs.c
libavcodec/allcodecs.c
+2
-2
libavcodec/amr.c
libavcodec/amr.c
+14
-14
libavcodec/avcodec.h
libavcodec/avcodec.h
+4
-4
未找到文件。
configure
浏览文件 @
f5a756ef
...
@@ -83,6 +83,8 @@ show_help(){
...
@@ -83,6 +83,8 @@ show_help(){
echo
" --enable-liba52 enable GPLed liba52 support [default=no]"
echo
" --enable-liba52 enable GPLed liba52 support [default=no]"
echo
" --enable-liba52bin open liba52.so.0 at runtime [default=no]"
echo
" --enable-liba52bin open liba52.so.0 at runtime [default=no]"
echo
" --enable-avisynth allow reading AVISynth script files [default=no]"
echo
" --enable-avisynth allow reading AVISynth script files [default=no]"
echo
" --enable-libamr-nb enable libamr-nb floating point audio codec"
echo
" --enable-libamr-wb enable libamr-wb floating point audio codec"
echo
" --enable-libdts enable GPLed libdts support [default=no]"
echo
" --enable-libdts enable GPLed libdts support [default=no]"
echo
" --enable-libfaac enable FAAC support via libfaac [default=no]"
echo
" --enable-libfaac enable FAAC support via libfaac [default=no]"
echo
" --enable-libfaad enable FAAD support via libfaad [default=no]"
echo
" --enable-libfaad enable FAAD support via libfaad [default=no]"
...
@@ -98,8 +100,6 @@ show_help(){
...
@@ -98,8 +100,6 @@ show_help(){
echo
" --enable-x264 enable H.264 encoding via x264 [default=no]"
echo
" --enable-x264 enable H.264 encoding via x264 [default=no]"
echo
" --enable-xvid enable Xvid encoding via xvidcore,"
echo
" --enable-xvid enable Xvid encoding via xvidcore,"
echo
" native MPEG-4/Xvid encoder exists [default=no]"
echo
" native MPEG-4/Xvid encoder exists [default=no]"
echo
" --enable-amr-nb enable amr-nb floating point audio codec"
echo
" --enable-amr-wb enable amr-wb floating point audio codec"
echo
""
echo
""
echo
"Advanced options (experts only):"
echo
"Advanced options (experts only):"
echo
" --source-path=PATH path to source code [
$source_path
]"
echo
" --source-path=PATH path to source code [
$source_path
]"
...
@@ -556,9 +556,6 @@ CONFIG_LIST='
...
@@ -556,9 +556,6 @@ CONFIG_LIST='
parsers
parsers
muxers
muxers
demuxers
demuxers
amr
amr_nb
amr_wb
audio_beos
audio_beos
audio_oss
audio_oss
avisynth
avisynth
...
@@ -574,6 +571,9 @@ CONFIG_LIST='
...
@@ -574,6 +571,9 @@ CONFIG_LIST='
ipv6
ipv6
liba52
liba52
liba52bin
liba52bin
libamr
libamr_nb
libamr_wb
libdts
libdts
libfaac
libfaac
libfaad
libfaad
...
@@ -683,12 +683,12 @@ zmbv_encoder_deps="zlib"
...
@@ -683,12 +683,12 @@ zmbv_encoder_deps="zlib"
aac_decoder_deps
=
"libfaad"
aac_decoder_deps
=
"libfaad"
mpeg4aac_decoder_deps
=
"libfaad"
mpeg4aac_decoder_deps
=
"libfaad"
amr_nb_decoder_deps
=
"amr_nb"
amr_nb_encoder_deps
=
"amr_nb"
amr_wb_decoder_deps
=
"amr_wb"
amr_wb_encoder_deps
=
"amr_wb"
faac_encoder_deps
=
"libfaac"
faac_encoder_deps
=
"libfaac"
liba52_decoder_deps
=
"liba52"
liba52_decoder_deps
=
"liba52"
libamr_nb_decoder_deps
=
"libamr_nb"
libamr_nb_encoder_deps
=
"libamr_nb"
libamr_wb_decoder_deps
=
"libamr_wb"
libamr_wb_encoder_deps
=
"libamr_wb"
libdts_decoder_deps
=
"libdts"
libdts_decoder_deps
=
"libdts"
libgsm_decoder_deps
=
"libgsm"
libgsm_decoder_deps
=
"libgsm"
libgsm_encoder_deps
=
"libgsm"
libgsm_encoder_deps
=
"libgsm"
...
@@ -793,14 +793,14 @@ v4l2="yes"
...
@@ -793,14 +793,14 @@ v4l2="yes"
v4l
=
"yes"
v4l
=
"yes"
# libraries
# libraries
amr_nb
=
"no"
amr_wb
=
"no"
avisynth
=
"no"
avisynth
=
"no"
dc1394
=
"no"
dc1394
=
"no"
dlfcn_h
=
"no"
dlfcn_h
=
"no"
dlopen
=
"no"
dlopen
=
"no"
liba52
=
"no"
liba52
=
"no"
liba52bin
=
"no"
liba52bin
=
"no"
libamr_nb
=
"no"
libamr_wb
=
"no"
libdts
=
"no"
libdts
=
"no"
libfaac
=
"no"
libfaac
=
"no"
libfaad2
=
"no"
libfaad2
=
"no"
...
@@ -1586,12 +1586,12 @@ for thread in $THREADS_LIST; do
...
@@ -1586,12 +1586,12 @@ for thread in $THREADS_LIST; do
fi
fi
done
done
enabled_any
amr_nb amr_wb
&&
enable
amr
enabled_any
libamr_nb libamr_wb
&&
enable
lib
amr
# these are off by default, so fail if requested and not available
# these are off by default, so fail if requested and not available
enabled amr_nb
&&
require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init
-lamrnb
-lm
enabled amr_wb
&&
require libamrwb amrwb/dec_if.h D_IF_init
-lamrwb
-lm
enabled liba52
&&
require liba52 a52dec/a52.h a52_init
-la52
enabled liba52
&&
require liba52 a52dec/a52.h a52_init
-la52
enabled libamr_nb
&&
require libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init
-lamrnb
-lm
enabled libamr_wb
&&
require libamrwb amrwb/dec_if.h D_IF_init
-lamrwb
-lm
enabled libdts
&&
require libdts dts.h dts_init
-ldts
-lm
enabled libdts
&&
require libdts dts.h dts_init
-ldts
-lm
enabled libgsm
&&
require libgsm gsm.h gsm_create
-lgsm
enabled libgsm
&&
require libgsm gsm.h gsm_create
-lgsm
enabled libmp3lame
&&
require LAME lame/lame.h lame_init
-lmp3lame
-lm
enabled libmp3lame
&&
require LAME lame/lame.h lame_init
-lmp3lame
-lm
...
@@ -1851,6 +1851,8 @@ echo "Sun medialib support $mlib"
...
@@ -1851,6 +1851,8 @@ echo "Sun medialib support $mlib"
echo
"AVISynth enabled
$avisynth
"
echo
"AVISynth enabled
$avisynth
"
echo
"liba52 support
$liba52
"
echo
"liba52 support
$liba52
"
echo
"liba52 dlopened
$liba52bin
"
echo
"liba52 dlopened
$liba52bin
"
echo
"libamr-nb support
$libamr_nb
"
echo
"libamr-wb support
$libamr_wb
"
echo
"libdts support
$libdts
"
echo
"libdts support
$libdts
"
echo
"libfaac enabled
$libfaac
"
echo
"libfaac enabled
$libfaac
"
echo
"libfaad enabled
$libfaad
"
echo
"libfaad enabled
$libfaad
"
...
@@ -1864,8 +1866,6 @@ echo "libvorbis enabled $libvorbis"
...
@@ -1864,8 +1866,6 @@ echo "libvorbis enabled $libvorbis"
echo
"x264 enabled
$x264
"
echo
"x264 enabled
$x264
"
echo
"XviD enabled
$xvid
"
echo
"XviD enabled
$xvid
"
echo
"zlib enabled
$zlib
"
echo
"zlib enabled
$zlib
"
echo
"AMR-NB float support
$amr_nb
"
echo
"AMR-WB float support
$amr_wb
"
if
disabled gpl
;
then
if
disabled gpl
;
then
echo
"License: LGPL"
echo
"License: LGPL"
else
else
...
...
libavcodec/Makefile
浏览文件 @
f5a756ef
...
@@ -260,7 +260,7 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o
...
@@ -260,7 +260,7 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)
+=
adpcm.o
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)
+=
adpcm.o
# external codec libraries
# external codec libraries
OBJS-$(CONFIG_
AMR)
+=
amr.o
OBJS-$(CONFIG_
LIBAMR)
+=
amr.o
OBJS-$(CONFIG_LIBA52)
+=
a52dec.o
OBJS-$(CONFIG_LIBA52)
+=
a52dec.o
OBJS-$(CONFIG_LIBDTS)
+=
dtsdec.o
OBJS-$(CONFIG_LIBDTS)
+=
dtsdec.o
OBJS-$(CONFIG_LIBFAAC)
+=
faac.o
OBJS-$(CONFIG_LIBFAAC)
+=
faac.o
...
...
libavcodec/allcodecs.c
浏览文件 @
f5a756ef
...
@@ -165,8 +165,6 @@ void avcodec_register_all(void)
...
@@ -165,8 +165,6 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
MPEG4AAC
,
mpeg4aac
);
REGISTER_DECODER
(
MPEG4AAC
,
mpeg4aac
);
REGISTER_ENCODER
(
AC3
,
ac3
);
REGISTER_ENCODER
(
AC3
,
ac3
);
REGISTER_DECODER
(
ALAC
,
alac
);
REGISTER_DECODER
(
ALAC
,
alac
);
REGISTER_ENCDEC
(
AMR_NB
,
amr_nb
);
REGISTER_ENCDEC
(
AMR_WB
,
amr_wb
);
REGISTER_DECODER
(
ATRAC3
,
atrac3
);
REGISTER_DECODER
(
ATRAC3
,
atrac3
);
REGISTER_DECODER
(
COOK
,
cook
);
REGISTER_DECODER
(
COOK
,
cook
);
REGISTER_DECODER
(
DCA
,
dca
);
REGISTER_DECODER
(
DCA
,
dca
);
...
@@ -174,6 +172,8 @@ void avcodec_register_all(void)
...
@@ -174,6 +172,8 @@ void avcodec_register_all(void)
REGISTER_ENCODER
(
FAAC
,
faac
);
REGISTER_ENCODER
(
FAAC
,
faac
);
REGISTER_ENCDEC
(
FLAC
,
flac
);
REGISTER_ENCDEC
(
FLAC
,
flac
);
REGISTER_DECODER
(
IMC
,
imc
);
REGISTER_DECODER
(
IMC
,
imc
);
REGISTER_ENCDEC
(
LIBAMR_NB
,
libamr_nb
);
REGISTER_ENCDEC
(
LIBAMR_WB
,
libamr_wb
);
REGISTER_DECODER
(
LIBA52
,
liba52
);
REGISTER_DECODER
(
LIBA52
,
liba52
);
REGISTER_DECODER
(
LIBDTS
,
libdts
);
REGISTER_DECODER
(
LIBDTS
,
libdts
);
REGISTER_ENCDEC
(
LIBGSM
,
libgsm
);
REGISTER_ENCDEC
(
LIBGSM
,
libgsm
);
...
...
libavcodec/amr.c
浏览文件 @
f5a756ef
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
#include "avcodec.h"
#include "avcodec.h"
#ifdef CONFIG_AMR_NB_FIXED
#ifdef CONFIG_
LIB
AMR_NB_FIXED
#define MMS_IO
#define MMS_IO
...
@@ -136,7 +136,7 @@ static void amr_decode_fix_avctx(AVCodecContext * avctx)
...
@@ -136,7 +136,7 @@ static void amr_decode_fix_avctx(AVCodecContext * avctx)
avctx
->
frame_size
=
160
*
is_amr_wb
;
avctx
->
frame_size
=
160
*
is_amr_wb
;
}
}
#ifdef CONFIG_AMR_NB_FIXED
#ifdef CONFIG_
LIB
AMR_NB_FIXED
/* fixed point version*/
/* fixed point version*/
/* frame size in serial bitstream file (frame type + serial stream + flags) */
/* frame size in serial bitstream file (frame type + serial stream + flags) */
#define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5)
#define SERIAL_FRAMESIZE (1+MAX_SERIAL_SIZE+5)
...
@@ -352,7 +352,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
...
@@ -352,7 +352,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
}
}
#elif defined(CONFIG_AMR_NB)
/* Float point version*/
#elif defined(CONFIG_
LIB
AMR_NB)
/* Float point version*/
typedef
struct
AMRContext
{
typedef
struct
AMRContext
{
int
frameCount
;
int
frameCount
;
...
@@ -491,11 +491,11 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
...
@@ -491,11 +491,11 @@ static int amr_nb_encode_frame(AVCodecContext *avctx,
#endif
#endif
#if defined(CONFIG_
AMR_NB) || defined(CONFIG_
AMR_NB_FIXED)
#if defined(CONFIG_
LIBAMR_NB) || defined(CONFIG_LIB
AMR_NB_FIXED)
AVCodec
amr_nb_decoder
=
AVCodec
lib
amr_nb_decoder
=
{
{
"amr_nb"
,
"
lib
amr_nb"
,
CODEC_TYPE_AUDIO
,
CODEC_TYPE_AUDIO
,
CODEC_ID_AMR_NB
,
CODEC_ID_AMR_NB
,
sizeof
(
AMRContext
),
sizeof
(
AMRContext
),
...
@@ -505,9 +505,9 @@ AVCodec amr_nb_decoder =
...
@@ -505,9 +505,9 @@ AVCodec amr_nb_decoder =
amr_nb_decode_frame
,
amr_nb_decode_frame
,
};
};
AVCodec
amr_nb_encoder
=
AVCodec
lib
amr_nb_encoder
=
{
{
"amr_nb"
,
"
lib
amr_nb"
,
CODEC_TYPE_AUDIO
,
CODEC_TYPE_AUDIO
,
CODEC_ID_AMR_NB
,
CODEC_ID_AMR_NB
,
sizeof
(
AMRContext
),
sizeof
(
AMRContext
),
...
@@ -520,7 +520,7 @@ AVCodec amr_nb_encoder =
...
@@ -520,7 +520,7 @@ AVCodec amr_nb_encoder =
#endif
#endif
/* -----------AMR wideband ------------*/
/* -----------AMR wideband ------------*/
#ifdef CONFIG_AMR_WB
#ifdef CONFIG_
LIB
AMR_WB
#ifdef _TYPEDEF_H
#ifdef _TYPEDEF_H
//To avoid duplicate typedefs from typdef in amr-nb
//To avoid duplicate typedefs from typdef in amr-nb
...
@@ -684,9 +684,9 @@ static int amr_wb_decode_close(AVCodecContext * avctx)
...
@@ -684,9 +684,9 @@ static int amr_wb_decode_close(AVCodecContext * avctx)
return
0
;
return
0
;
}
}
AVCodec
amr_wb_decoder
=
AVCodec
lib
amr_wb_decoder
=
{
{
"amr_wb"
,
"
lib
amr_wb"
,
CODEC_TYPE_AUDIO
,
CODEC_TYPE_AUDIO
,
CODEC_ID_AMR_WB
,
CODEC_ID_AMR_WB
,
sizeof
(
AMRWBContext
),
sizeof
(
AMRWBContext
),
...
@@ -696,9 +696,9 @@ AVCodec amr_wb_decoder =
...
@@ -696,9 +696,9 @@ AVCodec amr_wb_decoder =
amr_wb_decode_frame
,
amr_wb_decode_frame
,
};
};
AVCodec
amr_wb_encoder
=
AVCodec
lib
amr_wb_encoder
=
{
{
"amr_wb"
,
"
lib
amr_wb"
,
CODEC_TYPE_AUDIO
,
CODEC_TYPE_AUDIO
,
CODEC_ID_AMR_WB
,
CODEC_ID_AMR_WB
,
sizeof
(
AMRWBContext
),
sizeof
(
AMRWBContext
),
...
@@ -708,4 +708,4 @@ AVCodec amr_wb_encoder =
...
@@ -708,4 +708,4 @@ AVCodec amr_wb_encoder =
NULL
,
NULL
,
};
};
#endif //CONFIG_AMR_WB
#endif //CONFIG_
LIB
AMR_WB
libavcodec/avcodec.h
浏览文件 @
f5a756ef
...
@@ -2423,12 +2423,12 @@ extern AVCodec rawvideo_encoder;
...
@@ -2423,12 +2423,12 @@ extern AVCodec rawvideo_encoder;
/* the following codecs use external libs */
/* the following codecs use external libs */
extern
AVCodec
aac_decoder
;
extern
AVCodec
aac_decoder
;
extern
AVCodec
amr_nb_decoder
;
extern
AVCodec
amr_nb_encoder
;
extern
AVCodec
amr_wb_decoder
;
extern
AVCodec
amr_wb_encoder
;
extern
AVCodec
faac_encoder
;
extern
AVCodec
faac_encoder
;
extern
AVCodec
liba52_decoder
;
extern
AVCodec
liba52_decoder
;
extern
AVCodec
libamr_nb_decoder
;
extern
AVCodec
libamr_nb_encoder
;
extern
AVCodec
libamr_wb_decoder
;
extern
AVCodec
libamr_wb_encoder
;
extern
AVCodec
libdts_decoder
;
extern
AVCodec
libdts_decoder
;
extern
AVCodec
libgsm_decoder
;
extern
AVCodec
libgsm_decoder
;
extern
AVCodec
libgsm_encoder
;
extern
AVCodec
libgsm_encoder
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录