Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
be24659c
O
Opencv
项目概览
Greenplum
/
Opencv
12 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
be24659c
编写于
3月 03, 2021
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19666 from alalek:update_ffmpeg_4.x
上级
2dc15724
b6670f3a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
13 deletion
+5
-13
3rdparty/ffmpeg/ffmpeg.cmake
3rdparty/ffmpeg/ffmpeg.cmake
+5
-5
modules/videoio/test/test_video_io.cpp
modules/videoio/test/test_video_io.cpp
+0
-8
未找到文件。
3rdparty/ffmpeg/ffmpeg.cmake
浏览文件 @
be24659c
# Binaries branch name: ffmpeg/master_202
00908
# Binaries were created for OpenCV:
f445b826d084188077a5e9d204c4c33d1589f380
ocv_update
(
FFMPEG_BINARIES_COMMIT
"6
152e132572dfdaa32887eabeb7199bef49b14dc
"
)
ocv_update
(
FFMPEG_FILE_HASH_BIN32
"
37e2dadf776631acc8856e281f29cf42
"
)
ocv_update
(
FFMPEG_FILE_HASH_BIN64
"
cf5dba83edf8619f57ccff4edb989c62
"
)
# Binaries branch name: ffmpeg/master_202
10303
# Binaries were created for OpenCV:
7ac6abe02a33bef445a5b77214ad31964e2c5cc1
ocv_update
(
FFMPEG_BINARIES_COMMIT
"6
29590c3ba09fb0c8eaa9ab858ff13d3a84ca1aa
"
)
ocv_update
(
FFMPEG_FILE_HASH_BIN32
"
638065d5a0dab8a828879942375dcac4
"
)
ocv_update
(
FFMPEG_FILE_HASH_BIN64
"
7f10ae2e6a080ba3714f7a38ee03ae15
"
)
ocv_update
(
FFMPEG_FILE_HASH_CMAKE
"f8e65dbe4a3b4eedc0d2997e07c3f3fd"
)
function
(
download_win_ffmpeg script_var
)
...
...
modules/videoio/test/test_video_io.cpp
浏览文件 @
be24659c
...
...
@@ -721,10 +721,6 @@ TEST_P(videocapture_acceleration, read)
VideoAccelerationType
actual_va
=
static_cast
<
VideoAccelerationType
>
(
static_cast
<
int
>
(
hw_reader
.
get
(
CAP_PROP_HW_ACCELERATION
)));
if
(
va_type
!=
VIDEO_ACCELERATION_ANY
&&
va_type
!=
VIDEO_ACCELERATION_NONE
)
{
#ifdef _WIN32 // FIXIT FFmpeg wrapper upgrade is required
if
(
actual_va
==
static_cast
<
VideoAccelerationType
>
(
0
))
throw
SkipTestException
(
backend_name
+
" VideoCapture on "
+
filename
+
" not supported with HW acceleration (legacy FFmpeg wrapper), skipping"
);
#endif
ASSERT_EQ
((
int
)
actual_va
,
(
int
)
va_type
)
<<
"actual_va="
<<
actual_va
<<
", va_type="
<<
va_type
;
}
std
::
cout
<<
"VideoCapture "
<<
backend_name
<<
":"
<<
actual_va
<<
std
::
endl
<<
std
::
flush
;
...
...
@@ -880,10 +876,6 @@ TEST_P(videowriter_acceleration, write)
actual_va
=
static_cast
<
VideoAccelerationType
>
(
static_cast
<
int
>
(
hw_writer
.
get
(
VIDEOWRITER_PROP_HW_ACCELERATION
)));
if
(
va_type
!=
VIDEO_ACCELERATION_ANY
&&
va_type
!=
VIDEO_ACCELERATION_NONE
)
{
#ifdef _WIN32 // FIXIT FFmpeg wrapper upgrade is required
if
(
actual_va
==
static_cast
<
VideoAccelerationType
>
(
-
1
))
throw
SkipTestException
(
backend_name
+
" VideoWriter on "
+
filename
+
" not supported with HW acceleration (legacy FFmpeg wrapper), skipping"
);
#endif
ASSERT_EQ
((
int
)
actual_va
,
(
int
)
va_type
)
<<
"actual_va="
<<
actual_va
<<
", va_type="
<<
va_type
;
}
std
::
cout
<<
"VideoWriter "
<<
backend_name
<<
":"
<<
actual_va
<<
std
::
endl
<<
std
::
flush
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录