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 v6.2.1 #2471

Closed
wants to merge 7 commits into from
Closed

Update FFmpeg to v6.2.1 #2471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
495d8fd
Rename FFMpeg3 classes to FFmpeg prior to FFmpeg v4 update
bear101 Oct 31, 2024
773ead5
Change CMAKE_OSX_DEPLOYMENT_TARGET from 10.9 to 10.13
bear101 Oct 30, 2024
8765d09
Change CMAKE_OSX_DEPLOYMENT_TARGET on iOS from 7.0 to 8.0
bear101 Oct 31, 2024
41aa23e
Change to FFmpeg v4.0
bear101 Oct 30, 2024
fb6f17d
Change to FFmpeg v4.3.8
bear101 Oct 30, 2024
0e5b0eb
Change to FFmpeg v5.0
bear101 Oct 30, 2024
c74c94e
Change to FFmpeg v6.1.2
bear101 Oct 30, 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
4 changes: 2 additions & 2 deletions Library/TeamTalkLib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
set (CMAKE_OSX_DEPLOYMENT_TARGET 10.9)
set (CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
message(WARNING "No deployment target specified. Defaulting to ${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()

Expand All @@ -59,7 +59,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "iOS")

if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
set (CMAKE_OSX_DEPLOYMENT_TARGET 7.0)
set (CMAKE_OSX_DEPLOYMENT_TARGET 8.0)
message(WARNING "No deployment target specified. Defaulting to ${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
list (APPEND COMPILE_FLAGS -fembed-bitcode)
Expand Down
2 changes: 1 addition & 1 deletion Library/TeamTalkLib/avstream/AVFCapture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

namespace vidcap {

class AVFCapture : public FFMpeg3Capture
class AVFCapture : public FFmpegCapture
{
protected:
ffmpegvideoinput_t createStreamer(const VidCapDevice& viddevice,
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);
}

8 changes: 4 additions & 4 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 All @@ -21,7 +21,7 @@
*
*/

#include "FFMpeg3Capture.h"
#include "FFmpegCapture.h"

namespace vidcap {

Expand All @@ -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
2 changes: 1 addition & 1 deletion Library/TeamTalkLib/avstream/AudioResampler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#if defined(ENABLE_DMORESAMPLER)
#include "DMOResampler.h"
#elif defined(ENABLE_FFMPEG3)
#include "FFMpeg3Resampler.h"
#include "FFmpegResampler.h"
#endif

#include <myace/MyACE.h>
Expand Down
17 changes: 8 additions & 9 deletions ...ary/TeamTalkLib/avstream/FFMpeg3Capture.h → 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 All @@ -25,7 +25,7 @@
#define FFMPEG3CAPTURE_H

#include "VideoCapture.h"
#include "FFMpeg3Streamer.h"
#include "FFmpegStreamer.h"
#include <myace/MyACE.h>

#include <map>
Expand All @@ -48,22 +48,22 @@ namespace vidcap {

typedef std::unique_ptr<FFMpegVideoInput> ffmpegvideoinput_t;

class FFMpeg3Capture : public VideoCapture
class FFmpegCapture : public VideoCapture
{
protected:
virtual ffmpegvideoinput_t createStreamer(const VidCapDevice& viddevice,
const media::VideoFormat& fmt) = 0;
ffmpegvideoinput_t m_videoinput;
VideoCaptureCallback m_callback;

public:
FFMpeg3Capture();
virtual ~FFMpeg3Capture();
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