Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
2849a774
O
Opencv
项目概览
Greenplum
/
Opencv
9 个月 前同步成功
通知
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
2849a774
编写于
6月 22, 2023
作者:
A
Alexander Smorkalov
提交者:
GitHub
6月 22, 2023
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #23846 from asmorkalov:as/ffmpeg_update_4.x
FFmpeg/4.x: update FFmpeg wrapper 2023.6
上级
affc69bf
426b0887
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
14 deletion
+5
-14
3rdparty/ffmpeg/ffmpeg.cmake
3rdparty/ffmpeg/ffmpeg.cmake
+5
-5
modules/videoio/test/test_ffmpeg.cpp
modules/videoio/test/test_ffmpeg.cpp
+0
-9
未找到文件。
3rdparty/ffmpeg/ffmpeg.cmake
浏览文件 @
2849a774
# Binaries branch name: ffmpeg/4.x_202
21225
# Binaries were created for OpenCV:
4abe6dc48d4ec6229f332cc6cf6c7e234ac8027e
ocv_update
(
FFMPEG_BINARIES_COMMIT
"7d
d0d4f1d6fe75f05f3d3b5e38cbc96c1a2d2809
"
)
ocv_update
(
FFMPEG_FILE_HASH_BIN32
"
e598ae2ece1ddf310bc49b58202fd87a
"
)
ocv_update
(
FFMPEG_FILE_HASH_BIN64
"
b2a40c142c20aef9fd663fc8f85c2971
"
)
# Binaries branch name: ffmpeg/4.x_202
30622
# Binaries were created for OpenCV:
61d48dd0f8d1cc1a115d26998705a61478f64a3c
ocv_update
(
FFMPEG_BINARIES_COMMIT
"7d
a61f0695eabf8972a2c302bf1632a3d99fb0d5
"
)
ocv_update
(
FFMPEG_FILE_HASH_BIN32
"
4aaef1456e282e5ef665d65555f47f56
"
)
ocv_update
(
FFMPEG_FILE_HASH_BIN64
"
38a638851e064c591ce812e27ed43f1f
"
)
ocv_update
(
FFMPEG_FILE_HASH_CMAKE
"8862c87496e2e8c375965e1277dee1c7"
)
function
(
download_win_ffmpeg script_var
)
...
...
modules/videoio/test/test_ffmpeg.cpp
浏览文件 @
2849a774
...
...
@@ -226,11 +226,7 @@ const videoio_container_params_t videoio_container_params[] =
videoio_container_params_t
(
CAP_FFMPEG
,
"video/big_buck_bunny"
,
"h264"
,
"h264"
,
"h264"
,
"I420"
),
videoio_container_params_t
(
CAP_FFMPEG
,
"video/big_buck_bunny"
,
"h265"
,
"h265"
,
"hevc"
,
"I420"
),
videoio_container_params_t
(
CAP_FFMPEG
,
"video/big_buck_bunny"
,
"mjpg.avi"
,
"mjpg"
,
"MJPG"
,
"I420"
),
#ifdef _WIN32 // handle old FFmpeg backend - remove when windows shared library is updated
videoio_container_params_t
(
CAP_FFMPEG
,
"video/sample_322x242_15frames.yuv420p.libx264"
,
"mp4"
,
"h264"
,
"avc1"
,
"I420"
)
#else
videoio_container_params_t
(
CAP_FFMPEG
,
"video/sample_322x242_15frames.yuv420p.libx264"
,
"mp4"
,
"h264"
,
"h264"
,
"I420"
)
#endif
//videoio_container_params_t(CAP_FFMPEG, "video/big_buck_bunny", "h264.mkv", "mkv.h264", "h264", "I420"),
//videoio_container_params_t(CAP_FFMPEG, "video/big_buck_bunny", "h265.mkv", "mkv.h265", "hevc", "I420"),
//videoio_container_params_t(CAP_FFMPEG, "video/big_buck_bunny", "h264.mp4", "mp4.avc1", "avc1", "I420"),
...
...
@@ -454,10 +450,6 @@ const ffmpeg_get_fourcc_param_t ffmpeg_get_fourcc_param[] =
ffmpeg_get_fourcc_param_t
(
"../cv/tracking/faceocc2/data/faceocc2.webm"
,
"VP80"
),
ffmpeg_get_fourcc_param_t
(
"video/big_buck_bunny.h265"
,
"hevc"
),
ffmpeg_get_fourcc_param_t
(
"video/big_buck_bunny.h264"
,
"h264"
),
#ifdef _WIN32 // handle old FFmpeg backend - remove when windows shared library is updated
ffmpeg_get_fourcc_param_t
(
"video/sample_322x242_15frames.yuv420p.libvpx-vp9.mp4"
,
"vp09"
),
ffmpeg_get_fourcc_param_t
(
"video/sample_322x242_15frames.yuv420p.libaom-av1.mp4"
,
"av01"
)
#else
ffmpeg_get_fourcc_param_t
(
"video/sample_322x242_15frames.yuv420p.libvpx-vp9.mp4"
,
"VP90"
),
ffmpeg_get_fourcc_param_t
(
"video/sample_322x242_15frames.yuv420p.libaom-av1.mp4"
,
"AV01"
),
ffmpeg_get_fourcc_param_t
(
"video/big_buck_bunny.mp4"
,
"FMP4"
),
...
...
@@ -466,7 +458,6 @@ const ffmpeg_get_fourcc_param_t ffmpeg_get_fourcc_param[] =
ffmpeg_get_fourcc_param_t
(
"video/sample_322x242_15frames.yuv420p.libxvid.mp4"
,
"FMP4"
),
ffmpeg_get_fourcc_param_t
(
"video/sample_322x242_15frames.yuv420p.libx265.mp4"
,
"hevc"
),
ffmpeg_get_fourcc_param_t
(
"video/sample_322x242_15frames.yuv420p.libx264.mp4"
,
"h264"
)
#endif
};
INSTANTIATE_TEST_CASE_P
(
videoio
,
ffmpeg_get_fourcc
,
testing
::
ValuesIn
(
ffmpeg_get_fourcc_param
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录