Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
15c63901
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,发现更多精彩内容 >>
提交
15c63901
编写于
2月 08, 2019
作者:
T
Timo Rothenpieler
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avutil/cuda_check: avoid pointlessly exporting same symbol from two libraries
上级
dbfd0429
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
25 addition
and
55 deletion
+25
-55
libavcodec/Makefile
libavcodec/Makefile
+3
-3
libavcodec/cuda_check.c
libavcodec/cuda_check.c
+0
-1
libavutil/Makefile
libavutil/Makefile
+1
-1
libavutil/cuda_check.c
libavutil/cuda_check.c
+0
-45
libavutil/cuda_check.h
libavutil/cuda_check.h
+21
-3
tests/ref/fate/source
tests/ref/fate/source
+0
-2
未找到文件。
libavcodec/Makefile
浏览文件 @
15c63901
...
...
@@ -124,7 +124,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \
motion_est.o ratecontrol.o
\
mpegvideoencdsp.o
OBJS-$(CONFIG_MSS34DSP)
+=
mss34dsp.o
OBJS-$(CONFIG_NVENC)
+=
nvenc.o
cuda_check.o
OBJS-$(CONFIG_NVENC)
+=
nvenc.o
OBJS-$(CONFIG_PIXBLOCKDSP)
+=
pixblockdsp.o
OBJS-$(CONFIG_QPELDSP)
+=
qpeldsp.o
OBJS-$(CONFIG_QSV)
+=
qsv.o
...
...
@@ -347,7 +347,7 @@ OBJS-$(CONFIG_H264_DECODER) += h264dec.o h264_cabac.o h264_cavlc.o \
h264_refs.o h264_sei.o
\
h264_slice.o h264data.o
OBJS-$(CONFIG_H264_AMF_ENCODER)
+=
amfenc_h264.o
OBJS-$(CONFIG_H264_CUVID_DECODER)
+=
cuviddec.o
cuda_check.o
OBJS-$(CONFIG_H264_CUVID_DECODER)
+=
cuviddec.o
OBJS-$(CONFIG_H264_MEDIACODEC_DECODER)
+=
mediacodecdec.o
OBJS-$(CONFIG_H264_MMAL_DECODER)
+=
mmaldec.o
OBJS-$(CONFIG_H264_NVENC_ENCODER)
+=
nvenc_h264.o
...
...
@@ -856,7 +856,7 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcmenc.o adpcm_data.o
# hardware accelerators
OBJS-$(CONFIG_D3D11VA)
+=
dxva2.o
OBJS-$(CONFIG_DXVA2)
+=
dxva2.o
OBJS-$(CONFIG_NVDEC)
+=
nvdec.o
cuda_check.o
OBJS-$(CONFIG_NVDEC)
+=
nvdec.o
OBJS-$(CONFIG_VAAPI)
+=
vaapi_decode.o
OBJS-$(CONFIG_VIDEOTOOLBOX)
+=
videotoolbox.o
OBJS-$(CONFIG_VDPAU)
+=
vdpau.o
...
...
libavcodec/cuda_check.c
已删除
100644 → 0
浏览文件 @
dbfd0429
#include "libavutil/cuda_check.c"
libavutil/Makefile
浏览文件 @
15c63901
...
...
@@ -160,7 +160,7 @@ OBJS = adler32.o \
xtea.o
\
tea.o
\
OBJS-$(CONFIG_CUDA)
+=
hwcontext_cuda.o
cuda_check.o
OBJS-$(CONFIG_CUDA)
+=
hwcontext_cuda.o
OBJS-$(CONFIG_D3D11VA)
+=
hwcontext_d3d11va.o
OBJS-$(CONFIG_DXVA2)
+=
hwcontext_dxva2.o
OBJS-$(CONFIG_LIBDRM)
+=
hwcontext_drm.o
...
...
libavutil/cuda_check.c
已删除
100644 → 0
浏览文件 @
dbfd0429
/*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "compat/cuda/dynlink_loader.h"
#include "libavutil/cuda_check.h"
int
ff_cuda_check
(
void
*
avctx
,
void
*
cuGetErrorName_fn
,
void
*
cuGetErrorString_fn
,
CUresult
err
,
const
char
*
func
)
{
const
char
*
err_name
;
const
char
*
err_string
;
av_log
(
avctx
,
AV_LOG_TRACE
,
"Calling %s
\n
"
,
func
);
if
(
err
==
CUDA_SUCCESS
)
return
0
;
((
tcuGetErrorName
*
)
cuGetErrorName_fn
)(
err
,
&
err_name
);
((
tcuGetErrorString
*
)
cuGetErrorString_fn
)(
err
,
&
err_string
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"%s failed"
,
func
);
if
(
err_name
&&
err_string
)
av_log
(
avctx
,
AV_LOG_ERROR
,
" -> %s: %s"
,
err_name
,
err_string
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"
\n
"
);
return
AVERROR_EXTERNAL
;
}
libavutil/cuda_check.h
浏览文件 @
15c63901
...
...
@@ -23,10 +23,28 @@
/**
* Wrap a CUDA function call and print error information if it fails.
*/
static
inline
int
ff_cuda_check
(
void
*
avctx
,
void
*
cuGetErrorName_fn
,
void
*
cuGetErrorString_fn
,
CUresult
err
,
const
char
*
func
)
{
const
char
*
err_name
;
const
char
*
err_string
;
int
ff_cuda_check
(
void
*
avctx
,
void
*
cuGetErrorName_fn
,
void
*
cuGetErrorString_fn
,
CUresult
err
,
const
char
*
func
);
av_log
(
avctx
,
AV_LOG_TRACE
,
"Calling %s
\n
"
,
func
);
if
(
err
==
CUDA_SUCCESS
)
return
0
;
((
tcuGetErrorName
*
)
cuGetErrorName_fn
)(
err
,
&
err_name
);
((
tcuGetErrorString
*
)
cuGetErrorString_fn
)(
err
,
&
err_string
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"%s failed"
,
func
);
if
(
err_name
&&
err_string
)
av_log
(
avctx
,
AV_LOG_ERROR
,
" -> %s: %s"
,
err_name
,
err_string
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"
\n
"
);
return
AVERROR_EXTERNAL
;
}
/**
* Convenience wrapper for ff_cuda_check when directly linking libcuda.
...
...
tests/ref/fate/source
浏览文件 @
15c63901
Files without standard license headers:
compat/avisynth/windowsPorts/basicDataTypeConversions.h
compat/avisynth/windowsPorts/windows2linux.h
libavcodec/cuda_check.c
libavcodec/file_open.c
libavcodec/ilbcdata.h
libavcodec/ilbcdec.c
...
...
@@ -10,7 +9,6 @@ libavcodec/log2_tab.c
libavcodec/reverse.c
libavdevice/file_open.c
libavdevice/reverse.c
libavfilter/cuda_check.c
libavfilter/log2_tab.c
libavformat/file_open.c
libavformat/golomb_tab.c
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录