openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Support many image formats with our FFmpegReader, by safely protecting empty packets in GetPacketPTS, and generating a duration and setting the has_single_image property.

Browse Source
This commit is contained in:
Jonathan Thomas
2022-10-24 14:43:10 -05:00
parent 05b997ac85
commit f207e48fe4
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/FFmpegReader.cpp
View File

@@ -819,6 +819,14 @@ void FFmpegReader::UpdateVideoInfo() {
info.duration = float(info.file_size) / info.video_bit_rate;
}
// Certain "image" formats do not have a valid duration
if (info.duration <= 0.0f && pStream->duration == AV_NOPTS_VALUE && pFormatCtx->duration == AV_NOPTS_VALUE) {
// Force an "image" duration
info.duration = 60 * 60 * 1; // 1 hour duration
info.video_length = 1;
info.has_single_image = true;
}
// Get the # of video frames (if found in stream)
// Only set this 1 time (this method can be called multiple times)
if (pStream->nb_frames > 0 && info.video_length <= 0) {
@@ -1849,12 +1857,17 @@ void FFmpegReader::Seek(int64_t requested_frame) {
// Get the PTS for the current video packet
int64_t FFmpegReader::GetPacketPTS() {
int64_t current_pts = packet->pts;
if (current_pts == AV_NOPTS_VALUE && packet->dts != AV_NOPTS_VALUE)
current_pts = packet->dts;
if (packet) {
int64_t current_pts = packet->pts;
if (current_pts == AV_NOPTS_VALUE && packet->dts != AV_NOPTS_VALUE)
current_pts = packet->dts;
// Return adjusted PTS
return current_pts;
// Return adjusted PTS
return current_pts;
} else {
// No packet, return NO PTS
return AV_NOPTS_VALUE;
}
}
// Update PTS Offset (if any)