Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
merge_av
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
胡斌
2019-04-21 23:10:13 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
94f9a2cf1a032c1673b242761f4651f480f84c0b
94f9a2cf
1 parent
402ccd57
fix bug: invalid data of audio file maybe used to get the max width and height of input video
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
18 行增加
和
13 行删除
pip/merge_pip.cpp
pip/merge_pip.cpp
查看文件 @
94f9a2c
...
...
@@ -685,22 +685,27 @@ void add_media_infos()
printf
(
"
\n
sorted file info:"
);
it
=
sorted_media_with_end
.
begin
();
for
(;
it
!=
sorted_media_with_end
.
end
();
it
++
){
printf
(
"
\n
%2d %8.3f %s %4d %4d %3d %s"
,
it
->
sorted_index
,
it
->
type_time
,
it
->
name
.
c_str
(),
it
->
width
,
it
->
height
,
it
->
rotate
,
it
->
t_type
==
tt_start
?
"start"
:
"end"
);
if
(
it
->
width
>
it
->
height
)
{
if
(
width
<
it
->
width
)
{
width
=
it
->
width
;
if
(
it
->
m_type
==
mt_video
)
{
printf
(
"
\n
%2d %8.3f %s %s %4d %4d %3d"
,
it
->
sorted_index
,
it
->
type_time
,
it
->
name
.
c_str
(),
it
->
t_type
==
tt_start
?
"start"
:
"end"
,
it
->
width
,
it
->
height
,
it
->
rotate
);
if
(
it
->
width
>
it
->
height
)
{
if
(
width
<
it
->
width
)
{
width
=
it
->
width
;
}
if
(
height
<
it
->
height
)
{
height
=
it
->
height
;
}
}
if
(
height
<
it
->
height
)
{
height
=
it
->
height
;
else
{
//set the image to landscape
if
(
width
<
it
->
height
)
{
width
=
it
->
height
;
}
if
(
height
<
it
->
width
)
{
height
=
it
->
width
;
}
}
}
else
{
//set the image to landscape
if
(
width
<
it
->
height
)
{
width
=
it
->
height
;
}
if
(
height
<
it
->
width
)
{
height
=
it
->
width
;
}
else
{
printf
(
"
\n
%2d %8.3f %s %s"
,
it
->
sorted_index
,
it
->
type_time
,
it
->
name
.
c_str
(),
it
->
t_type
==
tt_start
?
"start"
:
"end"
);
}
}
printf
(
"
\n
-------------------------
\n
"
);
...
...
请
注册
或
登录
后发表评论