X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=video_widget.cpp;h=9c37cd79bb770dbd631d8eb51fe5984ebe142a84;hb=86c1674e30b19750b55581743c3bdc9a2853dd13;hp=126e874aa53b1591e6b53d984a26cfd63a25ad1e;hpb=1499d6f5c9c563843c5bba582d44a72c7cae27b2;p=pkanalytics
diff --git a/video_widget.cpp b/video_widget.cpp
index 126e874..9c37cd7 100644
--- a/video_widget.cpp
+++ b/video_widget.cpp
@@ -194,7 +194,11 @@ bool VideoWidget::process_queued_commands(AVFormatContext *format_ctx, AVCodecCo
queue.pop_front();
queued_frames = std::move(queue);
}
- current_frame.reset(new Frame(make_video_frame(frame.get())));
+ shared_ptr new_frame = make_video_frame(frame.get());
+ {
+ lock_guard lock(current_frame_mu);
+ current_frame = std::move(new_frame);
+ }
update();
store_pts(frame->pts);
break;
@@ -225,7 +229,11 @@ bool VideoWidget::process_queued_commands(AVFormatContext *format_ctx, AVCodecCo
if (frame == nullptr || error) {
return true;
}
- current_frame.reset(new Frame(make_video_frame(frame.get())));
+ shared_ptr new_frame = make_video_frame(frame.get());
+ {
+ lock_guard lock(current_frame_mu);
+ current_frame = std::move(new_frame);
+ }
update();
store_pts(frame->pts);
}
@@ -375,7 +383,11 @@ int num_levels(GLuint width, GLuint height)
void VideoWidget::paintGL()
{
- std::shared_ptr frame = current_frame;
+ std::shared_ptr frame;
+ {
+ lock_guard lock(current_frame_mu);
+ frame = current_frame;
+ }
if (frame == nullptr) {
glClear(GL_COLOR_BUFFER_BIT);
return;
@@ -582,30 +594,40 @@ void VideoWidget::fixup_zoom_matrix()
zoom_matrix[7] = std::max(zoom_matrix[7], 1.0 - zoom_matrix[4]); // Top side (y=1).
}
-void VideoWidget::open(const string &filename)
+bool VideoWidget::open(const string &filename)
{
stop();
internal_rewind();
pathname = filename;
play();
+
+ while (running == STARTING) {
+ // Poor man's condition variable...
+ usleep(10000);
+ sched_yield();
+ }
+ return (running != VIDEO_FILE_ERROR);
}
void VideoWidget::play()
{
- if (running) {
+ if (running != NOT_RUNNING && running != VIDEO_FILE_ERROR) {
std::lock_guard lock(queue_mu);
command_queue.push_back(QueuedCommand { QueuedCommand::RESUME });
producer_thread_should_quit.wakeup();
return;
}
- running = true;
+ running = STARTING;
producer_thread_should_quit.unquit();
+ if (producer_thread.joinable()) {
+ producer_thread.join();
+ }
producer_thread = std::thread(&VideoWidget::producer_thread_func, this);
}
void VideoWidget::pause()
{
- if (!running) {
+ if (running == NOT_RUNNING || running == VIDEO_FILE_ERROR) {
return;
}
std::lock_guard lock(queue_mu);
@@ -615,7 +637,7 @@ void VideoWidget::pause()
void VideoWidget::seek(int64_t relative_seek_ms)
{
- if (!running) {
+ if (running == NOT_RUNNING || running == VIDEO_FILE_ERROR) {
return;
}
std::lock_guard lock(queue_mu);
@@ -625,7 +647,7 @@ void VideoWidget::seek(int64_t relative_seek_ms)
void VideoWidget::seek_frames(int64_t relative_seek_frames)
{
- if (!running) {
+ if (running == NOT_RUNNING || running == VIDEO_FILE_ERROR) {
return;
}
std::lock_guard lock(queue_mu);
@@ -635,7 +657,7 @@ void VideoWidget::seek_frames(int64_t relative_seek_frames)
void VideoWidget::seek_absolute(int64_t position_ms)
{
- if (!running) {
+ if (running == NOT_RUNNING || running == VIDEO_FILE_ERROR) {
return;
}
std::lock_guard lock(queue_mu);
@@ -645,10 +667,9 @@ void VideoWidget::seek_absolute(int64_t position_ms)
void VideoWidget::stop()
{
- if (!running) {
+ if (running == NOT_RUNNING || running == VIDEO_FILE_ERROR) {
return;
}
- running = false;
producer_thread_should_quit.quit();
producer_thread.join();
}
@@ -657,7 +678,9 @@ void VideoWidget::producer_thread_func()
{
if (!producer_thread_should_quit.should_quit()) {
if (!play_video(pathname)) {
- // TODO: Send the error back to the UI somehow.
+ running = VIDEO_FILE_ERROR;
+ } else {
+ running = NOT_RUNNING;
}
}
}
@@ -863,6 +886,8 @@ bool VideoWidget::play_video(const string &pathname)
internal_rewind();
+ running = RUNNING;
+
// Main loop.
int consecutive_errors = 0;
double rate = 1.0;
@@ -913,7 +938,11 @@ bool VideoWidget::play_video(const string &pathname)
bool finished_wakeup;
finished_wakeup = producer_thread_should_quit.sleep_until(next_frame_start);
if (finished_wakeup) {
- current_frame.reset(new Frame(make_video_frame(frame.get())));
+ shared_ptr new_frame = make_video_frame(frame.get());
+ {
+ lock_guard lock(current_frame_mu);
+ current_frame = std::move(new_frame);
+ }
last_frame = steady_clock::now();
update();
break;
@@ -927,7 +956,11 @@ bool VideoWidget::play_video(const string &pathname)
if (paused) {
// Just paused, so present the frame immediately and then go into deep sleep.
- current_frame.reset(new Frame(make_video_frame(frame.get())));
+ shared_ptr new_frame = make_video_frame(frame.get());
+ {
+ lock_guard lock(current_frame_mu);
+ current_frame = std::move(new_frame);
+ }
last_frame = steady_clock::now();
update();
break;
@@ -965,9 +998,46 @@ float compute_chroma_offset(float pos, unsigned subsampling_factor, unsigned res
}
}
-VideoWidget::Frame VideoWidget::make_video_frame(const AVFrame *frame)
+shared_ptr VideoWidget::alloc_frame(unsigned width, unsigned height, unsigned chroma_width, unsigned chroma_height)
+{
+ lock_guard lock(freelist_mu);
+ for (auto it = frame_freelist.begin(); it != frame_freelist.end(); ++it) {
+ if ((*it)->width == width &&
+ (*it)->height == height &&
+ (*it)->chroma_width == chroma_width &&
+ (*it)->chroma_height == chroma_height) {
+ Frame *frame = *it;
+ frame_freelist.erase(it);
+ return shared_ptr{frame, free_frame};
+ }
+ }
+
+ Frame *frame = new Frame;
+ frame->owner = this;
+ frame->width = width;
+ frame->height = height;
+ frame->chroma_width = chroma_width;
+ frame->chroma_height = chroma_height;
+
+ size_t len = frame->width * frame->height + 2 * frame->chroma_width * frame->chroma_height;
+ frame->data.reset(new uint8_t[len]);
+
+ return shared_ptr{frame, free_frame};
+}
+
+void VideoWidget::free_frame(VideoWidget::Frame *frame)
+{
+ VideoWidget *self = frame->owner;
+ lock_guard lock(self->freelist_mu);
+ if (self->frame_freelist.size() >= 16) {
+ delete self->frame_freelist.front();
+ self->frame_freelist.pop_front();
+ }
+ self->frame_freelist.push_back(frame);
+}
+
+shared_ptr VideoWidget::make_video_frame(const AVFrame *frame)
{
- Frame video_frame;
AVFrameWithDeleter sw_frame;
if (frame->format == AV_PIX_FMT_VAAPI ||
@@ -1008,26 +1078,24 @@ VideoWidget::Frame VideoWidget::make_video_frame(const AVFrame *frame)
int linesizes[4] = { 0, 0, 0, 0 };
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(sws_dst_format);
- video_frame.width = frame->width;
- video_frame.height = frame->height;
- video_frame.chroma_width = AV_CEIL_RSHIFT(int(frame->width), desc->log2_chroma_w);
- video_frame.chroma_height = AV_CEIL_RSHIFT(int(frame->height), desc->log2_chroma_h);
+ shared_ptr video_frame = alloc_frame(
+ frame->width,
+ frame->height,
+ AV_CEIL_RSHIFT(int(frame->width), desc->log2_chroma_w),
+ AV_CEIL_RSHIFT(int(frame->height), desc->log2_chroma_h));
// We always assume left chroma placement for now.
- cbcr_offset[0] = compute_chroma_offset(0.0f, 1 << desc->log2_chroma_w, video_frame.chroma_width);
- cbcr_offset[1] = compute_chroma_offset(0.5f, 1 << desc->log2_chroma_h, video_frame.chroma_height);
-
- size_t len = frame->width * frame->height + 2 * video_frame.chroma_width * video_frame.chroma_height;
- video_frame.data.reset(new uint8_t[len]);
+ cbcr_offset[0] = compute_chroma_offset(0.0f, 1 << desc->log2_chroma_w, video_frame->chroma_width);
+ cbcr_offset[1] = compute_chroma_offset(0.5f, 1 << desc->log2_chroma_h, video_frame->chroma_height);
- pic_data[0] = video_frame.data.get();
+ pic_data[0] = video_frame->data.get();
linesizes[0] = frame->width;
pic_data[1] = pic_data[0] + frame->width * frame->height;
- linesizes[1] = video_frame.chroma_width;
+ linesizes[1] = video_frame->chroma_width;
- pic_data[2] = pic_data[1] + video_frame.chroma_width * video_frame.chroma_height;
- linesizes[2] = video_frame.chroma_width;
+ pic_data[2] = pic_data[1] + video_frame->chroma_width * video_frame->chroma_height;
+ linesizes[2] = video_frame->chroma_width;
sws_scale(sws_ctx.get(), frame->data, frame->linesize, 0, frame->height, pic_data, linesizes);