Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
c8556834
Commit
c8556834
authored
May 07, 2018
by
Timo Rothenpieler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avutil/hwcontext_cuda: add CUstream in cuda hwctx
parent
baabd3c2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
3 deletions
+12
-3
configure
configure
+4
-2
APIchanges
doc/APIchanges
+3
-0
hwcontext_cuda.c
libavutil/hwcontext_cuda.c
+3
-0
hwcontext_cuda.h
libavutil/hwcontext_cuda.h
+1
-0
version.h
libavutil/version.h
+1
-1
No files found.
configure
View file @
c8556834
...
...
@@ -5887,8 +5887,10 @@ check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9"
check_type
"vdpau/vdpau.h"
"VdpPictureInfoHEVC"
if
!
disabled ffnvcodec
;
then
check_pkg_config ffnvcodec
"ffnvcodec >= 8.0.14.1"
\
"ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h"
""
check_pkg_config ffnvcodec
"ffnvcodec >= 8.1.24.2"
\
"ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h"
""
||
\
{
test_pkg_config ffnvcodec_tmp
"ffnvcodec < 8.1"
""
""
&&
check_pkg_config ffnvcodec
"ffnvcodec >= 8.0.14.2"
\
"ffnvcodec/nvEncodeAPI.h ffnvcodec/dynlink_cuda.h ffnvcodec/dynlink_cuviddec.h ffnvcodec/dynlink_nvcuvid.h"
""
;
}
fi
check_cpp_condition winrt windows.h
"!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)"
...
...
doc/APIchanges
View file @
c8556834
...
...
@@ -15,6 +15,9 @@ libavutil: 2017-10-21
API changes, most recent first:
2018-05-xx - xxxxxxxxxx - lavu 56.18.101 - hwcontext_cuda.h
Add AVCUDADeviceContext.stream.
2018-04-xx - xxxxxxxxxx - lavu 56.18.100 - pixdesc.h
Add AV_PIX_FMT_FLAG_ALPHA to AV_PIX_FMT_PAL8.
...
...
libavutil/hwcontext_cuda.c
View file @
c8556834
...
...
@@ -386,6 +386,9 @@ static int cuda_device_create(AVHWDeviceContext *ctx, const char *device,
goto
error
;
}
// Setting stream to NULL will make functions automatically use the default CUstream
hwctx
->
stream
=
NULL
;
cu
->
cuCtxPopCurrent
(
&
dummy
);
hwctx
->
internal
->
is_allocated
=
1
;
...
...
libavutil/hwcontext_cuda.h
View file @
c8556834
...
...
@@ -41,6 +41,7 @@ typedef struct AVCUDADeviceContextInternal AVCUDADeviceContextInternal;
*/
typedef
struct
AVCUDADeviceContext
{
CUcontext
cuda_ctx
;
CUstream
stream
;
AVCUDADeviceContextInternal
*
internal
;
}
AVCUDADeviceContext
;
...
...
libavutil/version.h
View file @
c8556834
...
...
@@ -80,7 +80,7 @@
#define LIBAVUTIL_VERSION_MAJOR 56
#define LIBAVUTIL_VERSION_MINOR 18
#define LIBAVUTIL_VERSION_MICRO 10
0
#define LIBAVUTIL_VERSION_MICRO 10
1
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment