Skip to content
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.

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

Fix broken CI #389

Merged
merged 6 commits into from
Feb 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
env:
- { TARGET_HOST: "arm-linux-gnueabihf" }
env: ${{ matrix.env }}
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- { CC: "clang", CXX: "clang++" }
- { CMAKE: "cmake" }
env: ${{ matrix.env }}
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
scan:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
env:
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/decode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- { DECODESTREAMS: "libde265-teststreams-wpp-nolf" }
- { DECODESTREAMS: "libde265-teststreams-wpp-nolf", THREADING: "--single-threaded" }
env: ${{ matrix.env }}
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
continue-on-error: true
steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ install:

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

before_test:
- copy /y build\dec265\%CONFIGURATION%\dec265.exe build
- copy /y build\enc265\%CONFIGURATION%\enc265.exe build
- copy /y build\libde265\%CONFIGURATION%\libde265.dll build
- copy /y build\libde265\%CONFIGURATION%\de265.dll build
Copy link
Member Author

Choose a reason for hiding this comment

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

@farindk Is this an expected change?

Copy link
Contributor

Choose a reason for hiding this comment

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

The old name in Windows was libde265.dll. I think we should keep the name and consider the change a bug.


test_script:
- build\dec265.exe -q -c -f 100 libde265-data\IDR-only\paris-352x288-intra.bin
Expand Down
1 change: 1 addition & 0 deletions libde265/decctx.cc
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ decoder_context::decoder_context()
prevPicOrderCntLsb = 0;
prevPicOrderCntMsb = 0;
img = NULL;
previous_slice_header = nullptr;

/*
int PocLsbLt[MAX_NUM_REF_PICS];
Expand Down
2 changes: 1 addition & 1 deletion libde265/decctx.h
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ class decoder_context : public base_context {
de265_image* img;

public:
const slice_segment_header* previous_slice_header = nullptr; /* Remember the last slice for a successive
const slice_segment_header* previous_slice_header; /* Remember the last slice for a successive
dependent slice. */


Expand Down
4 changes: 2 additions & 2 deletions libde265/motion.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1642,8 +1642,8 @@ void derive_spatial_luma_vector_prediction(base_context* ctx,

out_availableFlagLXN[0] = false;
out_availableFlagLXN[1] = false;
out_mvLXN[0] = MotionVector{};
out_mvLXN[1] = MotionVector{};
out_mvLXN[0] = MotionVector();
out_mvLXN[1] = MotionVector();
return;
}

Expand Down
5 changes: 5 additions & 0 deletions scripts/ci-before-install-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ if [ ! -z "$CMAKE" ]; then
"
fi

# Workaround issues where the "azure.archive.ubuntu.com" mirror is not available
# See https://github.com/actions/runner-images/issues/675
sudo sed -i 's/azure\.//' /etc/apt/sources.list
UPDATE_APT=1

if [ ! -z "$UPDATE_APT" ]; then
echo "Updating package lists ..."
sudo apt-get update -qq
Expand Down