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

Clean up of whitespace, and removal of unneeded logic on CheckWorkingFrames() method. It is okay to finalize a frame from a stream that has not decoded a packet yet... although it would be unlikely.

Browse Source
This commit is contained in:
Jonathan Thomas
2022-07-21 16:50:23 -05:00
parent dd25b7835d
commit 671e8ce455
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/FFmpegReader.cpp
View File

@@ -34,27 +34,27 @@
#include "libavutil/hwcontext_vaapi.h"
typedef struct VAAPIDecodeContext {
VAProfile va_profile;
VAEntrypoint va_entrypoint;
VAConfigID va_config;
VAContextID va_context;
VAProfile va_profile;
VAEntrypoint va_entrypoint;
VAConfigID va_config;
VAContextID va_context;
#if FF_API_STRUCT_VAAPI_CONTEXT
// FF_DISABLE_DEPRECATION_WARNINGS
int have_old_context;
int have_old_context;
struct vaapi_context *old_context;
AVBufferRef *device_ref;
AVBufferRef *device_ref;
// FF_ENABLE_DEPRECATION_WARNINGS
#endif
AVHWDeviceContext *device;
AVHWDeviceContext *device;
AVVAAPIDeviceContext *hwctx;
AVHWFramesContext *frames;
AVHWFramesContext *frames;
AVVAAPIFramesContext *hwfc;
enum AVPixelFormat surface_format;
int surface_count;
enum AVPixelFormat surface_format;
int surface_count;
} VAAPIDecodeContext;
#endif // ENABLE_VAAPI
#endif // USE_HW_ACCEL
@@ -2032,8 +2032,8 @@ void FFmpegReader::CheckWorkingFrames(int64_t requested_frame) {
bool is_video_ready = false;
bool is_audio_ready = false;
double recent_pts_diff = recent_pts_seconds - frame_pts_seconds;
if ((video_pts_seconds != NO_PTS_OFFSET && frame_pts_seconds <= video_pts_seconds)
|| (video_pts_seconds != NO_PTS_OFFSET && recent_pts_diff > 1.5)
if ((frame_pts_seconds <= video_pts_seconds)
|| (recent_pts_diff > 1.5)
|| video_eof || end_of_file) {
// Video stream is past this frame (so it must be done)
// OR video stream is too far behind, missing, or end-of-file
@@ -2061,8 +2061,8 @@ void FFmpegReader::CheckWorkingFrames(int64_t requested_frame) {
}
double audio_pts_diff = audio_pts_seconds - frame_pts_seconds;
if ((audio_pts_seconds != NO_PTS_OFFSET && frame_pts_seconds < audio_pts_seconds && audio_pts_diff > 1.0)
|| (audio_pts_seconds != NO_PTS_OFFSET && recent_pts_diff > 1.5)
if ((frame_pts_seconds < audio_pts_seconds && audio_pts_diff > 1.0)
|| (recent_pts_diff > 1.5)
|| audio_eof || end_of_file) {
// Audio stream is past this frame (so it must be done)
// OR audio stream is too far behind, missing, or end-of-file