Skip to content

Commit 3aea5a4

Browse files
authored
Merge pull request #389 from strukturag/ci-fixes
Fix broken CI
2 parents e255f05 + 3d7b64f commit 3aea5a4

File tree

9 files changed

+15
-9
lines changed

9 files changed

+15
-9
lines changed

.github/workflows/arm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
env:
1414
- { TARGET_HOST: "arm-linux-gnueabihf" }
1515
env: ${{ matrix.env }}
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-20.04
1717
steps:
1818
- uses: actions/checkout@v2
1919

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- { CC: "clang", CXX: "clang++" }
1616
- { CMAKE: "cmake" }
1717
env: ${{ matrix.env }}
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-20.04
1919
steps:
2020
- uses: actions/checkout@v2
2121

.github/workflows/coverity.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
scan:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-20.04
1010
env:
1111
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
1212
steps:

.github/workflows/decode.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- { DECODESTREAMS: "libde265-teststreams-wpp-nolf" }
2828
- { DECODESTREAMS: "libde265-teststreams-wpp-nolf", THREADING: "--single-threaded" }
2929
env: ${{ matrix.env }}
30-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-20.04
3131
continue-on-error: true
3232
steps:
3333
- uses: actions/checkout@v2

appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ install:
2525

2626
build_script:
2727
- ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" }
28-
- cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -H. -Bbuild
28+
- cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -H. -Bbuild -DENABLE_ENCODER=ON
2929
- cmake --build build --config %CONFIGURATION%
3030

3131
before_test:
3232
- copy /y build\dec265\%CONFIGURATION%\dec265.exe build
3333
- copy /y build\enc265\%CONFIGURATION%\enc265.exe build
34-
- copy /y build\libde265\%CONFIGURATION%\libde265.dll build
34+
- copy /y build\libde265\%CONFIGURATION%\de265.dll build
3535

3636
test_script:
3737
- build\dec265.exe -q -c -f 100 libde265-data\IDR-only\paris-352x288-intra.bin

libde265/decctx.cc

+1
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ decoder_context::decoder_context()
265265
prevPicOrderCntLsb = 0;
266266
prevPicOrderCntMsb = 0;
267267
img = NULL;
268+
previous_slice_header = nullptr;
268269

269270
/*
270271
int PocLsbLt[MAX_NUM_REF_PICS];

libde265/decctx.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ class decoder_context : public base_context {
450450
de265_image* img;
451451

452452
public:
453-
const slice_segment_header* previous_slice_header = nullptr; /* Remember the last slice for a successive
453+
const slice_segment_header* previous_slice_header; /* Remember the last slice for a successive
454454
dependent slice. */
455455

456456

libde265/motion.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -1642,8 +1642,8 @@ void derive_spatial_luma_vector_prediction(base_context* ctx,
16421642

16431643
out_availableFlagLXN[0] = false;
16441644
out_availableFlagLXN[1] = false;
1645-
out_mvLXN[0] = MotionVector{};
1646-
out_mvLXN[1] = MotionVector{};
1645+
out_mvLXN[0] = MotionVector();
1646+
out_mvLXN[1] = MotionVector();
16471647
return;
16481648
}
16491649

scripts/ci-before-install-linux.sh

+5
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ if [ ! -z "$CMAKE" ]; then
8585
"
8686
fi
8787

88+
# Workaround issues where the "azure.archive.ubuntu.com" mirror is not available
89+
# See https://github.com/actions/runner-images/issues/675
90+
sudo sed -i 's/azure\.//' /etc/apt/sources.list
91+
UPDATE_APT=1
92+
8893
if [ ! -z "$UPDATE_APT" ]; then
8994
echo "Updating package lists ..."
9095
sudo apt-get update -qq

0 commit comments

Comments
 (0)