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

Fix VIDL FFmpeg Build Issues #1708

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix VIDL FFmpeg Build Issues #1708

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d405d0a
Fix build
mattdawkins May 17, 2022
7e74756
Fix build
mattdawkins May 21, 2022
045d711
Update for latest metadata changes
mattdawkins Nov 30, 2022
04af807
Use send_frame()
daniel-riehm Dec 6, 2022
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
31 changes: 18 additions & 13 deletions arrows/vxl/vidl_ffmpeg_video_input.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <kwiversys/SystemTools.hxx>

#include <algorithm>
#include <chrono>
#include <memory>
#include <mutex>
Expand Down Expand Up @@ -157,13 +158,15 @@ class vidl_ffmpeg_video_input::priv

m_prev_misp_timestamp = m_curr_misp_timestamp;

auto it = md_buffer.cbegin();
while( it != md_buffer.cend() )
std::vector< klv::klv_packet > packets;
auto it = &*md_buffer.cbegin();
while( it != &*md_buffer.cend() )
{
klv::klv_packet packet;
try
{
packet = klv::klv_read_packet( it, std::distance( it, md_buffer.cend() ) );
auto packet =
klv::klv_read_packet( it, std::distance( it, &*md_buffer.cend() ) );
packets.emplace_back( std::move( packet ) );
}
catch( kwiver::vital::metadata_buffer_overflow const& e )
{
Expand All @@ -175,14 +178,15 @@ class vidl_ffmpeg_video_input::priv
LOG_ERROR( d_logger, "error while parsing KLV packet: " << e.what() );
}

auto const& packet = packets.back();
if( klv::klv_lookup_packet_traits().by_uds_key( packet.key ).tag() !=
klv::KLV_PACKET_MISB_1108_LOCAL_SET )
{
auto const timestamp = klv::klv_packet_timestamp( packet );
m_curr_misp_timestamp = std::max( m_curr_misp_timestamp, timestamp );
m_curr_misp_timestamp = std::max( m_curr_misp_timestamp, timestamp.value() );
}

m_klv_demuxer.demux_packet( packet );
m_klv_demuxer.send_frame( packets, m_curr_misp_timestamp );
}

// Erase the bytes we just used
Expand All @@ -193,13 +197,13 @@ class vidl_ffmpeg_video_input::priv
std::next( md_buffer.begin(),
std::distance( md_buffer.cbegin(), it ) ) );
#else
md_buffer.erase( md_buffer.cbegin(), it );
md_buffer.erase( md_buffer.begin(),
md_buffer.begin() + std::distance( &*md_buffer.cbegin(), it ) );
#endif

// Get the vital metadata structure for the current frame
auto result =
klv::klv_to_vital_metadata( m_klv_timeline, { m_prev_misp_timestamp,
m_curr_misp_timestamp } );
klv::klv_to_vital_metadata( m_klv_timeline, m_curr_misp_timestamp );

// Add the frame timestamp to the metadata
kwiver::vital::timestamp frame_timestamp;
Expand Down Expand Up @@ -301,11 +305,12 @@ class vidl_ffmpeg_video_input::priv
do
{
auto const packet_data = d_video_stream.current_packet_data();
auto it = kwiver::arrows::klv::find_misp_timestamp( packet_data.cbegin(),
packet_data.cend() );
if ( it != packet_data.cend() )
auto it = kwiver::arrows::klv::find_misp_timestamp( &*packet_data.cbegin(),
&*packet_data.cend(),
klv::MISP_TIMESTAMP_TAG_STRING );
if ( it != &*packet_data.cend() )
{
meta_ts = kwiver::arrows::klv::read_misp_timestamp( it ).timestamp;
meta_ts = kwiver::arrows::klv::read_misp_timestamp( it ).microseconds().count();
LOG_DEBUG( this->d_logger, "Found MISP frame time:" << meta_ts );

d_have_abs_frame_time = true;
Expand Down