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.

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

Update FFmpeg to v5.0 #2475

Merged
merged 3 commits into from
Nov 3, 2024
Merged

Update FFmpeg to v5.0 #2475

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
0bf4920
Rename ENABLE_FFMPEG3 to ENABLE_FFMPEG
bear101 Nov 2, 2024
ee093a1
Change to FFmpeg v5.1.6
bear101 Oct 30, 2024
bb1c066
Disable build of FFmpeg on iOS from toolchain since it cannot build
bear101 Nov 2, 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
2 changes: 1 addition & 1 deletion .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Build TeamTalk Library
working-directory: ${{runner.workspace}}/TeamTalk5/Build
run: |
make CMAKE_EXTRA="-DFEATURE_WEBRTC=OFF -DCMAKE_OSX_ARCHITECTURES=${{ matrix.cmakearch }} -DCMAKE_OSX_SYSROOT=${{ matrix.cmakesysroot }} -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-${{ matrix.cmakearch }}" BUILDDIR=build-${{ matrix.cmakearch }} ios-build
make CMAKE_EXTRA="-DFEATURE_WEBRTC=OFF -DTOOLCHAIN_FFMPEG=OFF -DCMAKE_OSX_ARCHITECTURES=${{ matrix.cmakearch }} -DCMAKE_OSX_SYSROOT=${{ matrix.cmakesysroot }} -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-${{ matrix.cmakearch }}" BUILDDIR=build-${{ matrix.cmakearch }} ios-build

- name: Run CMake Install Target
working-directory: ${{runner.workspace}}/TeamTalk5/Build/build-${{ matrix.cmakearch }}
Expand Down
7 changes: 3 additions & 4 deletions Library/TeamTalkLib/avstream/AVFVideoInput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2005-2018, BearWare.dk
*
*
* Contact Information:
*
* Bjoern D. Rasmussen
Expand Down Expand Up @@ -32,7 +32,7 @@ extern "C" {

using namespace vidcap;

bool AVFVideoInput::SetupInput(AVInputFormat *iformat,
bool AVFVideoInput::SetupInput(const AVInputFormat *iformat,
AVDictionary *options,
AVFormatContext*& fmt_ctx,
AVCodecContext*& aud_dec_ctx,
Expand All @@ -42,7 +42,7 @@ bool AVFVideoInput::SetupInput(AVInputFormat *iformat,
{

auto vidfmt = GetMediaOutput().video;

iformat = av_find_input_format(m_dev.api.c_str());
int fps = 1;
if (vidfmt.fps_denominator)
Expand All @@ -67,4 +67,3 @@ bool AVFVideoInput::SetupInput(AVInputFormat *iformat,
audio_stream_index,
video_stream_index);
}

6 changes: 3 additions & 3 deletions Library/TeamTalkLib/avstream/AVFVideoInput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2005-2018, BearWare.dk
*
*
* Contact Information:
*
* Bjoern D. Rasmussen
Expand Down Expand Up @@ -32,9 +32,9 @@ namespace vidcap {
const media::VideoFormat& fmt)
: FFmpegVideoInput(viddevice, fmt) {
}

// FFmpegStreamer override
bool SetupInput(struct AVInputFormat *iformat,
bool SetupInput(const struct AVInputFormat *iformat,
struct AVDictionary *options,
struct AVFormatContext*& fmt_ctx,
struct AVCodecContext*& aud_dec_ctx,
Expand Down
4 changes: 2 additions & 2 deletions Library/TeamTalkLib/avstream/AudioResampler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#if defined(ENABLE_DMORESAMPLER)
#include "DMOResampler.h"
#elif defined(ENABLE_FFMPEG3)
#elif defined(ENABLE_FFMPEG)
#include "FFmpegResampler.h"
#endif

Expand Down Expand Up @@ -140,7 +140,7 @@ audio_resampler_t MakeAudioResampler(const media::AudioFormat& informat,
resampler.reset(dmo);
ret = dmo->Init(SAMPLEFORMAT_INT16, SAMPLEFORMAT_INT16);
MYTRACE(ACE_TEXT("Launched DMOResampler\n"));
#elif defined(ENABLE_FFMPEG3)
#elif defined(ENABLE_FFMPEG)
auto ffmpeg = new FFMPEGResampler(informat, outformat, input_samples_size);
resampler.reset(ffmpeg);
ret = ffmpeg->Init();
Expand Down
9 changes: 4 additions & 5 deletions Library/TeamTalkLib/avstream/FFmpegCapture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2005-2018, BearWare.dk
*
*
* Contact Information:
*
* Bjoern D. Rasmussen
Expand Down Expand Up @@ -55,15 +55,15 @@ namespace vidcap {
const media::VideoFormat& fmt) = 0;
ffmpegvideoinput_t m_videoinput;
VideoCaptureCallback m_callback;

public:
FFmpegCapture();
virtual ~FFmpegCapture();

// VideoCapture interface
bool InitVideoCapture(const ACE_TString& deviceid,
const media::VideoFormat& vidfmt);

bool StartVideoCapture();

void StopVideoCapture();
Expand All @@ -72,7 +72,7 @@ namespace vidcap {

bool RegisterVideoFormat(VideoCaptureCallback callback, media::FourCC fcc);
void UnregisterVideoFormat(media::FourCC fcc);

// MediaStreamListener interface
bool MediaStreamVideoCallback(media::VideoFrame& video_frame,
ACE_Message_Block* mb_video);
Expand All @@ -84,4 +84,3 @@ namespace vidcap {
}

#endif

Loading
Loading