Skip to content

Fix cuda builds for lower than 6.1 ffmpeg versions #273

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
ahmadsharif1 merged 3 commits into from
Oct 17, 2024
Merged

Fix cuda builds for lower than 6.1 ffmpeg versions #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5f4ea9
Fix cuda builds for lower ffmpeg versions
ahmadsharif1 Oct 17, 2024
b64fd48
.
ahmadsharif1 Oct 17, 2024
f68e030
.
ahmadsharif1 Oct 17, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/cuda_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ jobs:
python_version: ["3.9"]
# TODO: Add more cuda versions.
cuda_arch_version: ["12.4"]
ffmpeg_version: ["origin/release/6.1"]
# TODO: Get ffmpeg 4 to work. Currently fails to build with nvcc.
ffmpeg_version: ["origin/release/5.1", "origin/release/6.1", "origin/release/7.1"]
fail-fast: false
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
Expand Down
6 changes: 6 additions & 0 deletions src/torchcodec/decoders/_core/CudaDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ AVBufferRef* getFromCache(const torch::Device& device) {
return nullptr;
}

#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(58, 26, 100)

AVBufferRef* getFFMPEGContextFromExistingCudaContext(
const torch::Device& device,
torch::DeviceIndex nonNegativeDeviceIndex,
Expand Down Expand Up @@ -105,6 +107,8 @@ AVBufferRef* getFFMPEGContextFromExistingCudaContext(
return hw_device_ctx;
}

#else

AVBufferRef* getFFMPEGContextFromNewCudaContext(
const torch::Device& device,
torch::DeviceIndex nonNegativeDeviceIndex,
Expand All @@ -122,6 +126,8 @@ AVBufferRef* getFFMPEGContextFromNewCudaContext(
return hw_device_ctx;
}

#endif

AVBufferRef* getCudaContext(const torch::Device& device) {
enum AVHWDeviceType type = av_hwdevice_find_type_by_name("cuda");
TORCH_CHECK(type != AV_HWDEVICE_TYPE_NONE, "Failed to find cuda device");
Expand Down
Loading