- double in_pts_lower_as_frameno = (in_pts_lower - in_pts_origin) * output_framerate / TIMEBASE / speed;
- double in_pts_upper_as_frameno = (in_pts_upper - in_pts_origin) * output_framerate / TIMEBASE / speed;
- if (fabs(in_pts_lower_as_frameno - frameno) < 0.01) {
- destination->setFrame(stream_idx, in_pts_lower, /*interpolated=*/false);
- if (video_stream != nullptr) {
- video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_lower);
- }
- in_pts_origin += in_pts_lower - in_pts;
- continue;
- } else if (fabs(in_pts_upper_as_frameno - frameno) < 0.01) {
- destination->setFrame(stream_idx, in_pts_upper, /*interpolated=*/false);
- if (video_stream != nullptr) {
- video_stream->schedule_original_frame(lrint(out_pts), stream_idx, in_pts_upper);
+ bool snapped = false;
+ for (int64_t snap_pts : { in_pts_lower, in_pts_upper }) {
+ double snap_pts_as_frameno = (snap_pts - in_pts_origin) * output_framerate / TIMEBASE / speed;
+ if (fabs(snap_pts_as_frameno - frameno) < 0.01) {
+ destination->setFrame(primary_stream_idx, snap_pts, /*interpolated=*/false, secondary_stream_idx, secondary_pts, fade_alpha);
+ if (video_stream != nullptr) {
+ if (secondary_stream_idx == -1) {
+ video_stream->schedule_original_frame(pts, primary_stream_idx, snap_pts);
+ } else {
+ video_stream->schedule_faded_frame(pts, primary_stream_idx, snap_pts, secondary_stream_idx, secondary_pts, fade_alpha);
+ }
+ }
+ in_pts_origin += snap_pts - in_pts;
+ snapped = true;
+ break;