}
-static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
+//static
+void Render::consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
{
// detect if the producer has finished playing. Is there a better way to do it?
self->emitFrameNumber();
else self->emitConsumerStopped();
}*/
-
-static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr)
+// static
+void Render::consumer_gl_frame_show(mlt_consumer consumer, Render * self, mlt_frame frame_ptr)
{
// detect if the producer has finished playing. Is there a better way to do it?
+ if (self->externalConsumer && !self->analyseAudio && !self->sendFrameForAnalysis) {
+ emit self->rendererPosition((int) mlt_consumer_position(consumer));
+ return;
+ }
Mlt::Frame frame(frame_ptr);
if (frame.get_double("_speed") == 0) self->emitConsumerStopped();
else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
self->pause();
self->emitConsumerStopped(true);
}
- self->showFrame(frame);
+ emit self->mltFrameReceived(new Mlt::Frame(frame_ptr));
}
Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWidget *parent) :
AbstractRender(rendererName, parent),
requestedSeekPosition(SEEK_INACTIVE),
+ showFrameSemaphore(1),
+ externalConsumer(false),
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
m_mltProfile(NULL),
m_showFrameEvent(NULL),
m_pauseEvent(NULL),
- m_externalConsumer(false),
m_isZoneMode(false),
m_isLoopMode(false),
m_isSplitView(false),
connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh()));
connect(this, SIGNAL(multiStreamFound(const QString &,QList<int>,QList<int>,stringMap)), this, SLOT(slotMultiStreamProducerFound(const QString &,QList<int>,QList<int>,stringMap)));
connect(this, SIGNAL(checkSeeking()), this, SLOT(slotCheckSeeking()));
+ connect(this, SIGNAL(mltFrameReceived(Mlt::Frame *)), this, SLOT(showFrame(Mlt::Frame *)), Qt::UniqueConnection);
}
Render::~Render()
mlt_log_set_callback(kdenlive_callback);
}
if (m_mltConsumer->is_valid()) {
- m_externalConsumer = true;
+ externalConsumer = true;
m_mltConsumer->set("terminate_on_pause", 0);
m_mltConsumer->set("deinterlace_method", "onefield");
m_mltConsumer->set("rescale", "nearest");
m_mltConsumer->set("buffer", "1");
m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
}
- if (m_mltConsumer && m_mltConsumer->is_valid()) return;
+ if (m_mltConsumer && m_mltConsumer->is_valid()) {
+ return;
+ }
KMessageBox::information(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()));
}
}
- m_externalConsumer = false;
+ externalConsumer = false;
QString videoDriver = KdenliveSettings::videodrivername();
if (!videoDriver.isEmpty()) {
if (videoDriver == "x11_noaccel") {
if (m_mltConsumer) {
m_mltConsumer->set("terminate_on_pause", 0);
m_mltConsumer->set("deinterlace_method", "onefield");
- m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
- m_externalConsumer = true;
+ externalConsumer = true;
}
}
}
m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio");
m_mltConsumer->set("scrub_audio", 1);
m_mltConsumer->set("preview_off", 1);
+ m_mltConsumer->set("audio_buffer", 512);
m_mltConsumer->set("preview_format", mlt_image_rgb24a);
}
m_mltConsumer->set("buffer", "1");
}
m_mltConsumer->set("window_id", m_winid);
}
- m_mltConsumer->set("resize", 1);
+ //m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData());
m_mltConsumer->set("rescale", "nearest");
mlt_log_set_callback(kdenlive_callback);
if (!audioDriver.isEmpty())
m_mltConsumer->set("audio_driver", audioDriver.toUtf8().constData());
- m_mltConsumer->set("audio_buffer", 1024);
m_mltConsumer->set("frequency", 48000);
m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
}
{
m_refreshTimer.stop();
if (m_mltConsumer) {
- if (m_externalConsumer == KdenliveSettings::external_display()) {
+ if (externalConsumer == KdenliveSettings::external_display()) {
if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
QString videoDriver = KdenliveSettings::videodrivername();
QString currentDriver = m_mltConsumer->get("video_driver");
requestedSeekPosition = time;
m_mltProducer->seek(time);
//m_mltConsumer->purge();
- if (m_paused && !m_externalConsumer) {
+ if (m_paused && !externalConsumer) {
refresh();
}
}
length = info.xml.attribute("length").toInt();
clipOut = length - 1;
}
- else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt();
- producer->set("length", length);
- duration = length;
+ else length = info.xml.attribute("out").toInt() - info.xml.attribute("in").toInt() + 1;
+ // Pass duration if it was forced
+ if (info.xml.hasAttribute("duration")) {
+ duration = info.xml.attribute("duration").toInt();
+ if (length < duration) {
+ length = duration;
+ if (clipOut > 0) clipOut = length - 1;
+ }
+ }
+ if (duration == 0) duration = length;
+ producer->set("length", length);
}
if (clipOut > 0) producer->set_in_and_out(info.xml.attribute("in").toInt(), clipOut);
m_mltConsumer->set("refresh", 1);
} else if (!play) {
m_paused = true;
- m_mltProducer->pause();
+ m_mltProducer->set_speed(0.0);
}
}
}
-void Render::showFrame(Mlt::Frame& frame)
+void Render::showFrame(Mlt::Frame* frame)
{
int currentPos = m_mltConsumer->position();
if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE;
emit rendererPosition(currentPos);
- if (frame.is_valid()) {
+ if (frame->is_valid()) {
mlt_image_format format = mlt_image_rgb24a;
int width = 0;
int height = 0;
- const uchar* image = frame.get_image(format, width, height);
+ const uchar* image = frame->get_image(format, width, height);
QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
memcpy(qimage.scanLine(0), image, width * height * 4);
+ if (analyseAudio) showAudio(*frame);
+ delete frame;
emit showImageSignal(qimage);
- if (analyseAudio) showAudio(frame);
- if (sendFrameForAnalysis && frame.get_frame()->convert_image) {
+ if (sendFrameForAnalysis) {
emit frameUpdated(qimage.rgbSwapped());
}
- }
+ } else delete frame;
+ showFrameSemaphore.release();
emit checkSeeking();
}
if (!frame.is_valid() || frame.get_int("test_audio") != 0) {
return;
}
+
mlt_audio_format audio_format = mlt_audio_s16;
//FIXME: should not be hardcoded..
int freq = 48000;
projects / kdenlive / blobdiff