Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
9ba4821d
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,发现更多精彩内容 >>
提交
9ba4821d
编写于
3月 19, 2009
作者:
R
Ramiro Polla
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Split TrueHD decoder from MLP
Originally committed as revision 18045 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
5c3d507f
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
26 addition
and
6 deletion
+26
-6
doc/general.texi
doc/general.texi
+4
-2
libavcodec/Makefile
libavcodec/Makefile
+1
-0
libavcodec/allcodecs.c
libavcodec/allcodecs.c
+1
-0
libavcodec/avcodec.h
libavcodec/avcodec.h
+2
-1
libavcodec/mlp_parser.c
libavcodec/mlp_parser.c
+1
-1
libavcodec/mlpdec.c
libavcodec/mlpdec.c
+16
-1
libavformat/mpeg.c
libavformat/mpeg.c
+1
-1
未找到文件。
doc/general.texi
浏览文件 @
9ba4821d
...
@@ -544,8 +544,8 @@ following image formats are supported:
...
@@ -544,8 +544,8 @@ following image formats are supported:
@item IMC (Intel Music Coder) @tab @tab X
@item IMC (Intel Music Coder) @tab @tab X
@item MACE (Macintosh Audio Compression/Expansion) 3:1 @tab @tab X
@item MACE (Macintosh Audio Compression/Expansion) 3:1 @tab @tab X
@item MACE (Macintosh Audio Compression/Expansion) 6:1 @tab @tab X
@item MACE (Macintosh Audio Compression/Expansion) 6:1 @tab @tab X
@item MLP
(Meridian Lossless Packing)/TrueHD
@tab @tab X
@item MLP
(Meridian Lossless Packing)
@tab @tab X
@tab Used in DVD-Audio
and Blu-Ray
discs.
@tab Used in DVD-Audio discs.
@item Monkey's Audio @tab @tab X
@item Monkey's Audio @tab @tab X
@tab Only versions 3.97-3.99 are supported.
@tab Only versions 3.97-3.99 are supported.
@item MP1 (MPEG audio layer 1) @tab @tab IX
@item MP1 (MPEG audio layer 1) @tab @tab IX
...
@@ -598,6 +598,8 @@ following image formats are supported:
...
@@ -598,6 +598,8 @@ following image formats are supported:
@item Speex @tab @tab E
@item Speex @tab @tab E
@tab supported through external library libspeex
@tab supported through external library libspeex
@item True Audio (TTA) @tab @tab X
@item True Audio (TTA) @tab @tab X
@item TrueHD @tab @tab X
@tab Used in HD-DVD and Blu-Ray discs.
@item Vorbis @tab E @tab X
@item Vorbis @tab E @tab X
@ A native but very primitive encoder exists.
@ A native but very primitive encoder exists.
@item WavPack @tab @tab X
@item WavPack @tab @tab X
...
...
libavcodec/Makefile
浏览文件 @
9ba4821d
...
@@ -211,6 +211,7 @@ OBJS-$(CONFIG_THP_DECODER) += mjpegdec.o mjpeg.o
...
@@ -211,6 +211,7 @@ OBJS-$(CONFIG_THP_DECODER) += mjpegdec.o mjpeg.o
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER)
+=
tiertexseqv.o
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER)
+=
tiertexseqv.o
OBJS-$(CONFIG_TIFF_DECODER)
+=
tiff.o lzw.o faxcompr.o
OBJS-$(CONFIG_TIFF_DECODER)
+=
tiff.o lzw.o faxcompr.o
OBJS-$(CONFIG_TIFF_ENCODER)
+=
tiffenc.o rle.o lzwenc.o
OBJS-$(CONFIG_TIFF_ENCODER)
+=
tiffenc.o rle.o lzwenc.o
OBJS-$(CONFIG_TRUEHD_DECODER)
+=
mlpdec.o mlp_parser.o mlp.o
OBJS-$(CONFIG_TRUEMOTION1_DECODER)
+=
truemotion1.o
OBJS-$(CONFIG_TRUEMOTION1_DECODER)
+=
truemotion1.o
OBJS-$(CONFIG_TRUEMOTION2_DECODER)
+=
truemotion2.o
OBJS-$(CONFIG_TRUEMOTION2_DECODER)
+=
truemotion2.o
OBJS-$(CONFIG_TRUESPEECH_DECODER)
+=
truespeech.o
OBJS-$(CONFIG_TRUESPEECH_DECODER)
+=
truespeech.o
...
...
libavcodec/allcodecs.c
浏览文件 @
9ba4821d
...
@@ -215,6 +215,7 @@ void avcodec_register_all(void)
...
@@ -215,6 +215,7 @@ void avcodec_register_all(void)
REGISTER_DECODER
(
SMACKAUD
,
smackaud
);
REGISTER_DECODER
(
SMACKAUD
,
smackaud
);
REGISTER_ENCDEC
(
SONIC
,
sonic
);
REGISTER_ENCDEC
(
SONIC
,
sonic
);
REGISTER_ENCODER
(
SONIC_LS
,
sonic_ls
);
REGISTER_ENCODER
(
SONIC_LS
,
sonic_ls
);
REGISTER_DECODER
(
TRUEHD
,
truehd
);
REGISTER_DECODER
(
TRUESPEECH
,
truespeech
);
REGISTER_DECODER
(
TRUESPEECH
,
truespeech
);
REGISTER_DECODER
(
TTA
,
tta
);
REGISTER_DECODER
(
TTA
,
tta
);
REGISTER_DECODER
(
VMDAUDIO
,
vmdaudio
);
REGISTER_DECODER
(
VMDAUDIO
,
vmdaudio
);
...
...
libavcodec/avcodec.h
浏览文件 @
9ba4821d
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 2
1
#define LIBAVCODEC_VERSION_MINOR 2
2
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
@@ -310,6 +310,7 @@ enum CodecID {
...
@@ -310,6 +310,7 @@ enum CodecID {
CODEC_ID_SIPR
,
CODEC_ID_SIPR
,
CODEC_ID_MP1
,
CODEC_ID_MP1
,
CODEC_ID_TWINVQ
,
CODEC_ID_TWINVQ
,
CODEC_ID_TRUEHD
,
/* subtitle codecs */
/* subtitle codecs */
CODEC_ID_DVD_SUBTITLE
=
0x17000
,
CODEC_ID_DVD_SUBTITLE
=
0x17000
,
...
...
libavcodec/mlp_parser.c
浏览文件 @
9ba4821d
...
@@ -287,7 +287,7 @@ lost_sync:
...
@@ -287,7 +287,7 @@ lost_sync:
}
}
AVCodecParser
mlp_parser
=
{
AVCodecParser
mlp_parser
=
{
{
CODEC_ID_MLP
},
{
CODEC_ID_MLP
,
CODEC_ID_TRUEHD
},
sizeof
(
MLPParseContext
),
sizeof
(
MLPParseContext
),
mlp_init
,
mlp_init
,
mlp_parse
,
mlp_parse
,
...
...
libavcodec/mlpdec.c
浏览文件 @
9ba4821d
...
@@ -1038,6 +1038,7 @@ error:
...
@@ -1038,6 +1038,7 @@ error:
return
-
1
;
return
-
1
;
}
}
#if CONFIG_MLP_DECODER
AVCodec
mlp_decoder
=
{
AVCodec
mlp_decoder
=
{
"mlp"
,
"mlp"
,
CODEC_TYPE_AUDIO
,
CODEC_TYPE_AUDIO
,
...
@@ -1047,6 +1048,20 @@ AVCodec mlp_decoder = {
...
@@ -1047,6 +1048,20 @@ AVCodec mlp_decoder = {
NULL
,
NULL
,
NULL
,
NULL
,
read_access_unit
,
read_access_unit
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MLP (Meridian Lossless Packing)
/TrueHD
"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"MLP (Meridian Lossless Packing)"
),
};
};
#endif
/* CONFIG_MLP_DECODER */
#if CONFIG_TRUEHD_DECODER
AVCodec
truehd_decoder
=
{
"truehd"
,
CODEC_TYPE_AUDIO
,
CODEC_ID_TRUEHD
,
sizeof
(
MLPDecodeContext
),
mlp_decode_init
,
NULL
,
NULL
,
read_access_unit
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"TrueHD"
),
};
#endif
/* CONFIG_TRUEHD_DECODER */
libavformat/mpeg.c
浏览文件 @
9ba4821d
...
@@ -487,7 +487,7 @@ static int mpegps_read_packet(AVFormatContext *s,
...
@@ -487,7 +487,7 @@ static int mpegps_read_packet(AVFormatContext *s,
codec_id
=
CODEC_ID_PCM_DVD
;
codec_id
=
CODEC_ID_PCM_DVD
;
}
else
if
(
startcode
>=
0xb0
&&
startcode
<=
0xbf
)
{
}
else
if
(
startcode
>=
0xb0
&&
startcode
<=
0xbf
)
{
type
=
CODEC_TYPE_AUDIO
;
type
=
CODEC_TYPE_AUDIO
;
codec_id
=
CODEC_ID_
MLP
;
codec_id
=
CODEC_ID_
TRUEHD
;
}
else
if
(
startcode
>=
0xc0
&&
startcode
<=
0xcf
)
{
}
else
if
(
startcode
>=
0xc0
&&
startcode
<=
0xcf
)
{
/* Used for both AC-3 and E-AC-3 in EVOB files */
/* Used for both AC-3 and E-AC-3 in EVOB files */
type
=
CODEC_TYPE_AUDIO
;
type
=
CODEC_TYPE_AUDIO
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录