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
b27be563
Commit
b27be563
authored
Feb 27, 2017
by
Timo Rothenpieler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compat/cuda: fix ulong size on cygwin
parent
d100dc6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
12 deletions
+18
-12
dynlink_cuviddec.h
compat/cuda/dynlink_cuviddec.h
+16
-10
dynlink_nvcuvid.h
compat/cuda/dynlink_nvcuvid.h
+2
-2
No files found.
compat/cuda/dynlink_cuviddec.h
View file @
b27be563
...
@@ -45,6 +45,12 @@
...
@@ -45,6 +45,12 @@
extern
"C"
{
extern
"C"
{
#endif
/* __cplusplus */
#endif
/* __cplusplus */
#if defined(__CYGWIN__)
typedef
unsigned
int
tcu_ulong
;
#else
typedef
unsigned
long
tcu_ulong
;
#endif
typedef
void
*
CUvideodecoder
;
typedef
void
*
CUvideodecoder
;
typedef
struct
_CUcontextlock_st
*
CUvideoctxlock
;
typedef
struct
_CUcontextlock_st
*
CUvideoctxlock
;
...
@@ -125,14 +131,14 @@ typedef enum cudaVideoCreateFlags_enum {
...
@@ -125,14 +131,14 @@ typedef enum cudaVideoCreateFlags_enum {
*/
*/
typedef
struct
_CUVIDDECODECREATEINFO
typedef
struct
_CUVIDDECODECREATEINFO
{
{
unsigned
long
ulWidth
;
/**< Coded Sequence Width */
tcu_ulong
ulWidth
;
/**< Coded Sequence Width */
unsigned
long
ulHeight
;
/**< Coded Sequence Height */
tcu_ulong
ulHeight
;
/**< Coded Sequence Height */
unsigned
long
ulNumDecodeSurfaces
;
/**< Maximum number of internal decode surfaces */
tcu_ulong
ulNumDecodeSurfaces
;
/**< Maximum number of internal decode surfaces */
cudaVideoCodec
CodecType
;
/**< cudaVideoCodec_XXX */
cudaVideoCodec
CodecType
;
/**< cudaVideoCodec_XXX */
cudaVideoChromaFormat
ChromaFormat
;
/**< cudaVideoChromaFormat_XXX (only 4:2:0 is currently supported) */
cudaVideoChromaFormat
ChromaFormat
;
/**< cudaVideoChromaFormat_XXX (only 4:2:0 is currently supported) */
unsigned
long
ulCreationFlags
;
/**< Decoder creation flags (cudaVideoCreateFlags_XXX) */
tcu_ulong
ulCreationFlags
;
/**< Decoder creation flags (cudaVideoCreateFlags_XXX) */
unsigned
long
bitDepthMinus8
;
tcu_u
long
bitDepthMinus8
;
unsigned
long
Reserved1
[
4
];
/**< Reserved for future use - set to zero */
tcu_ulong
Reserved1
[
4
];
/**< Reserved for future use - set to zero */
/**
/**
* area of the frame that should be displayed
* area of the frame that should be displayed
*/
*/
...
@@ -145,9 +151,9 @@ typedef struct _CUVIDDECODECREATEINFO
...
@@ -145,9 +151,9 @@ typedef struct _CUVIDDECODECREATEINFO
cudaVideoSurfaceFormat
OutputFormat
;
/**< cudaVideoSurfaceFormat_XXX */
cudaVideoSurfaceFormat
OutputFormat
;
/**< cudaVideoSurfaceFormat_XXX */
cudaVideoDeinterlaceMode
DeinterlaceMode
;
/**< cudaVideoDeinterlaceMode_XXX */
cudaVideoDeinterlaceMode
DeinterlaceMode
;
/**< cudaVideoDeinterlaceMode_XXX */
unsigned
long
ulTargetWidth
;
/**< Post-processed Output Width (Should be aligned to 2) */
tcu_ulong
ulTargetWidth
;
/**< Post-processed Output Width (Should be aligned to 2) */
unsigned
long
ulTargetHeight
;
/**< Post-processed Output Height (Should be aligbed to 2) */
tcu_ulong
ulTargetHeight
;
/**< Post-processed Output Height (Should be aligbed to 2) */
unsigned
long
ulNumOutputSurfaces
;
/**< Maximum number of output surfaces simultaneously mapped */
tcu_ulong
ulNumOutputSurfaces
;
/**< Maximum number of output surfaces simultaneously mapped */
CUvideoctxlock
vidLock
;
/**< If non-NULL, context lock used for synchronizing ownership of the cuda context */
CUvideoctxlock
vidLock
;
/**< If non-NULL, context lock used for synchronizing ownership of the cuda context */
/**
/**
* target rectangle in the output frame (for aspect ratio conversion)
* target rectangle in the output frame (for aspect ratio conversion)
...
@@ -159,7 +165,7 @@ typedef struct _CUVIDDECODECREATEINFO
...
@@ -159,7 +165,7 @@ typedef struct _CUVIDDECODECREATEINFO
short
right
;
short
right
;
short
bottom
;
short
bottom
;
}
target_rect
;
}
target_rect
;
unsigned
long
Reserved2
[
5
];
/**< Reserved for future use - set to zero */
tcu_ulong
Reserved2
[
5
];
/**< Reserved for future use - set to zero */
}
CUVIDDECODECREATEINFO
;
}
CUVIDDECODECREATEINFO
;
/*!
/*!
...
...
compat/cuda/dynlink_nvcuvid.h
View file @
b27be563
...
@@ -173,8 +173,8 @@ typedef enum {
...
@@ -173,8 +173,8 @@ typedef enum {
*/
*/
typedef
struct
_CUVIDSOURCEDATAPACKET
typedef
struct
_CUVIDSOURCEDATAPACKET
{
{
unsigned
long
flags
;
/**< Combination of CUVID_PKT_XXX flags */
tcu_ulong
flags
;
/**< Combination of CUVID_PKT_XXX flags */
unsigned
long
payload_size
;
/**< number of bytes in the payload (may be zero if EOS flag is set) */
tcu_ulong
payload_size
;
/**< number of bytes in the payload (may be zero if EOS flag is set) */
const
unsigned
char
*
payload
;
/**< Pointer to packet payload data (may be NULL if EOS flag is set) */
const
unsigned
char
*
payload
;
/**< Pointer to packet payload data (may be NULL if EOS flag is set) */
CUvideotimestamp
timestamp
;
/**< Presentation timestamp (10MHz clock), only valid if CUVID_PKT_TIMESTAMP flag is set */
CUvideotimestamp
timestamp
;
/**< Presentation timestamp (10MHz clock), only valid if CUVID_PKT_TIMESTAMP flag is set */
}
CUVIDSOURCEDATAPACKET
;
}
CUVIDSOURCEDATAPACKET
;
...
...
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