#include "shared/context.h"
#include "defs.h"
#include "shared/ffmpeg_raii.h"
+#include "flags.h"
#include "frame_on_disk.h"
-#include "httpd.h"
+#include "shared/httpd.h"
#include "jpeg_frame_view.h"
#include "shared/mux.h"
#include "shared/timebase.h"
extern HTTPD *global_httpd;
-void Player::thread_func(bool also_output_to_stream)
+void Player::thread_func(Player::StreamOutput stream_output, AVFormatContext *file_avctx)
{
pthread_setname_np(pthread_self(), "Player");
check_error();
// Create the VideoStream object, now that we have an OpenGL context.
- if (also_output_to_stream) {
- video_stream.reset(new VideoStream);
+ if (stream_output != NO_STREAM_OUTPUT) {
+ video_stream.reset(new VideoStream(file_avctx));
video_stream->start();
}
bool got_next_clip = false;
double next_clip_fade_time = -1.0;
- for ( ;; ) {
+ while (!should_quit) {
wait_for_clip:
bool clip_ready;
steady_clock::time_point before_sleep = steady_clock::now();
{
unique_lock<mutex> lock(queue_state_mu);
clip_ready = new_clip_changed.wait_for(lock, milliseconds(100), [this] {
- return new_clip_ready && current_clip.pts_in != -1;
+ return should_quit || (new_clip_ready && current_clip.pts_in != -1);
});
+ if (should_quit) {
+ return;
+ }
new_clip_ready = false;
playing = true;
}
lock_guard<mutex> lock(frame_mu);
// Find the first frame such that frame.pts <= in_pts.
- auto it = lower_bound(frames[stream_idx].begin(),
- frames[stream_idx].end(),
- in_pts_origin,
- [](const FrameOnDisk &frame, int64_t pts) { return frame.pts < pts; });
+ auto it = find_last_frame_before(frames[stream_idx], in_pts_origin);
if (it != frames[stream_idx].end()) {
in_pts_origin = it->pts;
}
double speed = 0.5;
int64_t in_pts_start_next_clip = -1;
- for (int frameno = 0; ; ++frameno) { // Ends when the clip ends.
+ steady_clock::time_point next_frame_start;
+ for (int frameno = 0; !should_quit; ++frameno) { // Ends when the clip ends.
double out_pts = out_pts_origin + TIMEBASE * frameno / output_framerate;
- steady_clock::time_point next_frame_start =
+ next_frame_start =
origin + microseconds(lrint((out_pts - out_pts_origin) * 1e6 / TIMEBASE));
int64_t in_pts = lrint(in_pts_origin + TIMEBASE * frameno * speed / output_framerate);
pts = lrint(out_pts);
}
steady_clock::duration time_behind = steady_clock::now() - next_frame_start;
- if (time_behind >= milliseconds(200)) {
+ if (stream_output != FILE_STREAM_OUTPUT && time_behind >= milliseconds(200)) {
fprintf(stderr, "WARNING: %ld ms behind, dropping a frame (no matter the type).\n",
lrint(1e3 * duration<double>(time_behind).count()));
continue;
if (video_stream == nullptr) {
// No queue, just wait until the right time and then show the frame.
new_clip_changed.wait_until(lock, next_frame_start, [this]{
- return new_clip_ready || override_stream_idx != -1;
+ return should_quit || new_clip_ready || override_stream_idx != -1;
});
+ if (should_quit) {
+ return;
+ }
} else {
// If the queue is full (which is really the state we'd like to be in),
// wait until there's room for one more frame (ie., one was output from
if (num_queued_frames < max_queued_frames) {
return true;
}
- return new_clip_ready || override_stream_idx != -1;
+ return should_quit || new_clip_ready || override_stream_idx != -1;
});
}
+ if (should_quit) {
+ return;
+ }
if (new_clip_ready) {
if (video_stream != nullptr) {
lock.unlock(); // Urg.
}
}
- if (frame_lower.pts == frame_upper.pts) {
+ if (frame_lower.pts == frame_upper.pts || global_flags.interpolation_quality == 0) {
auto display_func = [this, primary_stream_idx, frame_lower, secondary_frame, fade_alpha]{
- destination->setFrame(primary_stream_idx, frame_lower, secondary_frame, fade_alpha);
+ if (destination != nullptr) {
+ destination->setFrame(primary_stream_idx, frame_lower, secondary_frame, fade_alpha);
+ }
};
if (video_stream == nullptr) {
display_func();
// (ie., move less than 1% of an _output_ frame), do so.
// TODO: Snap secondary (fade-to) clips in the same fashion.
bool snapped = false;
- for (int64_t snap_pts : { frame_lower.pts, frame_upper.pts }) {
- double snap_pts_as_frameno = (snap_pts - in_pts_origin) * output_framerate / TIMEBASE / speed;
+ for (FrameOnDisk snap_frame : { frame_lower, frame_upper }) {
+ double snap_pts_as_frameno = (snap_frame.pts - in_pts_origin) * output_framerate / TIMEBASE / speed;
if (fabs(snap_pts_as_frameno - frameno) < 0.01) {
- FrameOnDisk snap_frame = frame_lower;
- snap_frame.pts = snap_pts;
auto display_func = [this, primary_stream_idx, snap_frame, secondary_frame, fade_alpha]{
- destination->setFrame(primary_stream_idx, snap_frame, secondary_frame, fade_alpha);
+ if (destination != nullptr) {
+ destination->setFrame(primary_stream_idx, snap_frame, secondary_frame, fade_alpha);
+ }
};
if (video_stream == nullptr) {
display_func();
snap_frame, secondary_frame, fade_alpha);
}
}
- in_pts_origin += snap_pts - in_pts;
+ in_pts_origin += snap_frame.pts - in_pts;
snapped = true;
break;
}
continue;
}
- if (time_behind >= milliseconds(100)) {
+ if (stream_output != FILE_STREAM_OUTPUT && time_behind >= milliseconds(100)) {
fprintf(stderr, "WARNING: %ld ms behind, dropping an interpolated frame.\n",
lrint(1e3 * duration<double>(time_behind).count()));
continue;
if (video_stream == nullptr) {
// Previews don't do any interpolation.
assert(secondary_stream_idx == -1);
- destination->setFrame(primary_stream_idx, frame_lower);
+ if (destination != nullptr) {
+ destination->setFrame(primary_stream_idx, frame_lower);
+ }
} else {
auto display_func = [this](shared_ptr<Frame> frame) {
- destination->setFrame(frame);
+ if (destination != nullptr) {
+ destination->setFrame(frame);
+ }
};
video_stream->schedule_interpolated_frame(
next_frame_start, pts, display_func, QueueSpotHolder(this),
}
}
+ if (should_quit) {
+ return;
+ }
+
// The clip ended.
// Last-ditch effort to get the next clip (if e.g. the fade time was zero seconds).
got_next_clip = false;
// Start the next clip from the point where the fade went out.
- origin = steady_clock::now();
+ origin = next_frame_start;
in_pts_origin = in_pts_start_next_clip;
goto got_clip;
}
lock_guard<mutex> lock(frame_mu);
// Find the first frame such that frame.pts >= pts.
- auto it = lower_bound(frames[stream_idx].begin(),
- frames[stream_idx].end(),
- pts,
- [](const FrameOnDisk &frame, int64_t pts) { return frame.pts < pts; });
+ auto it = find_last_frame_before(frames[stream_idx], pts);
if (it == frames[stream_idx].end()) {
return false;
}
return true;
}
-Player::Player(JPEGFrameView *destination, bool also_output_to_stream)
+Player::Player(JPEGFrameView *destination, Player::StreamOutput stream_output, AVFormatContext *file_avctx)
: destination(destination)
{
- thread(&Player::thread_func, this, also_output_to_stream).detach();
+ player_thread = thread(&Player::thread_func, this, stream_output, file_avctx);
+}
+
+Player::~Player()
+{
+ should_quit = true;
+ if (video_stream != nullptr) {
+ video_stream->stop();
+ }
+ new_clip_changed.notify_all();
+ player_thread.join();
}
void Player::play_clip(const Clip &clip, size_t clip_idx, unsigned stream_idx)
}
lock_guard<mutex> lock(frame_mu);
- auto it = upper_bound(frames[stream_idx].begin(), frames[stream_idx].end(), pts_out,
- [](int64_t pts, const FrameOnDisk &frame) { return pts < frame.pts; });
+ auto it = find_first_frame_at_or_after(frames[stream_idx], pts_out);
if (it == frames[stream_idx].end()) {
return;
}
projects / nageru / blobdiff