this, &MainWindow::playlist_selection_changed);
playlist_selection_changed(); // First time set-up.
- preview_player = new Player(ui->preview_display, /*also_output_to_stream=*/false);
- live_player = new Player(ui->live_display, /*also_output_to_stream=*/true);
+ preview_player.reset(new Player(ui->preview_display, /*also_output_to_stream=*/false));
+ live_player.reset(new Player(ui->live_display, /*also_output_to_stream=*/true));
live_player->set_done_callback([this]{
post_to_main_thread([this]{
live_player_clip_done();
this, &MainWindow::clip_list_selection_changed);
}
+MainWindow::~MainWindow()
+{
+ // Empty so that we can forward-declare Player in the .h file.
+}
+
void MainWindow::cue_in_clicked()
{
if (!cliplist_clips->empty() && cliplist_clips->back()->pts_out < 0) {
{
// playlist_clips can only be accessed on the main thread.
// Hopefully, we won't have to wait too long for this to come back.
+ //
+ // TODO: If MainWindow is in the process of being destroyed and waiting
+ // for Player to shut down, we could have a deadlock here.
promise<pair<Clip, size_t>> clip_promise;
future<pair<Clip, size_t>> clip = clip_promise.get_future();
post_to_main_thread([this, &clip_promise] {
#include "db.h"
#include "state.pb.h"
+#include <memory>
#include <mutex>
#include <QLabel>
#include <QMainWindow>
public:
MainWindow();
+ ~MainWindow();
// HTTP callback. TODO: Does perhaps not belong to MainWindow?
std::pair<std::string, std::string> get_queue_status() const;
private:
QLabel *disk_free_label;
- Player *preview_player, *live_player;
+ std::unique_ptr<Player> preview_player, live_player;
DB db;
// State when doing a scrub operation on a timestamp with the mouse.
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;
}
int64_t in_pts_start_next_clip = -1;
steady_clock::time_point next_frame_start;
- for (int frameno = 0; ; ++frameno) { // Ends when the clip ends.
+ for (int frameno = 0; !should_quit; ++frameno) { // Ends when the clip ends.
double out_pts = out_pts_origin + TIMEBASE * frameno / output_framerate;
next_frame_start =
origin + microseconds(lrint((out_pts - out_pts_origin) * 1e6 / TIMEBASE));
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 (should_quit) {
+ return;
+ }
+
// The clip ended.
// Last-ditch effort to get the next clip (if e.g. the fade time was zero seconds).
Player::Player(JPEGFrameView *destination, bool also_output_to_stream)
: destination(destination)
{
- thread(&Player::thread_func, this, also_output_to_stream).detach();
+ player_thread = thread(&Player::thread_func, this, also_output_to_stream);
+}
+
+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)
#include <condition_variable>
#include <functional>
#include <mutex>
+#include <thread>
class JPEGFrameView;
class VideoStream;
class Player : public QueueInterface {
public:
Player(JPEGFrameView *destination, bool also_output_to_stream);
+ ~Player();
void play_clip(const Clip &clip, size_t clip_idx, unsigned stream_idx);
void override_angle(unsigned stream_idx); // For the current clip only.
// Returns false if pts is after the last frame.
bool find_surrounding_frames(int64_t pts, int stream_idx, FrameOnDisk *frame_lower, FrameOnDisk *frame_upper);
+ std::thread player_thread;
+ std::atomic<bool> should_quit{false};
+
JPEGFrameView *destination;
done_callback_func done_callback;
next_clip_callback_func next_clip_callback;
void VideoStream::stop()
{
+ should_quit = true;
+ clear_queue();
encode_thread.join();
}
exit(1);
}
- for ( ;; ) {
+ while (!should_quit) {
QueuedFrame qf;
{
unique_lock<mutex> lock(queue_lock);
#include "shared/ref_counted_gl_sync.h"
#include "queue_spot_holder.h"
+#include <atomic>
#include <chrono>
#include <condition_variable>
#include <deque>
void encode_thread_func();
std::thread encode_thread;
+ std::atomic<bool> should_quit{false};
static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
projects / nageru / commitdiff