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
8f6f357f
Commit
8f6f357f
authored
Oct 01, 2015
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: restore videotoolbox compilation on iOS
parent
40d9d6de
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
configure
configure
+6
-5
ffmpeg_videotoolbox.c
ffmpeg_videotoolbox.c
+8
-0
No files found.
configure
View file @
8f6f357f
...
...
@@ -1818,6 +1818,7 @@ SYSTEM_FUNCS="
sysconf
sysctl
usleep
UTGetOSTypeFromString
VirtualAlloc
wglGetProcAddress
"
...
...
@@ -2395,11 +2396,11 @@ crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
d3d11va_deps
=
"d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext"
dxva2_deps
=
"dxva2api_h DXVA2_ConfigPictureDecode"
vaapi_deps
=
"va_va_h"
vda_deps
=
"VideoDecodeAcceleration_VDADecoder_h pthreads
CoreServices_CoreServices_h
"
vda_extralibs
=
"-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore
-framework CoreServices
"
vda_deps
=
"VideoDecodeAcceleration_VDADecoder_h pthreads"
vda_extralibs
=
"-framework CoreFoundation -framework VideoDecodeAcceleration -framework QuartzCore"
vdpau_deps
=
"vdpau_vdpau_h vdpau_vdpau_x11_h"
videotoolbox_deps
=
"VideoToolbox_VideoToolbox_h pthreads
CoreServices_CoreServices_h
"
videotoolbox_extralibs
=
"-framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework QuartzCore
-framework CoreServices
"
videotoolbox_deps
=
"VideoToolbox_VideoToolbox_h pthreads"
videotoolbox_extralibs
=
"-framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework QuartzCore"
xvmc_deps
=
"X11_extensions_XvMClib_h"
h263_vaapi_hwaccel_deps
=
"vaapi"
...
...
@@ -5157,7 +5158,6 @@ check_func_headers glob.h glob
enabled xlib
&&
check_func_headers
"X11/Xlib.h X11/extensions/Xvlib.h"
XvGetPortAttribute
-lXv
-lX11
-lXext
check_header CoreServices/CoreServices.h
check_header direct.h
check_header dirent.h
check_header dlfcn.h
...
...
@@ -5190,6 +5190,7 @@ check_header asm/types.h
check_lib2
"windows.h shellapi.h"
CommandLineToArgvW
-lshell32
check_lib2
"windows.h wincrypt.h"
CryptGenRandom
-ladvapi32
check_lib2
"windows.h psapi.h"
GetProcessMemoryInfo
-lpsapi
check_lib
"CoreServices/CoreServices.h"
UTGetOSTypeFromString
"-framework CoreServices"
check_struct
"sys/time.h sys/resource.h"
"struct rusage"
ru_maxrss
...
...
ffmpeg_videotoolbox.c
View file @
8f6f357f
...
...
@@ -16,7 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#if HAVE_UTGETOSTYPEFROMSTRING
#include <CoreServices/CoreServices.h>
#endif
#include "config.h"
#include "libavcodec/avcodec.h"
...
...
@@ -168,7 +170,13 @@ int videotoolbox_init(AVCodecContext *s)
CFStringRef
pixfmt_str
=
CFStringCreateWithCString
(
kCFAllocatorDefault
,
videotoolbox_pixfmt
,
kCFStringEncodingUTF8
);
#if HAVE_UTGETOSTYPEFROMSTRING
vdactx
->
cv_pix_fmt_type
=
UTGetOSTypeFromString
(
pixfmt_str
);
#else
av_log
(
s
,
loglevel
,
"UTGetOSTypeFromString() is not available "
"on this platform, %s pixel format can not be honored from "
"the command line
\n
"
,
videotoolbox_pixfmt
);
#endif
ret
=
av_vda_default_init2
(
s
,
vdactx
);
CFRelease
(
pixfmt_str
);
}
...
...
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