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
胡斌
2018-12-22 13:03:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
b7acb2782a7b34e8559808fbfbb0209733951405
b7acb278
1 parent
43f3ebe0
fix bug of copy u,v of scaled image when rotate is 0
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
3 行增加
和
3 行删除
pip/AVTranscoder.cpp
pip/merge_pip.cpp
pip/AVTranscoder.cpp
查看文件 @
b7acb27
...
...
@@ -525,8 +525,8 @@ int CAVTranscoder::open_output_file(const char *filename)
}
for
(
int
i
=
0
;
i
<
h
/
2
;
i
++
){
memcpy
(
pDstFrame
->
data
[
1
]
+
(
y
/
2
+
i
)
*
pDstFrame
->
linesize
[
1
]
+
x
/
2
,
pSrcFrame
->
data
[
1
]
+
(
i
+
srcy
/
2
)
*
pSrcFrame
->
linesize
[
1
],
w
/
2
);
memcpy
(
pDstFrame
->
data
[
2
]
+
(
y
/
2
+
i
)
*
pDstFrame
->
linesize
[
2
]
+
x
/
2
,
pSrcFrame
->
data
[
2
]
+
(
i
+
srcy
/
2
)
*
pSrcFrame
->
linesize
[
2
],
w
/
2
);
memcpy
(
pDstFrame
->
data
[
1
]
+
(
y
/
2
+
i
)
*
pDstFrame
->
linesize
[
1
]
+
x
/
2
,
pSrcFrame
->
data
[
1
]
+
(
i
+
srcy
/
2
)
*
pSrcFrame
->
linesize
[
1
]
+
srcx
/
2
,
w
/
2
);
memcpy
(
pDstFrame
->
data
[
2
]
+
(
y
/
2
+
i
)
*
pDstFrame
->
linesize
[
2
]
+
x
/
2
,
pSrcFrame
->
data
[
2
]
+
(
i
+
srcy
/
2
)
*
pSrcFrame
->
linesize
[
2
]
+
srcx
/
2
,
w
/
2
);
}
}
else
if
(
pSrcFrame
->
pkt_dts
==
180
)
{
...
...
pip/merge_pip.cpp
查看文件 @
b7acb27
...
...
@@ -1097,7 +1097,7 @@ int process_av_files(char * record_info, int piptype)
int
main
(
int
argc
,
char
*
argv
[])
{
if
(
argc
<
2
)
{
printf
(
" merge_pip 2.0.
0
\n
"
);
printf
(
" merge_pip 2.0.
1
\n
"
);
printf
(
" merge video files to one pip video according to record info file,
\n
usage:"
);
printf
(
"
\n
%s record_info_filename [-t {0,1,2}]"
,
argv
[
0
]);
printf
(
"
\n\n
"
);
...
...
请
注册
或
登录
后发表评论