Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
b75a1f98
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,发现更多精彩内容 >>
提交
b75a1f98
编写于
6月 07, 2014
作者:
L
Luca Barbato
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
matroska: Factor out write_track from mkv_write_tracks
上级
f1f6156b
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
193 addition
and
169 deletion
+193
-169
libavformat/matroskaenc.c
libavformat/matroskaenc.c
+193
-169
未找到文件。
libavformat/matroskaenc.c
浏览文件 @
b75a1f98
...
...
@@ -535,6 +535,42 @@ static void get_aac_sample_rates(AVFormatContext *s, AVCodecContext *codec,
*
output_sample_rate
=
mp4ac
.
ext_sample_rate
;
}
static
int
mkv_write_native_codecprivate
(
AVFormatContext
*
s
,
AVCodecContext
*
codec
,
AVIOContext
*
dyn_cp
)
{
switch
(
codec
->
codec_id
)
{
case
AV_CODEC_ID_VORBIS
:
case
AV_CODEC_ID_THEORA
:
return
put_xiph_codecpriv
(
s
,
dyn_cp
,
codec
);
case
AV_CODEC_ID_FLAC
:
return
put_flac_codecpriv
(
s
,
dyn_cp
,
codec
);
case
AV_CODEC_ID_WAVPACK
:
return
put_wv_codecpriv
(
dyn_cp
,
codec
);
case
AV_CODEC_ID_H264
:
return
ff_isom_write_avcc
(
dyn_cp
,
codec
->
extradata
,
codec
->
extradata_size
);
case
AV_CODEC_ID_HEVC
:
return
ff_isom_write_hvcc
(
dyn_cp
,
codec
->
extradata
,
codec
->
extradata_size
,
0
);
case
AV_CODEC_ID_ALAC
:
if
(
codec
->
extradata_size
<
36
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Invalid extradata found, ALAC expects a 36-byte "
"QuickTime atom."
);
return
AVERROR_INVALIDDATA
;
}
else
avio_write
(
dyn_cp
,
codec
->
extradata
+
12
,
codec
->
extradata_size
-
12
);
break
;
default:
if
(
codec
->
extradata_size
)
avio_write
(
dyn_cp
,
codec
->
extradata
,
codec
->
extradata_size
);
}
return
0
;
}
static
int
mkv_write_codecprivate
(
AVFormatContext
*
s
,
AVIOContext
*
pb
,
AVCodecContext
*
codec
,
int
native_id
,
int
qt_id
)
...
...
@@ -548,30 +584,7 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb,
return
ret
;
if
(
native_id
)
{
if
(
codec
->
codec_id
==
AV_CODEC_ID_VORBIS
||
codec
->
codec_id
==
AV_CODEC_ID_THEORA
)
ret
=
put_xiph_codecpriv
(
s
,
dyn_cp
,
codec
);
else
if
(
codec
->
codec_id
==
AV_CODEC_ID_FLAC
)
ret
=
put_flac_codecpriv
(
s
,
dyn_cp
,
codec
);
else
if
(
codec
->
codec_id
==
AV_CODEC_ID_WAVPACK
)
ret
=
put_wv_codecpriv
(
dyn_cp
,
codec
);
else
if
(
codec
->
codec_id
==
AV_CODEC_ID_H264
)
ret
=
ff_isom_write_avcc
(
dyn_cp
,
codec
->
extradata
,
codec
->
extradata_size
);
else
if
(
codec
->
codec_id
==
AV_CODEC_ID_HEVC
)
ret
=
ff_isom_write_hvcc
(
dyn_cp
,
codec
->
extradata
,
codec
->
extradata_size
,
0
);
else
if
(
codec
->
codec_id
==
AV_CODEC_ID_ALAC
)
{
if
(
codec
->
extradata_size
<
36
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Invalid extradata found, ALAC expects a 36-byte "
"QuickTime atom."
);
ret
=
AVERROR_INVALIDDATA
;
}
else
avio_write
(
dyn_cp
,
codec
->
extradata
+
12
,
codec
->
extradata_size
-
12
);
}
else
if
(
codec
->
extradata_size
)
avio_write
(
dyn_cp
,
codec
->
extradata
,
codec
->
extradata_size
);
ret
=
mkv_write_native_codecprivate
(
s
,
codec
,
dyn_cp
);
}
else
if
(
codec
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
{
if
(
qt_id
)
{
if
(
!
codec
->
codec_tag
)
...
...
@@ -611,19 +624,9 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb,
return
ret
;
}
static
int
mkv_write_tracks
(
AVFormatContext
*
s
)
static
int
mkv_write_track
(
AVFormatContext
*
s
,
MatroskaMuxContext
*
mkv
,
int
i
,
AVIOContext
*
pb
)
{
MatroskaMuxContext
*
mkv
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
ebml_master
tracks
;
int
i
,
j
,
ret
;
ret
=
mkv_add_seekhead_entry
(
mkv
->
main_seekhead
,
MATROSKA_ID_TRACKS
,
avio_tell
(
pb
));
if
(
ret
<
0
)
return
ret
;
tracks
=
start_ebml_master
(
pb
,
MATROSKA_ID_TRACKS
,
0
);
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
)
{
AVStream
*
st
=
s
->
streams
[
i
];
AVCodecContext
*
codec
=
st
->
codec
;
ebml_master
subinfo
,
track
;
...
...
@@ -632,6 +635,7 @@ static int mkv_write_tracks(AVFormatContext *s)
int
bit_depth
=
av_get_bits_per_sample
(
codec
->
codec_id
);
int
sample_rate
=
codec
->
sample_rate
;
int
output_sample_rate
=
0
;
int
j
,
ret
;
AVDictionaryEntry
*
tag
;
// ms precision is the de-facto standard timescale for mkv files
...
...
@@ -639,7 +643,7 @@ static int mkv_write_tracks(AVFormatContext *s)
if
(
codec
->
codec_type
==
AVMEDIA_TYPE_ATTACHMENT
)
{
mkv
->
have_attachments
=
1
;
continue
;
return
0
;
}
if
(
!
bit_depth
)
...
...
@@ -779,6 +783,26 @@ static int mkv_write_tracks(AVFormatContext *s)
return
ret
;
end_ebml_master
(
pb
,
track
);
return
0
;
}
static
int
mkv_write_tracks
(
AVFormatContext
*
s
)
{
MatroskaMuxContext
*
mkv
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
ebml_master
tracks
;
int
i
,
ret
;
ret
=
mkv_add_seekhead_entry
(
mkv
->
main_seekhead
,
MATROSKA_ID_TRACKS
,
avio_tell
(
pb
));
if
(
ret
<
0
)
return
ret
;
tracks
=
start_ebml_master
(
pb
,
MATROSKA_ID_TRACKS
,
0
);
for
(
i
=
0
;
i
<
s
->
nb_streams
;
i
++
)
{
ret
=
mkv_write_track
(
s
,
mkv
,
i
,
pb
);
if
(
ret
<
0
)
return
ret
;
}
end_ebml_master
(
pb
,
tracks
);
return
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录