Skip to content

[ffmpeg] Add NVIDIA Codec feature for Windows and Linux #9171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 10 commits into from
Mar 24, 2020
Merged

[ffmpeg] Add NVIDIA Codec feature for Windows and Linux #9171

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
30153ea
Add NVIDIA Codec support for Windows, Linux and Linux for Tegra
marcbertola Dec 2, 2019
2804186
[ffnvcodec] Fix typos, add/remove comments
marcbertola Dec 2, 2019
c56a092
Bump nvcodec version to 9.1.23.1
marcbertola Feb 23, 2020
ebb5481
Merge remote-tracking branch 'upstream/master' into ffmpeg-nvcodec
marcbertola Feb 25, 2020
5420690
Update version number as per change request
marcbertola Feb 27, 2020
955e86d
Use PORT variable instead of hardcoded portname
marcbertola Feb 27, 2020
2bb5353
Identify the release the hash pertains to
marcbertola Mar 20, 2020
a61a143
Find nvcodec in 'installed' instead of 'packages'
marcbertola Mar 20, 2020
92786a4
Force FFmpeg to look for nvcodec headers in the installed directory i…
marcbertola Mar 20, 2020
f542c5c
Use p option on cygpath to convert full path in case it contains more…
marcbertola Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ports/ffmpeg/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,7 @@ Description: allow GPL licensed libraries

Feature: avresample
Description: Libav audio resampling library support in ffmpeg

Feature: nvcodec
Build-Depends: ffnvcodec, cuda
Description: Hardware accelerated codecs
1 change: 1 addition & 0 deletions ports/ffmpeg/build_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ PATH_TO_PACKAGE_DIR=$3

cd "$PATH_TO_BUILD_DIR"
echo "=== CONFIGURING ==="
chmod a+x "$PATH_TO_SRC_DIR/configure"
"$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" $4
echo "=== BUILDING ==="
make -j6
Expand Down
13 changes: 9 additions & 4 deletions ports/ffmpeg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include(vcpkg_common_functions)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ffmpeg/ffmpeg
Expand Down Expand Up @@ -129,6 +127,12 @@ if("avresample" IN_LIST FEATURES)
set(OPTIONS "${OPTIONS} --enable-avresample")
endif()

if("nvcodec" IN_LIST FEATURES)
set(OPTIONS "${OPTIONS} --enable-cuda --enable-nvenc --enable-cuvid --disable-libnpp")
else()
set(OPTIONS "${OPTIONS} --disable-cuda --disable-nvenc --disable-cuvid --disable-libnpp")
endif()

set(OPTIONS_CROSS "")

if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
Expand Down Expand Up @@ -175,12 +179,13 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()

set(ENV_LIB_PATH "$ENV{${LIB_PATH_VAR}}")
set(ENV{PKG_CONFIG_PATH} "${CURRENT_PACKAGES_DIR}/../ffnvcodec_${TARGET_TRIPLET}/lib/pkgconfig")
Comment thread
dan-shaw marked this conversation as resolved.
Outdated

message(STATUS "Building Options: ${OPTIONS}")

# Relase build
# Release build
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
message(STATUS "Building Relase Options: ${OPTIONS_RELEASE}")
message(STATUS "Building Release Options: ${OPTIONS_RELEASE}")
set(ENV{${LIB_PATH_VAR}} "${CURRENT_INSTALLED_DIR}/lib${SEP}${ENV_LIB_PATH}")
set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE}")
set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}")
Expand Down
8 changes: 4 additions & 4 deletions ports/ffnvcodec/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: ffnvcodec
Version: 9.1.23.0
Homepage: https://github.com/FFmpeg/nv-codec-headers
Description: FFmpeg version of Nvidia Codec SDK headers.
Source: ffnvcodec
Version: 9.0.18.1
Homepage: https://github.com/FFmpeg/nv-codec-headers
Description: FFmpeg version of Nvidia Codec SDK headers.
17 changes: 17 additions & 0 deletions ports/ffnvcodec/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/bash
set -e
export PATH=/usr/bin:$PATH

#SOURCE_PATH="`cygpath "$1"`"
#CURRENT_PACKAGES_DIR="`cygpath "$2"`"
SOURCE_PATH="$1"
CURRENT_PACKAGES_DIR="$2"

echo "CURRENT_PACKAGES_DIR=${CURRENT_PACKAGES_DIR}"

pushd ${SOURCE_PATH}
make PREFIX=${CURRENT_PACKAGES_DIR}
make install PREFIX=${CURRENT_PACKAGES_DIR}
mkdir -p /usr/lib/pkgconfig
cp ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ffnvcodec.pc /usr/lib/pkgconfig

@dan-shaw dan-shaw Mar 20, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this copy? We are installing packages config in the packages dir for ffnvcodec and ffmpeg is getting it via PKG_CONFIG_PATH

@marcbertola marcbertola Mar 20, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm. This was a long time ago. It think the idea is as follows:

  • The FFmpeg portfile invokes build.sh in MSYS
  • build.sh which in turn calls FFmpeg's configure, which calls pkg_config
  • pkg_config looks for a .pc file for ffnvcodec in the default location.

This last step is the reason why we copy the file to the root /usr/lib/pkgconfig

Now, I guess that if we do away with this copy, we remove a potential build problem. I can think of a situation where the user would decide to purge/reset the msys environment. The ffnvcodec package would still be installed, but the ffmpeg build would fail because the .pc file is no longer in the msys environment.

My question for you is: does vcpkg launch msys with the right PKG_CONFIG_PATH? if so, then yeah, I think we can remove these lines.

I'll give it a try. I'll start with a fresh checkout, remove the offending lines, and try again. I'll let you know.

@marcbertola marcbertola Mar 20, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If make eventually accepts the PREFIX parameter, and it can run under Windows, then I think we may even be able to dispense with the indirection via the build.sh script in ffnvcodec.

@marcbertola marcbertola Mar 20, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I ran into some problems, sorry for any confused back and forth email you may have received.
Contrary to my original impressions, PKG_CONFIG_PATH is set in MSYS, but it is a windows path (ex: C:\blah\blah), which doesn't work in MSYS. Once it was converted using cygpath, it works.
So: yes, these lines can be removed, but PKG_CONFIG_PATH given to MSYS should be converted using cygpath.

@marcbertola marcbertola Mar 20, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have submitted a workaround for the cygpath issue along with the removal of the lines.
I used the -p option on cygpath in case it contains multiple directories.

popd
26 changes: 26 additions & 0 deletions ports/ffnvcodec/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* This copyright notice applies to this header file only:
*
* Copyright (c) 2010-2019 NVIDIA Corporation
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the software, and to permit persons to whom the
* software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
63 changes: 50 additions & 13 deletions ports/ffnvcodec/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,50 @@
# Header-only-library
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO FFmpeg/nv-codec-headers
REF n9.1.23.0
SHA512 d9cb1ad496d971da31165e643c6c4f433561a856050503783051604f24ea5f9997859b05695632ea94ce9659966915789e6d7f7d536764804c9f673d1c8c63e4
HEAD_REF master
)

file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})

#Handle copyright
file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
# Get nvcodec
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO FFmpeg/nv-codec-headers
REF n9.0.18.1

@NancyLi1013 NancyLi1013 Dec 11, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We prefer to use commit id instead of tag name in REF place. Could you please update it?

@marcbertola marcbertola Feb 25, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

SHA512 4306ee3c6e72e9e3172b28c5e6166ec3fb9dfdc32578aebda0588afc682f56286dd6f616284c9892907cd413f57770be3662572207a36d6ac65c75a03d381f6f
HEAD_REF master
)

# ====================================================
# Install the pkgconfig info for the the `nvcodec` package
Comment thread
marcbertola marked this conversation as resolved.
Outdated
# ====================================================
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set(BUILD_SCRIPT ${CMAKE_CURRENT_LIST_DIR}\\build.sh)
vcpkg_acquire_msys(MSYS_ROOT PACKAGES make pkg-config)
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)

message(STATUS "Building ${_csc_PROJECT_PATH} for Release")
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})

# Build script parameters:
# source root
# root of where the package would be installed on a linux system (here this is the package dir)
vcpkg_execute_required_process(
COMMAND ${BASH} --noprofile --norc "${BUILD_SCRIPT}"
"${SOURCE_PATH}" # SOURCE DIR
"${CURRENT_PACKAGES_DIR}" # PACKAGE DIR
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}
LOGNAME build-${TARGET_TRIPLET}
)

else()
FIND_PROGRAM(MAKE make)
IF (NOT MAKE)
MESSAGE(FATAL_ERROR "MAKE not found")
ENDIF ()

vcpkg_execute_required_process(
COMMAND make PREFIX=$${CURRENT_PACKAGES_DIR}
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME make-${TARGET_TRIPLET}
)
Comment thread
dan-shaw marked this conversation as resolved.

# Deploy a copy of the ffnvcodec.pc file where ffmpeg's pkgconfig call expects to find it
file(INSTALL ${SOURCE_PATH}/ffnvcodec.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
endif()

# Install the files to their generic location as well
file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/ffnvcodec)
Comment thread
marcbertola marked this conversation as resolved.
Outdated