Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
39885a4b
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,发现更多精彩内容 >>
提交
39885a4b
编写于
5月 18, 2012
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avconv: reindent
上级
74b961db
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
66 addition
and
66 deletion
+66
-66
avconv.c
avconv.c
+66
-66
未找到文件。
avconv.c
浏览文件 @
39885a4b
...
...
@@ -1635,81 +1635,81 @@ static void do_video_out(AVFormatContext *s,
if
(
!
ost
->
frame_number
)
ost
->
first_pts
=
in_picture
->
pts
;
av_init_packet
(
&
pkt
);
pkt
.
data
=
NULL
;
pkt
.
size
=
0
;
av_init_packet
(
&
pkt
);
pkt
.
data
=
NULL
;
pkt
.
size
=
0
;
if
(
!
check_recording_time
(
ost
)
||
ost
->
frame_number
>=
ost
->
max_frames
)
return
;
if
(
!
check_recording_time
(
ost
)
||
ost
->
frame_number
>=
ost
->
max_frames
)
return
;
if
(
s
->
oformat
->
flags
&
AVFMT_RAWPICTURE
&&
enc
->
codec
->
id
==
CODEC_ID_RAWVIDEO
)
{
/* raw pictures are written as AVPicture structure to
avoid any copies. We support temporarily the older
method. */
enc
->
coded_frame
->
interlaced_frame
=
in_picture
->
interlaced_frame
;
enc
->
coded_frame
->
top_field_first
=
in_picture
->
top_field_first
;
pkt
.
data
=
(
uint8_t
*
)
in_picture
;
pkt
.
size
=
sizeof
(
AVPicture
);
pkt
.
pts
=
av_rescale_q
(
in_picture
->
pts
,
enc
->
time_base
,
ost
->
st
->
time_base
);
pkt
.
flags
|=
AV_PKT_FLAG_KEY
;
if
(
s
->
oformat
->
flags
&
AVFMT_RAWPICTURE
&&
enc
->
codec
->
id
==
CODEC_ID_RAWVIDEO
)
{
/* raw pictures are written as AVPicture structure to
avoid any copies. We support temporarily the older
method. */
enc
->
coded_frame
->
interlaced_frame
=
in_picture
->
interlaced_frame
;
enc
->
coded_frame
->
top_field_first
=
in_picture
->
top_field_first
;
pkt
.
data
=
(
uint8_t
*
)
in_picture
;
pkt
.
size
=
sizeof
(
AVPicture
);
pkt
.
pts
=
av_rescale_q
(
in_picture
->
pts
,
enc
->
time_base
,
ost
->
st
->
time_base
);
pkt
.
flags
|=
AV_PKT_FLAG_KEY
;
write_frame
(
s
,
&
pkt
,
ost
);
}
else
{
int
got_packet
;
AVFrame
big_picture
;
big_picture
=
*
in_picture
;
/* better than nothing: use input picture interlaced
settings */
big_picture
.
interlaced_frame
=
in_picture
->
interlaced_frame
;
if
(
ost
->
st
->
codec
->
flags
&
(
CODEC_FLAG_INTERLACED_DCT
|
CODEC_FLAG_INTERLACED_ME
))
{
if
(
ost
->
top_field_first
==
-
1
)
big_picture
.
top_field_first
=
in_picture
->
top_field_first
;
else
big_picture
.
top_field_first
=
!!
ost
->
top_field_first
;
}
write_frame
(
s
,
&
pkt
,
ost
);
}
else
{
int
got_packet
;
AVFrame
big_picture
;
big_picture
=
*
in_picture
;
/* better than nothing: use input picture interlaced
settings */
big_picture
.
interlaced_frame
=
in_picture
->
interlaced_frame
;
if
(
ost
->
st
->
codec
->
flags
&
(
CODEC_FLAG_INTERLACED_DCT
|
CODEC_FLAG_INTERLACED_ME
))
{
if
(
ost
->
top_field_first
==
-
1
)
big_picture
.
top_field_first
=
in_picture
->
top_field_first
;
else
big_picture
.
top_field_first
=
!!
ost
->
top_field_first
;
}
/* handles same_quant here. This is not correct because it may
not be a global option */
big_picture
.
quality
=
quality
;
if
(
!
enc
->
me_threshold
)
big_picture
.
pict_type
=
0
;
if
(
ost
->
forced_kf_index
<
ost
->
forced_kf_count
&&
big_picture
.
pts
>=
ost
->
forced_kf_pts
[
ost
->
forced_kf_index
])
{
big_picture
.
pict_type
=
AV_PICTURE_TYPE_I
;
ost
->
forced_kf_index
++
;
}
ret
=
avcodec_encode_video2
(
enc
,
&
pkt
,
&
big_picture
,
&
got_packet
);
if
(
ret
<
0
)
{
av_log
(
NULL
,
AV_LOG_FATAL
,
"Video encoding failed
\n
"
);
exit_program
(
1
);
}
/* handles same_quant here. This is not correct because it may
not be a global option */
big_picture
.
quality
=
quality
;
if
(
!
enc
->
me_threshold
)
big_picture
.
pict_type
=
0
;
if
(
ost
->
forced_kf_index
<
ost
->
forced_kf_count
&&
big_picture
.
pts
>=
ost
->
forced_kf_pts
[
ost
->
forced_kf_index
])
{
big_picture
.
pict_type
=
AV_PICTURE_TYPE_I
;
ost
->
forced_kf_index
++
;
}
ret
=
avcodec_encode_video2
(
enc
,
&
pkt
,
&
big_picture
,
&
got_packet
);
if
(
ret
<
0
)
{
av_log
(
NULL
,
AV_LOG_FATAL
,
"Video encoding failed
\n
"
);
exit_program
(
1
);
}
if
(
got_packet
)
{
if
(
pkt
.
pts
!=
AV_NOPTS_VALUE
)
pkt
.
pts
=
av_rescale_q
(
pkt
.
pts
,
enc
->
time_base
,
ost
->
st
->
time_base
);
if
(
pkt
.
dts
!=
AV_NOPTS_VALUE
)
pkt
.
dts
=
av_rescale_q
(
pkt
.
dts
,
enc
->
time_base
,
ost
->
st
->
time_base
);
if
(
got_packet
)
{
if
(
pkt
.
pts
!=
AV_NOPTS_VALUE
)
pkt
.
pts
=
av_rescale_q
(
pkt
.
pts
,
enc
->
time_base
,
ost
->
st
->
time_base
);
if
(
pkt
.
dts
!=
AV_NOPTS_VALUE
)
pkt
.
dts
=
av_rescale_q
(
pkt
.
dts
,
enc
->
time_base
,
ost
->
st
->
time_base
);
write_frame
(
s
,
&
pkt
,
ost
);
*
frame_size
=
pkt
.
size
;
video_size
+=
pkt
.
size
;
write_frame
(
s
,
&
pkt
,
ost
);
*
frame_size
=
pkt
.
size
;
video_size
+=
pkt
.
size
;
/* if two pass, output log */
if
(
ost
->
logfile
&&
enc
->
stats_out
)
{
fprintf
(
ost
->
logfile
,
"%s"
,
enc
->
stats_out
);
}
/* if two pass, output log */
if
(
ost
->
logfile
&&
enc
->
stats_out
)
{
fprintf
(
ost
->
logfile
,
"%s"
,
enc
->
stats_out
);
}
}
ost
->
sync_opts
++
;
/*
* For video, number of frames in == number of packets out.
* But there may be reordering, so we can't throw away frames on encoder
* flush, we need to limit them here, before they go into encoder.
*/
ost
->
frame_number
++
;
}
ost
->
sync_opts
++
;
/*
* For video, number of frames in == number of packets out.
* But there may be reordering, so we can't throw away frames on encoder
* flush, we need to limit them here, before they go into encoder.
*/
ost
->
frame_number
++
;
}
static
double
psnr
(
double
d
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录