Skip to content

Compatible with ffmpeg-7.0.1 - ChatGPT Assistance. #1281

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compatible with ffmpeg-7.0.1 - ChatGPT Assistance. #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ osg::ref_ptr<osg::Geometry> ReaderWritterOpenCASCADE::OCCTKReader::_createGeomet
{
// populate vertex list
// Ref: http://www.opencascade.org/org/forum/thread_16694/?forum=3
gp_Pnt pt = (triangulation->Nodes())(j).Transformed(transformation * location.Transformation());
gp_Pnt pt = (triangulation->Node(j)).Transformed(transformation * location.Transformation());
Copy link

Choose a reason for hiding this comment

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

This looks to be unrelated to the FFmpeg bits.

vertexList->push_back(osg::Vec3(pt.X(), pt.Y(), pt.Z()));

// populate color list
Expand Down
78 changes: 27 additions & 51 deletions src/osgPlugins/ffmpeg/FFmpegDecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

#include "FFmpegDecoder.hpp"
#include "FFmpegParameters.hpp"

Expand Down Expand Up @@ -36,8 +35,10 @@ static std::string AvStrError(int errnum)
}

FFmpegDecoder::FFmpegDecoder() :
m_audio_stream(0),
m_video_stream(0),
m_audio_stream(nullptr),
m_video_stream(nullptr),
m_audio_index(-1),
m_video_index(-1),
m_audio_queue(100),
m_video_queue(100),
m_audio_decoder(m_audio_queue, m_clocks),
Expand All @@ -61,10 +62,10 @@ bool FFmpegDecoder::open(const std::string & filename, FFmpegParameters* paramet
try
{
// Open video file
AVFormatContext * p_format_context = 0;
AVInputFormat *iformat = 0;
AVFormatContext * p_format_context = nullptr;
AVInputFormat *iformat = nullptr;

if (filename.compare(0, 5, "/dev/")==0)
if (filename.compare(0, 5, "/dev/") == 0)
{
#ifdef ANDROID
throw std::runtime_error("Device not supported on Android");
Expand All @@ -78,24 +79,24 @@ bool FFmpegDecoder::open(const std::string & filename, FFmpegParameters* paramet
}

std::string format = "video4linux2";
iformat = av_find_input_format(format.c_str());
iformat = const_cast<AVInputFormat*>(av_find_input_format(format.c_str()));

if (iformat)
{
OSG_INFO<<"Found input format: "<<format<<std::endl;
OSG_INFO << "Found input format: " << format << std::endl;
}
else
{
OSG_INFO<<"Failed to find input format: "<<format<<std::endl;
OSG_INFO << "Failed to find input format: " << format << std::endl;
}

#endif
}
else
{
iformat = parameters ? parameters->getFormat() : 0;
AVIOContext* context = parameters ? parameters->getContext() : 0;
if (context != NULL)
iformat = parameters ? const_cast<AVInputFormat*>(parameters->getFormat()) : nullptr;
AVIOContext* context = parameters ? parameters->getContext() : nullptr;
if (context != nullptr)
{
p_format_context = avformat_alloc_context();
p_format_context->pb = context;
Expand All @@ -105,38 +106,23 @@ bool FFmpegDecoder::open(const std::string & filename, FFmpegParameters* paramet
int error = avformat_open_input(&p_format_context, filename.c_str(), iformat, parameters->getOptions());
if (error != 0)
{
std::string error_str;
switch (error)
{
//case AVERROR_UNKNOWN: error_str = "AVERROR_UNKNOWN"; break; // same value as AVERROR_INVALIDDATA
case AVERROR_IO: error_str = "AVERROR_IO"; break;
case AVERROR_NUMEXPECTED: error_str = "AVERROR_NUMEXPECTED"; break;
case AVERROR_INVALIDDATA: error_str = "AVERROR_INVALIDDATA"; break;
case AVERROR_NOMEM: error_str = "AVERROR_NOMEM"; break;
case AVERROR_NOFMT: error_str = "AVERROR_NOFMT"; break;
case AVERROR_NOTSUPP: error_str = "AVERROR_NOTSUPP"; break;
case AVERROR_NOENT: error_str = "AVERROR_NOENT"; break;
case AVERROR_PATCHWELCOME: error_str = "AVERROR_PATCHWELCOME"; break;
default: error_str = "Unknown error"; break;
}

throw std::runtime_error("av_open_input_file() failed : " + error_str);
throw std::runtime_error("avformat_open_input() failed: " + AvStrError(error));
}

m_format_context.reset(p_format_context);

// Retrieve stream info
// Only buffer up to one and a half seconds by default
float max_analyze_duration = 1.5;
AVDictionaryEntry *mad = av_dict_get( *parameters->getOptions(), "mad", NULL, 0 );
if ( mad ) {
AVDictionaryEntry *mad = av_dict_get(*parameters->getOptions(), "mad", NULL, 0);
if (mad) {
max_analyze_duration = atof(mad->value);
}
p_format_context->max_analyze_duration = AV_TIME_BASE * max_analyze_duration;
// p_format_context->probesize = 100000;

if (avformat_find_stream_info(p_format_context, NULL) < 0)
throw std::runtime_error("av_find_stream_info() failed");
throw std::runtime_error("avformat_find_stream_info() failed");

m_duration = double(m_format_context->duration) / AV_TIME_BASE;
if (m_format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE))
Expand All @@ -159,7 +145,7 @@ bool FFmpegDecoder::open(const std::string & filename, FFmpegParameters* paramet
m_audio_stream = m_format_context->streams[m_audio_index];
else
{
m_audio_stream = 0;
m_audio_stream = nullptr;
m_audio_index = std::numeric_limits<unsigned int>::max();
}

Expand Down Expand Up @@ -271,18 +257,18 @@ bool FFmpegDecoder::readNextPacketNormal()
{
AVPacket packet;

if (! m_pending_packet)
if (!m_pending_packet)
{
bool end_of_stream = false;

// Read the next frame packet
int error = av_read_frame(m_format_context.get(), &packet);
if (error < 0)
{
if (error == static_cast<int>(AVERROR_EOF) ||
m_format_context.get()->pb->eof_reached)
if (error == static_cast<int>(AVERROR_EOF) || m_format_context.get()->pb->eof_reached)
end_of_stream = true;
else {
else
{
OSG_FATAL << "av_read_frame() returned " << AvStrError(error) << std::endl;
throw std::runtime_error("av_read_frame() failed");
}
Expand All @@ -303,12 +289,6 @@ bool FFmpegDecoder::readNextPacketNormal()
}
else
{
// Make the packet data available beyond av_read_frame() logical scope.
if ((error = av_dup_packet(&packet)) < 0) {
OSG_FATAL << "av_dup_packet() returned " << AvStrError(error) << std::endl;
throw std::runtime_error("av_dup_packet() failed");
}

m_pending_packet = FFmpegPacket(packet);
}
}
Expand Down Expand Up @@ -340,8 +320,6 @@ bool FFmpegDecoder::readNextPacketNormal()
return false;
}



bool FFmpegDecoder::readNextPacketEndOfStream()
{
const FFmpegPacket packet(FFmpegPacket::PACKET_END_OF_STREAM);
Expand All @@ -352,8 +330,6 @@ bool FFmpegDecoder::readNextPacketEndOfStream()
return false;
}



bool FFmpegDecoder::readNextPacketRewinding()
{
const FFmpegPacket packet(FFmpegPacket::PACKET_FLUSH);
Expand All @@ -364,8 +340,6 @@ bool FFmpegDecoder::readNextPacketRewinding()
return false;
}



void FFmpegDecoder::rewindButDontFlushQueues()
{
const AVRational AvTimeBaseQ = { 1, AV_TIME_BASE }; // = AV_TIME_BASE_Q
Expand All @@ -374,7 +348,8 @@ void FFmpegDecoder::rewindButDontFlushQueues()
const int64_t seek_target = av_rescale_q(pos, AvTimeBaseQ, m_video_stream->time_base);

int error = 0;
if ((error = av_seek_frame(m_format_context.get(), m_video_index, seek_target, 0/*AVSEEK_FLAG_BYTE |*/ /*AVSEEK_FLAG_BACKWARD*/)) < 0) {
if ((error = av_seek_frame(m_format_context.get(), m_video_index, seek_target, 0)) < 0)
{
OSG_FATAL << "av_seek_frame returned " << AvStrError(error) << std::endl;
throw std::runtime_error("av_seek_frame failed()");
}
Expand All @@ -397,13 +372,14 @@ void FFmpegDecoder::seekButDontFlushQueues(double time)
{
const AVRational AvTimeBaseQ = { 1, AV_TIME_BASE }; // = AV_TIME_BASE_Q

const int64_t pos = int64_t(m_clocks.getStartTime()+time * double(AV_TIME_BASE));
const int64_t pos = int64_t(m_clocks.getStartTime() + time * double(AV_TIME_BASE));
const int64_t seek_target = av_rescale_q(pos, AvTimeBaseQ, m_video_stream->time_base);

m_clocks.setSeekTime(time);

int error = 0;
if ((error = av_seek_frame(m_format_context.get(), m_video_index, seek_target, 0/*AVSEEK_FLAG_BYTE |*/ /*AVSEEK_FLAG_BACKWARD*/)) < 0) {
if ((error = av_seek_frame(m_format_context.get(), m_video_index, seek_target, 0)) < 0)
{
OSG_FATAL << "av_seek_frame() returned " << AvStrError(error) << std::endl;
throw std::runtime_error("av_seek_frame failed()");
}
Expand Down
Loading