Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
80783dc2
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,发现更多精彩内容 >>
提交
80783dc2
编写于
9月 08, 2003
作者:
F
Fabrice Bellard
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
CODEC_ID_MP3LAME is obsolete
Originally committed as revision 2232 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
dcedf586
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
21 addition
and
21 deletion
+21
-21
libavcodec/mp3lameaudio.c
libavcodec/mp3lameaudio.c
+1
-1
libavcodec/mpegaudiodec.c
libavcodec/mpegaudiodec.c
+1
-1
libavformat/asf.c
libavformat/asf.c
+3
-3
libavformat/avienc.c
libavformat/avienc.c
+3
-3
libavformat/flvdec.c
libavformat/flvdec.c
+1
-1
libavformat/flvenc.c
libavformat/flvenc.c
+2
-2
libavformat/nut.c
libavformat/nut.c
+1
-1
libavformat/raw.c
libavformat/raw.c
+2
-2
libavformat/rtp.c
libavformat/rtp.c
+3
-3
libavformat/wav.c
libavformat/wav.c
+4
-4
未找到文件。
libavcodec/mp3lameaudio.c
浏览文件 @
80783dc2
...
...
@@ -99,7 +99,7 @@ int MP3lame_encode_close(AVCodecContext *avctx)
AVCodec
mp3lame_encoder
=
{
"mp3"
,
CODEC_TYPE_AUDIO
,
CODEC_ID_MP3
LAME
,
CODEC_ID_MP3
,
sizeof
(
Mp3AudioContext
),
MP3lame_encode_init
,
MP3lame_encode_frame
,
...
...
libavcodec/mpegaudiodec.c
浏览文件 @
80783dc2
...
...
@@ -2597,7 +2597,7 @@ AVCodec mp3_decoder =
{
"mp3"
,
CODEC_TYPE_AUDIO
,
CODEC_ID_MP3
LAME
,
CODEC_ID_MP3
,
sizeof
(
MPADecodeContext
),
decode_init
,
NULL
,
...
...
libavformat/asf.c
浏览文件 @
80783dc2
...
...
@@ -870,7 +870,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
asf_st
->
ds_span
=
0
;
// disable descrambling
}
switch
(
st
->
codec
.
codec_id
)
{
case
CODEC_ID_MP3
LAME
:
case
CODEC_ID_MP3
:
st
->
codec
.
frame_size
=
MPA_FRAME_SIZE
;
break
;
case
CODEC_ID_PCM_S16LE
:
...
...
@@ -1252,7 +1252,7 @@ static AVOutputFormat asf_oformat = {
"asf,wmv"
,
sizeof
(
ASFContext
),
#ifdef CONFIG_MP3LAME
CODEC_ID_MP3
LAME
,
CODEC_ID_MP3
,
#else
CODEC_ID_MP2
,
#endif
...
...
@@ -1269,7 +1269,7 @@ static AVOutputFormat asf_stream_oformat = {
"asf,wmv"
,
sizeof
(
ASFContext
),
#ifdef CONFIG_MP3LAME
CODEC_ID_MP3
LAME
,
CODEC_ID_MP3
,
#else
CODEC_ID_MP2
,
#endif
...
...
libavformat/avienc.c
浏览文件 @
80783dc2
...
...
@@ -240,7 +240,7 @@ static void parse_specific_params(AVCodecContext *stream, int *au_byterate, int
*
au_ssize
=
1
;
*
au_scale
=
1
;
*
au_byterate
=
stream
->
bit_rate
/
8
;
case
CODEC_ID_MP3
LAME
:
case
CODEC_ID_MP3
:
*
au_ssize
=
1
;
*
au_scale
=
1
;
*
au_byterate
=
stream
->
bit_rate
/
8
;
...
...
@@ -570,7 +570,7 @@ static int avi_write_idx1(AVFormatContext *s)
if
(
nb_frames
<
stream
->
frame_number
)
nb_frames
=
stream
->
frame_number
;
}
else
{
if
(
stream
->
codec_id
==
CODEC_ID_MP2
||
stream
->
codec_id
==
CODEC_ID_MP3
LAME
)
{
if
(
stream
->
codec_id
==
CODEC_ID_MP2
||
stream
->
codec_id
==
CODEC_ID_MP3
)
{
put_le32
(
pb
,
stream
->
frame_number
);
nb_frames
+=
stream
->
frame_number
;
}
else
{
...
...
@@ -675,7 +675,7 @@ static int avi_write_trailer(AVFormatContext *s)
if
(
nb_frames
<
stream
->
frame_number
)
nb_frames
=
stream
->
frame_number
;
}
else
{
if
(
stream
->
codec_id
==
CODEC_ID_MP2
||
stream
->
codec_id
==
CODEC_ID_MP3
LAME
)
{
if
(
stream
->
codec_id
==
CODEC_ID_MP2
||
stream
->
codec_id
==
CODEC_ID_MP3
)
{
nb_frames
+=
stream
->
frame_number
;
}
}
...
...
libavformat/flvdec.c
浏览文件 @
80783dc2
...
...
@@ -64,7 +64,7 @@ static int flv_read_header(AVFormatContext *s,
if
(
!
st
)
return
AVERROR_NOMEM
;
st
->
codec
.
codec_type
=
CODEC_TYPE_AUDIO
;
st
->
codec
.
codec_id
=
CODEC_ID_MP3
LAME
;
st
->
codec
.
codec_id
=
CODEC_ID_MP3
;
}
offset
=
get_be32
(
&
s
->
pb
);
...
...
libavformat/flvenc.c
浏览文件 @
80783dc2
...
...
@@ -268,7 +268,7 @@ static int flv_write_packet(AVFormatContext *s, int stream_index,
}
else
if
(
enc
->
codec_type
==
CODEC_TYPE_AUDIO
)
{
#ifdef CONFIG_MP3LAME
if
(
enc
->
codec_id
==
CODEC_ID_MP3
LAME
)
{
if
(
enc
->
codec_id
==
CODEC_ID_MP3
)
{
int
c
=
0
;
for
(;
c
<
size
;
c
++
)
{
flv
->
audioFifo
[(
flv
->
audioOutPos
+
c
)
%
AUDIO_FIFO_SIZE
]
=
buf
[
c
];
...
...
@@ -366,7 +366,7 @@ static AVOutputFormat flv_oformat = {
"flv"
,
sizeof
(
FLVContext
),
#ifdef CONFIG_MP3LAME
CODEC_ID_MP3
LAME
,
CODEC_ID_MP3
,
#else // CONFIG_MP3LAME
CODEC_ID_NONE
,
#endif // CONFIG_MP3LAME
...
...
libavformat/nut.c
浏览文件 @
80783dc2
...
...
@@ -567,7 +567,7 @@ static AVOutputFormat nut_oformat = {
#ifdef CONFIG_VORBIS
CODEC_ID_VORBIS
,
#elif defined(CONFIG_MP3LAME)
CODEC_ID_MP3
LAME
,
CODEC_ID_MP3
,
#else
CODEC_ID_MP2
,
/* AC3 needs liba52 decoder */
#endif
...
...
libavformat/raw.c
浏览文件 @
80783dc2
...
...
@@ -129,7 +129,7 @@ static int mp3_read_header(AVFormatContext *s,
break
;
if
(
pos
<
s
->
pb
.
buffer_size
-
1
&&
(
s
->
pb
.
buffer
[
pos
+
1
]
&
6
)
==
2
)
st
->
codec
.
codec_id
=
CODEC_ID_MP3
LAME
;
st
->
codec
.
codec_id
=
CODEC_ID_MP3
;
/* the parameters will be extracted from the compressed bitstream */
return
0
;
...
...
@@ -259,7 +259,7 @@ AVOutputFormat mp3_oformat = {
"audio/x-mpeg"
,
"mp3"
,
0
,
CODEC_ID_MP3
LAME
,
CODEC_ID_MP3
,
0
,
raw_write_header
,
raw_write_packet
,
...
...
libavformat/rtp.c
浏览文件 @
80783dc2
...
...
@@ -170,7 +170,7 @@ int rtp_get_payload_type(AVCodecContext *codec)
}
break
;
case
CODEC_ID_MP2
:
case
CODEC_ID_MP3
LAME
:
case
CODEC_ID_MP3
:
payload_type
=
RTP_PT_MPEGAUDIO
;
break
;
case
CODEC_ID_MJPEG
:
...
...
@@ -390,7 +390,7 @@ static int rtp_write_header(AVFormatContext *s1)
switch
(
st
->
codec
.
codec_id
)
{
case
CODEC_ID_MP2
:
case
CODEC_ID_MP3
LAME
:
case
CODEC_ID_MP3
:
s
->
buf_ptr
=
s
->
buf
+
4
;
s
->
cur_timestamp
=
0
;
break
;
...
...
@@ -650,7 +650,7 @@ static int rtp_write_packet(AVFormatContext *s1, int stream_index,
rtp_send_samples
(
s1
,
buf1
,
size
,
2
*
st
->
codec
.
channels
);
break
;
case
CODEC_ID_MP2
:
case
CODEC_ID_MP3
LAME
:
case
CODEC_ID_MP3
:
rtp_send_mpegaudio
(
s1
,
buf1
,
size
);
break
;
case
CODEC_ID_MPEG1VIDEO
:
...
...
libavformat/wav.c
浏览文件 @
80783dc2
...
...
@@ -21,7 +21,7 @@
const
CodecTag
codec_wav_tags
[]
=
{
{
CODEC_ID_MP2
,
0x50
},
{
CODEC_ID_MP3
LAME
,
0x55
},
{
CODEC_ID_MP3
,
0x55
},
{
CODEC_ID_AC3
,
0x2000
},
{
CODEC_ID_PCM_S16LE
,
0x01
},
{
CODEC_ID_PCM_U8
,
0x01
},
/* must come after s16le in this list */
...
...
@@ -55,7 +55,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
enc
->
codec_id
==
CODEC_ID_PCM_ALAW
||
enc
->
codec_id
==
CODEC_ID_PCM_MULAW
)
{
bps
=
8
;
}
else
if
(
enc
->
codec_id
==
CODEC_ID_MP2
||
enc
->
codec_id
==
CODEC_ID_MP3
LAME
)
{
}
else
if
(
enc
->
codec_id
==
CODEC_ID_MP2
||
enc
->
codec_id
==
CODEC_ID_MP3
)
{
bps
=
0
;
}
else
if
(
enc
->
codec_id
==
CODEC_ID_ADPCM_IMA_WAV
||
enc
->
codec_id
==
CODEC_ID_ADPCM_MS
)
{
bps
=
4
;
...
...
@@ -63,7 +63,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
bps
=
16
;
}
if
(
enc
->
codec_id
==
CODEC_ID_MP2
||
enc
->
codec_id
==
CODEC_ID_MP3
LAME
)
{
if
(
enc
->
codec_id
==
CODEC_ID_MP2
||
enc
->
codec_id
==
CODEC_ID_MP3
)
{
blkalign
=
1
;
//blkalign = 144 * enc->bit_rate/enc->sample_rate;
}
else
if
(
enc
->
block_align
!=
0
)
{
/* specified by the codec */
...
...
@@ -79,7 +79,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
put_le32
(
pb
,
bytespersec
);
/* bytes per second */
put_le16
(
pb
,
blkalign
);
/* block align */
put_le16
(
pb
,
bps
);
/* bits per sample */
if
(
enc
->
codec_id
==
CODEC_ID_MP3
LAME
)
{
if
(
enc
->
codec_id
==
CODEC_ID_MP3
)
{
put_le16
(
pb
,
12
);
/* wav_extra_size */
hdrsize
+=
12
;
put_le16
(
pb
,
1
);
/* wID */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录