Skip to content

Commit a984fc5

Browse files
committed
Create 0001-avcodec-x86-mathops-clip-constants.patch (#33)
ADD: Create patch file `scripts/patch/ffmpeg/0001-avcodec-x86-mathops-clip-constants.patch` Created a temporary file based patch for FFmpeg This will be removed after version advancement/upgrade to more recent version of FFmpeg: ADD: Commands to `03_build_raisr_ffmpeg.sh` to reflect the added patch file. Co-authored by: @djie1 Signed-off-by: Miłosz Linkiewicz <milosz.linkiewicz@intel.com>
1 parent 71d2370 commit a984fc5

2 files changed

Lines changed: 55 additions & 7 deletions

File tree

.github/workflows/build-baremetal-ubuntu.yml

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,27 @@ jobs:
7474
sudo apt-get update --fix-missing && \
7575
sudo apt-get install --no-install-recommends -y intel-oneapi-ipp-devel-2022.0
7676
77-
- name: 'Download and patch ffmpeg repository'
77+
- name: 'preparation: download and patch ffmpeg repository'
7878
run: |
7979
set -eo pipefail && \
8080
curl -Lf https://github.com/ffmpeg/ffmpeg/archive/${FFMPEG_COMMIT_ID}.tar.gz | tar -zx --strip-components=1 -C "${BUILD_FFMPEG_DIR}"
8181
patch -d "${BUILD_FFMPEG_DIR}" -p1 -i <(cat "${{ github.workspace }}/ffmpeg/"*.patch)
8282
cp "${{ github.workspace }}/ffmpeg/vf_raisr"*.c "${BUILD_FFMPEG_DIR}/libavfilter"
8383
84-
- name: 'Build RAISR from source code'
84+
- name: 'build: building RAISR from source code'
8585
run: |
8686
./build.sh -DENABLE_RAISR_OPENCL=ON \
8787
-DCMAKE_LIBRARY_PATH="/opt/intel/oneapi/ipp/latest/lib;${PREFIX}/lib;" \
8888
-DCMAKE_C_FLAGS="-I/opt/intel/oneapi/ipp/latest/include -I/opt/intel/oneapi/ipp/latest/include/ipp" \
8989
-DCMAKE_CXX_FLAGS="-I/opt/intel/oneapi/ipp/latest/include -I/opt/intel/oneapi/ipp/latest/include/ipp"
9090
91-
- name: 'Configure ffmpeg repository'
91+
- name: 'post-build: upload build artifacts'
92+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
93+
with:
94+
name: raisr-library-binary
95+
path: '${{ github.workspace }}/build/Library'
96+
97+
- name: 'preparation: configure ffmpeg repository'
9298
continue-on-error: true
9399
run: |
94100
cd "${BUILD_FFMPEG_DIR}"
@@ -109,12 +115,54 @@ jobs:
109115
--prefix="${PREFIX}" || \
110116
{ tail -n 100 "${BUILD_DIR}/ffmpeg/ffbuild/config.log" && exit 1; }
111117
112-
- name: 'Build, install and check ffmpeg'
118+
- name: 'build: compilation and install of ffmpeg'
113119
continue-on-error: true
120+
working-directory: "${BUILD_FFMPEG_DIR}"
114121
run: |
115-
cd "${BUILD_FFMPEG_DIR}"
116122
make clean
117123
make -j"$(nproc)"
118124
sudo -E make install
125+
126+
- name: 'checks: check if ffmpeg was build properly'
127+
continue-on-error: true
128+
working-directory: "${BUILD_FFMPEG_DIR}"
129+
run: |
119130
sudo -E ldconfig
120-
ffmpeg -buildconf
131+
./ffmpeg -buildconf || \
132+
ffmpeg -buildconf || \
133+
/usr/local/bin/ffmpeg -buildconf
134+
135+
build-baremetal-using-scripts:
136+
runs-on: 'ubuntu-22.04'
137+
timeout-minutes: 70
138+
steps:
139+
- name: 'preparations: Harden Runner'
140+
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
141+
with:
142+
egress-policy: audit
143+
144+
- name: 'preparations: Checkout repository'
145+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
146+
147+
- name: 'prerequisites: Download/Pull resources'
148+
shell: bash
149+
working-directory: scripts
150+
run: |
151+
git config --global user.email "you@example.com"
152+
git config --global user.name "Ubuntu Action Runnner"
153+
154+
- name: 'prerequisites: Download/Pull resources'
155+
shell: bash
156+
working-directory: scripts
157+
run: ./01_pull_resources.sh
158+
159+
- name: 'prerequisites: Install prerequisites'
160+
shell: bash
161+
working-directory: scripts
162+
run: ./02_install_prerequisites.sh ./raisr.tar.gz
163+
164+
- name: 'Build raisr and ffmpeg'
165+
shell: bash
166+
working-directory: scripts
167+
run: ./03_build_raisr_ffmpeg.sh ./raisr/Video-Super-Resolution-Library
168+

scripts/03_build_raisr_ffmpeg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ popd
3333

3434
# TO-DO: Remove patch apply from bellow lines:
3535
# Apply a temporary patch - this will be removed after version of FFmpeg gets updated
36-
patch -p1 -i "${REPOSITORY_DIR}/scripts/patch/ffmpeg/0001-avcodec-x86-mathops-clip-constants.patch"
36+
patch -d "${raisr_path}/../ffmpeg" -p1 -i <(cat "${raisr_path}/scripts/patch/ffmpeg/"*.patch)
3737

3838
# build ffmpeg
3939
pushd "${raisr_path}/../ffmpeg"

0 commit comments

Comments
 (0)