#include <utility>
#include <QMouseEvent>
+#include <QScreen>
#include <movit/resource_pool.h>
#include <movit/init.h>
#include "defs.h"
#include "post_to_main_thread.h"
+#include "vaapi_jpeg_decoder.h"
#include "video_stream.h"
+#include "ycbcr_converter.h"
using namespace movit;
using namespace std;
size_t last_used;
};
+struct PendingDecode {
+ JPEGID primary, secondary;
+ float fade_alpha; // Irrelevant if secondary.stream_idx == -1.
+ JPEGFrameView *destination;
+};
+
+thread JPEGFrameView::jpeg_decoder_thread;
mutex cache_mu;
map<JPEGID, LRUFrame, JPEGIDLexicalOrder> cache; // Under cache_mu.
condition_variable any_pending_decodes, cache_updated;
-deque<pair<JPEGID, JPEGFrameView *>> pending_decodes; // Under cache_mu.
+deque<PendingDecode> pending_decodes; // Under cache_mu.
atomic<size_t> event_counter{0};
extern QGLWidget *global_share_widget;
+extern atomic<bool> should_quit;
-// TODO: Decode using VA-API if available.
shared_ptr<Frame> decode_jpeg(const string &filename)
{
- shared_ptr<Frame> frame(new Frame);
+ shared_ptr<Frame> frame;
+ if (vaapi_jpeg_decoding_usable) {
+ frame = decode_jpeg_vaapi(filename);
+ if (frame != nullptr) {
+ return frame;
+ }
+ fprintf(stderr, "VA-API hardware decoding failed; falling back to software.\n");
+ }
+
+ frame.reset(new Frame);
jpeg_decompress_struct dinfo;
jpeg_error_mgr jerr;
return frame;
}
-void jpeg_decoder_thread()
+void jpeg_decoder_thread_func()
{
size_t num_decoded = 0, num_dropped = 0;
pthread_setname_np(pthread_self(), "JPEGDecoder");
- for ( ;; ) {
- JPEGID id;
- JPEGFrameView *dest;
+ while (!should_quit.load()) {
+ PendingDecode decode;
CacheMissBehavior cache_miss_behavior = DECODE_IF_NOT_IN_CACHE;
{
unique_lock<mutex> lock(cache_mu); // TODO: Perhaps under another lock?
any_pending_decodes.wait(lock, [] {
- return !pending_decodes.empty();
+ return !pending_decodes.empty() || should_quit.load();
});
- id = pending_decodes.front().first;
- dest = pending_decodes.front().second;
+ if (should_quit.load()) break;
+ decode = pending_decodes.front();
pending_decodes.pop_front();
size_t num_pending = 0;
- for (const pair<JPEGID, JPEGFrameView *> &decode : pending_decodes) {
- if (decode.second == dest) {
+ for (const PendingDecode &other_decode : pending_decodes) {
+ if (other_decode.destination == decode.destination) {
++num_pending;
}
}
}
}
- bool found_in_cache;
- shared_ptr<Frame> frame;
- if (id.interpolated) {
- // Interpolated frames are never decoded by us,
- // put directly into the cache from VideoStream.
- unique_lock<mutex> lock(cache_mu);
- cache_updated.wait(lock, [id] {
- return cache.count(id) != 0;
- });
- found_in_cache = true; // Don't count it as a decode.
+ shared_ptr<Frame> primary_frame, secondary_frame;
+ bool drop = false;
+ for (int subframe_idx = 0; subframe_idx < 2; ++subframe_idx) {
+ const JPEGID &id = (subframe_idx == 0 ? decode.primary : decode.secondary);
+ if (id.stream_idx == (unsigned)-1) {
+ // No secondary frame.
+ continue;
+ }
- auto it = cache.find(id);
- assert(it != cache.end());
+ bool found_in_cache;
+ shared_ptr<Frame> frame;
+ if (id.interpolated) {
+ // Interpolated frames are never decoded by us,
+ // put directly into the cache from VideoStream.
+ unique_lock<mutex> lock(cache_mu);
+ cache_updated.wait(lock, [id] {
+ return cache.count(id) != 0 || should_quit.load();
+ });
+ if (should_quit.load()) break;
+ found_in_cache = true; // Don't count it as a decode.
+
+ auto it = cache.find(id);
+ assert(it != cache.end());
+
+ it->second.last_used = event_counter++;
+ frame = it->second.frame;
+ if (frame == nullptr) {
+ // We inserted a nullptr as signal that the frame was never
+ // interpolated and that we should stop waiting.
+ // But don't let it linger in the cache anymore.
+ cache.erase(it);
+ }
+ } else {
+ frame = decode_jpeg_with_cache(id, cache_miss_behavior, &found_in_cache);
+ }
- it->second.last_used = event_counter++;
- frame = it->second.frame;
if (frame == nullptr) {
- // We inserted a nullptr as signal that the frame was never
- // interpolated and that we should stop waiting.
- // But don't let it linger in the cache anymore.
- cache.erase(it);
+ assert(id.interpolated || cache_miss_behavior == RETURN_NULLPTR_IF_NOT_IN_CACHE);
+ drop = true;
+ break;
}
- } else {
- frame = decode_jpeg_with_cache(id, cache_miss_behavior, &found_in_cache);
- }
- if (frame == nullptr) {
- assert(id.interpolated || cache_miss_behavior == RETURN_NULLPTR_IF_NOT_IN_CACHE);
+ if (!found_in_cache) {
+ ++num_decoded;
+ if (num_decoded % 1000 == 0) {
+ fprintf(stderr, "Decoded %zu images, dropped %zu (%.2f%% dropped)\n",
+ num_decoded, num_dropped, (100.0 * num_dropped) / (num_decoded + num_dropped));
+ }
+ }
+ if (subframe_idx == 0) {
+ primary_frame = move(frame);
+ } else {
+ secondary_frame = move(frame);
+ }
+ }
+ if (drop) {
++num_dropped;
continue;
}
- if (!found_in_cache) {
- ++num_decoded;
- if (num_decoded % 1000 == 0) {
- fprintf(stderr, "Decoded %zu images, dropped %zu (%.2f%% dropped)\n",
- num_decoded, num_dropped, (100.0 * num_dropped) / (num_decoded + num_dropped));
- }
- }
-
// TODO: Could we get jitter between non-interpolated and interpolated frames here?
- dest->setDecodedFrame(frame);
+ decode.destination->setDecodedFrame(primary_frame, secondary_frame, decode.fade_alpha);
}
}
+void JPEGFrameView::shutdown()
+{
+ any_pending_decodes.notify_all();
+ jpeg_decoder_thread.join();
+}
+
JPEGFrameView::JPEGFrameView(QWidget *parent)
: QGLWidget(parent, global_share_widget) {
}
-void JPEGFrameView::setFrame(unsigned stream_idx, int64_t pts, bool interpolated)
+void JPEGFrameView::setFrame(unsigned stream_idx, int64_t pts, bool interpolated, int secondary_stream_idx, int64_t secondary_pts, float fade_alpha)
{
- current_stream_idx = stream_idx;
+ current_stream_idx = stream_idx; // TODO: Does this interact with fades?
unique_lock<mutex> lock(cache_mu);
- pending_decodes.emplace_back(JPEGID{ stream_idx, pts, interpolated }, this);
+ PendingDecode decode;
+ decode.primary = JPEGID{ stream_idx, pts, interpolated };
+ decode.secondary = JPEGID{ (unsigned)secondary_stream_idx, secondary_pts, /*interpolated=*/false };
+ decode.fade_alpha = fade_alpha;
+ decode.destination = this;
+ pending_decodes.push_back(decode);
any_pending_decodes.notify_all();
}
static once_flag once;
call_once(once, [] {
resource_pool = new ResourcePool;
- std::thread(&jpeg_decoder_thread).detach();
+ jpeg_decoder_thread = std::thread(jpeg_decoder_thread_func);
});
- chain.reset(new EffectChain(1280, 720, resource_pool));
- ImageFormat image_format;
- image_format.color_space = COLORSPACE_sRGB;
- image_format.gamma_curve = GAMMA_sRGB;
- ycbcr_format.luma_coefficients = YCBCR_REC_709;
- ycbcr_format.full_range = false;
- ycbcr_format.num_levels = 256;
- ycbcr_format.chroma_subsampling_x = 2;
- ycbcr_format.chroma_subsampling_y = 1;
- ycbcr_format.cb_x_position = 0.0f; // H.264 -- _not_ JPEG, even though our input is MJPEG-encoded
- ycbcr_format.cb_y_position = 0.5f; // Irrelevant.
- ycbcr_format.cr_x_position = 0.0f;
- ycbcr_format.cr_y_position = 0.5f;
- ycbcr_input = (movit::YCbCrInput *)chain->add_input(new YCbCrInput(image_format, ycbcr_format, 1280, 720));
+ ycbcr_converter.reset(new YCbCrConverter(YCbCrConverter::OUTPUT_TO_RGBA, resource_pool));
ImageFormat inout_format;
- inout_format.color_space = COLORSPACE_sRGB;
- inout_format.gamma_curve = GAMMA_sRGB;
-
- check_error();
- chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
- check_error();
- chain->set_dither_bits(8);
- check_error();
- chain->finalize();
- check_error();
+ inout_format.color_space = COLORSPACE_sRGB;
+ inout_format.gamma_curve = GAMMA_sRGB;
- overlay_chain.reset(new EffectChain(overlay_width, overlay_height, resource_pool));
- overlay_input = (movit::FlatInput *)overlay_chain->add_input(new FlatInput(image_format, FORMAT_GRAYSCALE, GL_UNSIGNED_BYTE, overlay_width, overlay_height));
+ overlay_chain.reset(new EffectChain(overlay_base_width, overlay_base_height, resource_pool));
+ overlay_input = (movit::FlatInput *)overlay_chain->add_input(new FlatInput(inout_format, FORMAT_GRAYSCALE, GL_UNSIGNED_BYTE, overlay_base_width, overlay_base_height));
overlay_chain->add_output(inout_format, OUTPUT_ALPHA_FORMAT_POSTMULTIPLIED);
overlay_chain->finalize();
check_error();
glViewport(0, 0, width, height);
check_error();
+
+ // Save these, as width() and height() will lie with DPI scaling.
+ gl_width = width;
+ gl_height = height;
}
void JPEGFrameView::paintGL()
{
- glViewport(0, 0, width(), height());
+ glViewport(0, 0, gl_width, gl_height);
if (current_frame == nullptr) {
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT);
}
check_error();
- chain->render_to_screen();
+ current_chain->render_to_screen();
if (overlay_image != nullptr) {
if (overlay_input_needs_refresh) {
+ overlay_input->set_width(overlay_width);
+ overlay_input->set_height(overlay_height);
overlay_input->set_pixel_data(overlay_image->bits());
}
- glViewport(width() - overlay_width, 0, overlay_width, overlay_height);
+ glViewport(gl_width - overlay_width, 0, overlay_width, overlay_height);
overlay_chain->render_to_screen();
}
}
-void JPEGFrameView::setDecodedFrame(std::shared_ptr<Frame> frame)
+namespace {
+
+
+} // namespace
+
+void JPEGFrameView::setDecodedFrame(shared_ptr<Frame> frame, shared_ptr<Frame> secondary_frame, float fade_alpha)
{
- post_to_main_thread([this, frame] {
+ post_to_main_thread([this, frame, secondary_frame, fade_alpha] {
current_frame = frame;
- ycbcr_format.chroma_subsampling_x = frame->chroma_subsampling_x;
- ycbcr_format.chroma_subsampling_y = frame->chroma_subsampling_y;
- ycbcr_input->change_ycbcr_format(ycbcr_format);
- ycbcr_input->set_width(frame->width);
- ycbcr_input->set_height(frame->height);
- ycbcr_input->set_pixel_data(0, frame->y.get());
- ycbcr_input->set_pixel_data(1, frame->cb.get());
- ycbcr_input->set_pixel_data(2, frame->cr.get());
- ycbcr_input->set_pitch(0, frame->pitch_y);
- ycbcr_input->set_pitch(1, frame->pitch_chroma);
- ycbcr_input->set_pitch(2, frame->pitch_chroma);
+ current_secondary_frame = secondary_frame;
+
+ if (secondary_frame != nullptr) {
+ current_chain = ycbcr_converter->prepare_chain_for_fade(frame, secondary_frame, fade_alpha);
+ } else {
+ current_chain = ycbcr_converter->prepare_chain_for_conversion(frame);
+ }
update();
});
}
return;
}
+ float dpr = QGuiApplication::primaryScreen()->devicePixelRatio();
+ overlay_width = lrint(overlay_base_width * dpr);
+ overlay_height = lrint(overlay_base_height * dpr);
+
overlay_image.reset(new QImage(overlay_width, overlay_height, QImage::Format_Grayscale8));
+ overlay_image->setDevicePixelRatio(dpr);
overlay_image->fill(0);
QPainter painter(overlay_image.get());
font.setPointSize(12);
painter.setFont(font);
- painter.drawText(QRectF(0, 0, overlay_width, overlay_height), Qt::AlignCenter, QString::fromStdString(text));
+ painter.drawText(QRectF(0, 0, overlay_base_width, overlay_base_height), Qt::AlignCenter, QString::fromStdString(text));
// Don't refresh immediately; we might not have an OpenGL context here.
overlay_input_needs_refresh = true;
projects / nageru / blobdiff