public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg-full: add libmfx support with intel-media-sdk

Browse Source
This commit is contained in:
midchildan 2019-03-11 16:10:56 +09:00
parent d1d3973142
commit 410c30077c
No known key found for this signature in database
GPG Key ID: D9A5748BACC6E3C2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -75,7 +75,7 @@
, libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394)
, libiconv ? null , libiconv ? null
#, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394) #, libiec61883 ? null, libavc1394 ? null # iec61883 (also uses libraw1394)
#, libmfx ? null # Hardware acceleration vis libmfx , libmfx ? null # Hardware acceleration vis libmfx
, libmodplug ? null # ModPlug support , libmodplug ? null # ModPlug support
, libmysofa ? null # HRTF support via SOFAlizer , libmysofa ? null # HRTF support via SOFAlizer
#, libnut ? null # NUT (de)muxer, native (de)muser exists #, libnut ? null # NUT (de)muxer, native (de)muser exists
@ -156,12 +156,13 @@
* *
* Not packaged: * Not packaged:
* aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883
* libmxf libnut libquvi nvenc opencl openh264 oss shine twolame * libnut libquvi nvenc opencl openh264 oss shine twolame
* utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
* *
* Need fixes to support Darwin: * Need fixes to support Darwin:
* frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg, * frei0r game-music-emu gsm libjack2 libmfx(intel-media-sdk) libssh
* pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs * libvpx(stable 1.3.0) openal openjpeg pulseaudio rtmpdump samba vid-stab
* wavpack x265 xavs
* *
* Not supported: * Not supported:
* stagefright-h264(android only) * stagefright-h264(android only)
@ -343,7 +344,7 @@ stdenv.mkDerivation rec {
(enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394") (enableFeature (if isLinux then libdc1394 != null && libraw1394 != null else false) "libdc1394")
(enableFeature (libiconv != null) "iconv") (enableFeature (libiconv != null) "iconv")
#(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883") #(enableFeature (if isLinux then libiec61883 != null && libavc1394 != null && libraw1394 != null else false) "libiec61883")
#(enableFeature (libmfx != null) "libmfx") (enableFeature (if isLinux then libmfx != null else false) "libmfx")
(enableFeature (libmodplug != null) "libmodplug") (enableFeature (libmodplug != null) "libmodplug")
(enableFeature (libmysofa != null) "libmysofa") (enableFeature (libmysofa != null) "libmysofa")
#(enableFeature (libnut != null) "libnut") #(enableFeature (libnut != null) "libnut")
@ -416,6 +417,7 @@ stdenv.mkDerivation rec {
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
++ optional (isLinux && libmfx != null) libmfx
++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ] ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ]
++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
MediaToolbox VideoDecodeAcceleration MediaToolbox VideoDecodeAcceleration

1
pkgs/top-level/all-packages.nix
View File

@ -9846,6 +9846,7 @@ in
libjack2 = if stdenv.isDarwin then null else libjack2; libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug; libmodplug = if stdenv.isDarwin then null else libmodplug;
openal = if stdenv.isDarwin then null else openal; openal = if stdenv.isDarwin then null else openal;
libmfx = if stdenv.isDarwin then null else intel-media-sdk;
libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
samba = if stdenv.isDarwin then null else samba; samba = if stdenv.isDarwin then null else samba;
vid-stab = if stdenv.isDarwin then null else vid-stab; vid-stab = if stdenv.isDarwin then null else vid-stab;