Skip to content
Snippets Groups Projects
Commit c746b882 authored by Silas Della Contrada's avatar Silas Della Contrada
Browse files

Reworked RenderClock and OpenGLRenderer to PTS-based timing instead of framerate-based 

 - OpenALAudioOutput is using fixed timing
 - audio and video are out of sync again
parent b9b7c803
Branches 46-docs-ci-fails-to-build-without-test-suite
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
AVQt/output/OpenGLRenderer.cpp
+ 162
− 169
View file @ c746b882
......@@ -34,6 +34,7 @@ namespace AVQt {
}
int OpenGLRenderer::init(IFrameSource *source, AVRational framerate, int64_t duration) {
Q_UNUSED(framerate) // Don't use framerate, because it is not always specified in stream information
Q_UNUSED(source)
Q_D(AVQt::OpenGLRenderer);
int64_t h = duration / 3600000;
......@@ -46,8 +47,7 @@ namespace AVQt {
qDebug() << "Duration:" << d->m_duration.toString("hh:mm:ss");
d->m_clock = new RenderClock;
d->m_clock->setInterval(static_cast<int64_t>(av_q2d(av_inv_q(framerate)) * 1000));
connect(d->m_clock, &RenderClock::timeout, this, &OpenGLRenderer::triggerUpdate);
d->m_clock->setInterval(16);
return 0;
}
......@@ -317,139 +317,140 @@ namespace AVQt {
d->m_clock->pause(false);
}
}
if (d->m_renderQueue.size() >= 2) {
if (d->m_updateRequired.load() && !d->m_renderQueue.isEmpty()) {
d->m_updateRequired.store(false);
if (!d->m_renderQueue.isEmpty()) {
auto timestamp = d->m_clock->getTimestamp();
if (timestamp >= d->m_renderQueue.first().first->pts) {
d->m_updateRequired.store(true);
d->m_updateTimestamp.store(timestamp);
}
}
if (d->m_updateRequired.load() && !d->m_renderQueue.isEmpty()) {
d->m_updateRequired.store(false);
// qDebug("Adding duration %ld ms to position", d->m_currentFrameTimeout);
d->m_position = d->m_position.addMSecs(static_cast<int>(d->m_currentFrameTimeout));
QPair<AVFrame *, int64_t> frame;
if (d->m_renderQueue.first().first->pts <= d->m_updateTimestamp + d->m_clock->getInterval() * 1200) {
while (!d->m_renderQueue.isEmpty()) {
if (frame.first) {
// TODO: Take duration from PTS diff, not from framerate
if (frame.first->pts >= d->m_updateTimestamp) {
break;
} else {
qDebug("Discarding video frame at PTS: %ld < PTS: %lld", frame.first->pts,
d->m_updateTimestamp.load());
av_frame_unref(frame.first);
av_frame_free(&frame.first);
}
}
QMutexLocker lock2(&d->m_renderQueueMutex);
frame = d->m_renderQueue.dequeue();
QPair<AVFrame *, int64_t> frame = d->m_renderQueue.dequeue();
while (!d->m_renderQueue.isEmpty()) {
if (frame.first->pts <= d->m_updateTimestamp.load()) {
if (d->m_renderQueue.first().first->pts >= d->m_updateTimestamp.load()) {
break;
} else {
qDebug("Discarding video frame at PTS: %ld < PTS: %lld", frame.first->pts, d->m_updateTimestamp.load());
av_frame_unref(frame.first);
av_frame_free(&frame.first);
}
}
QMutexLocker lock2(&d->m_renderQueueMutex);
frame = d->m_renderQueue.dequeue();
}
bool firstFrame;
bool differentPixFmt = true;
{
QMutexLocker lock(&d->m_currentFrameMutex);
firstFrame = !d->m_currentFrame;
if (!firstFrame) {
if (d->m_currentFrame->format == frame.first->format) {
differentPixFmt = false;
}
}
bool firstFrame;
bool differentPixFmt = true;
{
QMutexLocker lock(&d->m_currentFrameMutex);
firstFrame = !d->m_currentFrame;
if (!firstFrame) {
if (d->m_currentFrame->format == frame.first->format) {
differentPixFmt = false;
}
}
if (d->m_currentFrame) {
if (d->m_currentFrame->format == AV_PIX_FMT_BGRA) {
av_freep(&d->m_currentFrame->data[0]);
av_frame_free(&d->m_currentFrame);
d->m_currentFrame = nullptr;
} else {
av_frame_unref(d->m_currentFrame);
av_frame_free(&d->m_currentFrame);
d->m_currentFrame = nullptr;
}
}
d->m_currentFrame = frame.first;
d->m_currentFrameTimeout = frame.second;
if (d->m_currentFrame) {
if (d->m_currentFrame->format == AV_PIX_FMT_BGRA) {
av_freep(&d->m_currentFrame->data[0]);
av_frame_free(&d->m_currentFrame);
d->m_currentFrame = nullptr;
} else {
av_frame_unref(d->m_currentFrame);
av_frame_free(&d->m_currentFrame);
d->m_currentFrame = nullptr;
}
}
if (firstFrame) {
d->m_yTexture = new QOpenGLTexture(QOpenGLTexture::Target2D);
d->m_uTexture = new QOpenGLTexture(QOpenGLTexture::Target2D);
d->m_vTexture = new QOpenGLTexture(QOpenGLTexture::Target2D);
d->m_yTexture->setSize(d->m_currentFrame->width, d->m_currentFrame->height);
d->m_uTexture->setSize(d->m_currentFrame->width / 2, d->m_currentFrame->height / 2);
d->m_vTexture->setSize(d->m_currentFrame->width / 2, d->m_currentFrame->height / 2);
d->m_yTexture->setFormat(QOpenGLTexture::RGBA16_UNorm);
d->m_uTexture->setFormat(QOpenGLTexture::RGBA16_UNorm);
d->m_vTexture->setFormat(QOpenGLTexture::RGBA16_UNorm);
d->m_yTexture->allocateStorage(QOpenGLTexture::Red, QOpenGLTexture::UInt16);
d->m_uTexture->allocateStorage(QOpenGLTexture::RG, QOpenGLTexture::UInt16);
d->m_vTexture->allocateStorage(QOpenGLTexture::Red, QOpenGLTexture::UInt16);
d->m_currentFrame = frame.first;
d->m_currentFrameTimeout = frame.second;
}
if (firstFrame) {
d->m_yTexture = new QOpenGLTexture(QOpenGLTexture::Target2D);
d->m_uTexture = new QOpenGLTexture(QOpenGLTexture::Target2D);
d->m_vTexture = new QOpenGLTexture(QOpenGLTexture::Target2D);
d->m_yTexture->setSize(d->m_currentFrame->width, d->m_currentFrame->height);
d->m_uTexture->setSize(d->m_currentFrame->width / 2, d->m_currentFrame->height / 2);
d->m_vTexture->setSize(d->m_currentFrame->width / 2, d->m_currentFrame->height / 2);
d->m_yTexture->setFormat(QOpenGLTexture::RGBA16_UNorm);
d->m_uTexture->setFormat(QOpenGLTexture::RGBA16_UNorm);
d->m_vTexture->setFormat(QOpenGLTexture::RGBA16_UNorm);
d->m_yTexture->allocateStorage(QOpenGLTexture::Red, QOpenGLTexture::UInt16);
d->m_uTexture->allocateStorage(QOpenGLTexture::RG, QOpenGLTexture::UInt16);
d->m_vTexture->allocateStorage(QOpenGLTexture::Red, QOpenGLTexture::UInt16);
// d->m_uTexture = new QOpenGLTexture(
// QImage(d->m_currentFrame->width / 2, d->m_currentFrame->height / 2, QImage::Format_RGBX64));
// d->m_vTexture = new QOpenGLTexture(
// QImage(d->m_currentFrame->width / 2, d->m_currentFrame->height / 2, QImage::Format_RGBX64));
d->m_yTexture->setMinMagFilters(QOpenGLTexture::Nearest, QOpenGLTexture::Nearest);
d->m_uTexture->setMinMagFilters(QOpenGLTexture::Nearest, QOpenGLTexture::Nearest);
d->m_vTexture->setMinMagFilters(QOpenGLTexture::Nearest, QOpenGLTexture::Nearest);
}
d->m_yTexture->setMinMagFilters(QOpenGLTexture::Linear, QOpenGLTexture::Linear);
d->m_uTexture->setMinMagFilters(QOpenGLTexture::Linear, QOpenGLTexture::Linear);
d->m_vTexture->setMinMagFilters(QOpenGLTexture::Linear, QOpenGLTexture::Linear);
}
// qDebug("Frame duration: %ld ms", d->m_currentFrameTimeout);
if (differentPixFmt) {
d->m_program->bind();
}
d->m_yTexture->bind(0);
d->m_uTexture->bind(1);
d->m_vTexture->bind(2);
switch (d->m_currentFrame->format) {
case AV_PIX_FMT_BGRA:
d->m_yTexture->setData(QOpenGLTexture::PixelFormat::BGRA, QOpenGLTexture::UInt8,
d->m_currentFrame->data[0]);
if (differentPixFmt) {
d->m_program->bind();
d->m_program->setUniformValue("inputFormat", 0);
}
d->m_yTexture->bind(0);
d->m_uTexture->bind(1);
d->m_vTexture->bind(2);
switch (d->m_currentFrame->format) {
case AV_PIX_FMT_BGRA:
d->m_yTexture->setData(QOpenGLTexture::PixelFormat::BGRA, QOpenGLTexture::UInt8,
d->m_currentFrame->data[0]);
if (differentPixFmt) {
d->m_program->setUniformValue("inputFormat", 0);
}
break;
case AV_PIX_FMT_NV12:
d->m_yTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt8, d->m_currentFrame->data[0]);
d->m_uTexture->setData(QOpenGLTexture::RG, QOpenGLTexture::UInt8, d->m_currentFrame->data[1]);
if (differentPixFmt) {
d->m_program->setUniformValue("inputFormat", 1);
}
break;
case AV_PIX_FMT_P010:
d->m_yTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt16, d->m_currentFrame->data[0]);
d->m_uTexture->setData(QOpenGLTexture::RG, QOpenGLTexture::UInt16, d->m_currentFrame->data[1]);
if (differentPixFmt) {
d->m_program->setUniformValue("inputFormat", 1);
}
break;
case AV_PIX_FMT_YUV420P:
d->m_yTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt8, d->m_currentFrame->data[0]);
d->m_uTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt8, d->m_currentFrame->data[1]);
d->m_vTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt8, d->m_currentFrame->data[2]);
if (differentPixFmt) {
d->m_program->setUniformValue("inputFormat", 2);
}
break;
case AV_PIX_FMT_YUV420P10:
// TODO: Fix crappy and low-res colors with 10bit YUV420P10LE, caused by data in lsb
d->m_yTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt16, d->m_currentFrame->data[0]);
d->m_uTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt16, d->m_currentFrame->data[1]);
d->m_vTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt16, d->m_currentFrame->data[2]);
if (differentPixFmt) {
d->m_program->setUniformValue("inputFormat", 3);
}
break;
default:
qFatal("Pixel format not supported");
break;
case AV_PIX_FMT_NV12:
d->m_yTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt8, d->m_currentFrame->data[0]);
d->m_uTexture->setData(QOpenGLTexture::RG, QOpenGLTexture::UInt8, d->m_currentFrame->data[1]);
if (differentPixFmt) {
d->m_program->setUniformValue("inputFormat", 1);
}
break;
case AV_PIX_FMT_P010:
d->m_yTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt16, d->m_currentFrame->data[0]);
d->m_uTexture->setData(QOpenGLTexture::RG, QOpenGLTexture::UInt16, d->m_currentFrame->data[1]);
if (differentPixFmt) {
d->m_program->release();
d->m_program->setUniformValue("inputFormat", 1);
}
}
break;
case AV_PIX_FMT_YUV420P:
d->m_yTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt8, d->m_currentFrame->data[0]);
d->m_uTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt8, d->m_currentFrame->data[1]);
d->m_vTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt8, d->m_currentFrame->data[2]);
if (differentPixFmt) {
d->m_program->setUniformValue("inputFormat", 2);
}
break;
case AV_PIX_FMT_YUV420P10:
// TODO: Fix crappy and low-res colors with 10bit YUV420P10LE, caused by data in lsb
d->m_yTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt16, d->m_currentFrame->data[0]);
d->m_uTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt16, d->m_currentFrame->data[1]);
d->m_vTexture->setData(QOpenGLTexture::Red, QOpenGLTexture::UInt16, d->m_currentFrame->data[2]);
if (differentPixFmt) {
d->m_program->setUniformValue("inputFormat", 3);
}
break;
default:
qFatal("Pixel format not supported");
}
if (differentPixFmt) {
d->m_program->release();
}
}
} else if (d->m_clock) {
if (d->m_clock->isActive()) {
d->m_clock->pause(true);
}
}
} else if (d->m_clock) {
if (d->m_clock->isActive()) {
d->m_clock->pause(true);
}
}
// if (!d->m_clock) {
// d->m_clock = new RenderClock;
......@@ -459,74 +460,65 @@ namespace AVQt {
// d->m_clock->start();
// }
if (d->m_clock->getInterval() != d->m_currentFrameTimeout) {
qDebug("Resetting timer %ld != %ld", d->m_clock->getInterval(), d->m_currentFrameTimeout);
d->m_clock->setInterval((d->m_currentFrameTimeout < 0 ? 1 : d->m_currentFrameTimeout));
d->m_clock->stop();
d->m_clock->start();
qInfo("Setting RenderClock interval to %ld ms", d->m_clock->getInterval());
if (d->m_currentFrame) {
qDebug("Drawing frame with PTS: %ld", d->m_currentFrame->pts);
d->m_program->bind();
if (!d->m_yTexture->isBound(0)) {
d->m_yTexture->bind(0);
d->m_uTexture->bind(1);
d->m_vTexture->bind(2);
}
if (d->m_currentFrame) {
qDebug("Drawing frame with PTS: %ld", d->m_currentFrame->pts);
d->m_program->bind();
if (!d->m_yTexture->isBound(0)) {
d->m_yTexture->bind(0);
d->m_uTexture->bind(1);
d->m_vTexture->bind(2);
}
d->m_vao.bind();
d->m_ibo.bind();
d->m_vao.bind();
d->m_ibo.bind();
// d->m_program->enableAttributeArray(PROGRAM_VERTEX_ATTRIBUTE);
// d->m_program->enableAttributeArray(PROGRAM_TEXCOORD_ATTRIBUTE);
// d->m_program->setAttributeBuffer(PROGRAM_VERTEX_ATTRIBUTE, GL_FLOAT, 0, 3, 5 * sizeof(GLfloat));
// d->m_program->setAttributeBuffer(PROGRAM_TEXCOORD_ATTRIBUTE, GL_FLOAT, 3 * sizeof(GLfloat), 2, 5 * sizeof(GLfloat));
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr);
glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_INT, nullptr);
d->m_vao.release();
d->m_vbo.release();
d->m_program->release();
d->m_yTexture->release(0);
d->m_uTexture->release(1);
d->m_vTexture->release(2);
}
d->m_vao.release();
d->m_vbo.release();
d->m_program->release();
d->m_yTexture->release(0);
d->m_uTexture->release(1);
d->m_vTexture->release(2);
}
int height = this->height();
int height = this->height();
GLdouble model[4][4], proj[4][4];
GLint view[4];
glGetDoublev(GL_MODELVIEW_MATRIX, &model[0][0]);
glGetDoublev(GL_PROJECTION_MATRIX, &proj[0][0]);
glGetIntegerv(GL_VIEWPORT, &view[0]);
GLdouble textPosX = 0, textPosY = 0, textPosZ = 0;
GLdouble model[4][4], proj[4][4];
GLint view[4];
glGetDoublev(GL_MODELVIEW_MATRIX, &model[0][0]);
glGetDoublev(GL_PROJECTION_MATRIX, &proj[0][0]);
glGetIntegerv(GL_VIEWPORT, &view[0]);
GLdouble textPosX = 0, textPosY = 0, textPosZ = 0;
OpenGLRendererPrivate::project(-0.9, 0.8, 0.0, &model[0][0], &proj[0][0], &view[0],
&textPosX, &textPosY, &textPosZ);
OpenGLRendererPrivate::project(-0.9, 0.8, 0.0, &model[0][0], &proj[0][0], &view[0],
&textPosX, &textPosY, &textPosZ);
textPosY = height - textPosY; // y is inverted
textPosY = height - textPosY; // y is inverted
QPainter p(this);
QPainter p(this);
p.setPen(QPen(Qt::black, 2.0));
p.setFont(QFont("Roboto", 24));
p.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
QFont roboto("Roboto Condensed", 24);
p.setFont(roboto);
p.setPen(QPen(Qt::black, 2.0));
p.setFont(QFont("Roboto", 24));
p.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
QFont roboto("Roboto Condensed", 24);
p.setFont(roboto);
// qDebug() << "Current timestamp:" << d->m_position.toString("hh:mm:ss.zzz");
QString overlay(d->m_position.toString("hh:mm:ss") + "/" + d->m_duration.toString("hh:mm:ss"));
QFontMetrics fm(roboto);
p.fillRect(fm.boundingRect(overlay).translated(static_cast<int>(textPosX), static_cast<int>(textPosY)).adjusted(-5, -5, 5, 5),
QColor(0xFF, 0xFF, 0xFF, 0x48));
p.drawText(fm.boundingRect(overlay).translated(static_cast<int>(textPosX), static_cast<int>(textPosY)), overlay);
p.end();
qDebug() << "Paused:" << (d->m_paused.load() ? "true" : "false");
if (!d->m_paused.load()) {
update();
}
QString overlay(d->m_position.toString("hh:mm:ss") + "/" + d->m_duration.toString("hh:mm:ss"));
QFontMetrics fm(roboto);
p.fillRect(fm.boundingRect(overlay).translated(static_cast<int>(textPosX), static_cast<int>(textPosY)).adjusted(-5, -5, 5, 5),
QColor(0xFF, 0xFF, 0xFF, 0x48));
p.drawText(fm.boundingRect(overlay).translated(static_cast<int>(textPosX), static_cast<int>(textPosY)), overlay);
p.end();
qDebug() << "Paused:" << (d->m_paused.load() ? "true" : "false");
if (!d->m_paused.load()) {
update();
}
}
......@@ -537,10 +529,11 @@ namespace AVQt {
}
void OpenGLRenderer::triggerUpdate(qint64 timestamp) {
Q_UNUSED(timestamp)
Q_D(AVQt::OpenGLRenderer);
d->m_updateRequired.store(true);
d->m_updateTimestamp.store(timestamp);
// d->m_updateRequired.store(true);
// d->m_updateTimestamp.store(timestamp);
}
RenderClock *OpenGLRenderer::getClock() {
......
AVQt/output/RenderClock.cpp
+ 21
− 13
View file @ c746b882
......@@ -37,6 +37,8 @@ namespace AVQt {
if (d->m_active.compare_exchange_strong(shouldBe, true)) {
qDebug("Starting clock");
d->m_paused.store(false);
d->m_elapsedTime = new QElapsedTimer;
d->m_elapsedTime->start();
d->m_timer->start();
}
}
......@@ -53,6 +55,7 @@ namespace AVQt {
d->m_timer->setInterval(d->m_interval);
d->m_elapsedTime->invalidate();
d->m_lastPauseTimestamp = 0;
delete d->m_elapsedTime;
}
}
......@@ -64,11 +67,12 @@ namespace AVQt {
if (d->m_paused.compare_exchange_strong(shouldBe, paused)) {
if (paused) {
if (d->m_elapsedTime) {
d->m_lastPauseTimestamp = d->m_elapsedTime->nsecsElapsed() / 1000;
d->m_lastPauseTimestamp += d->m_elapsedTime->nsecsElapsed() / 1000;
d->m_elapsedTime->invalidate();
}
} else {
if (d->m_elapsedTime && d->m_lastPauseTimestamp >= 0) {
d->m_pausedTime += (d->m_elapsedTime->nsecsElapsed() / 1000) - d->m_lastPauseTimestamp;
d->m_elapsedTime->restart();
}
}
}
......@@ -106,18 +110,11 @@ namespace AVQt {
if (!d->m_paused.load()) {
if (!d->m_elapsedTime) {
d->m_elapsedTime = new QElapsedTimer;
d->m_elapsedTime->start();
timeout(0);
} else if (!d->m_elapsedTime->isValid()) {
d->m_elapsedTime->restart();
timeout(0);
}
if (!d->m_elapsedTime->isValid()) {
timeout(d->m_lastPauseTimestamp);
} else {
qDebug("Timeout at: %lld", d->m_elapsedTime->nsecsElapsed() / 1000 - d->m_pausedTime);
if (d->m_elapsedTime->nsecsElapsed() / 1000 - d->m_pausedTime < 0) {
qFatal("Invalid time: %lld, Paused: %lld, Valid: %s", d->m_elapsedTime->nsecsElapsed() / 1000, d->m_pausedTime,
(d->m_elapsedTime->isValid() ? "true" : "false"));
}
timeout((d->m_elapsedTime->nsecsElapsed() / 1000) - d->m_pausedTime);
timeout(d->m_lastPauseTimestamp + d->m_elapsedTime->nsecsElapsed() / 1000);
}
}
}
......@@ -127,6 +124,17 @@ namespace AVQt {
return d->m_paused.load();
}
int64_t RenderClock::getTimestamp() {
Q_D(AVQt::RenderClock);
if (!d->m_paused && d->m_elapsedTime && d->m_elapsedTime->isValid()) {
qDebug("Elapsed: %lld us", d->m_elapsedTime->nsecsElapsed());
return d->m_lastPauseTimestamp + d->m_elapsedTime->nsecsElapsed() / 1000;
} else {
qDebug("Paused or invalid elapsed time");
return d->m_lastPauseTimestamp;
}
}
// void RenderClock::connectCallback(QObject *obj, void(*function)()) {
// Q_D(AVQt::RenderClock);
// connect(d->m_timer, &QTimer::timeout, obj, function, Qt::QueuedConnection);
......
AVQt/output/RenderClock.h
+ 3
− 1
View file @ c746b882
......@@ -24,6 +24,8 @@ namespace AVQt {
int64_t getInterval();
int64_t getTimestamp();
bool isActive();
bool isPaused();
......@@ -59,4 +61,4 @@ namespace AVQt {
}
#endif //LIBAVQT_RENDERCLOCK_H
#endif //LIBAVQT_RENDERCLOCK_H
\ No newline at end of file
AVQt/output/private/RenderClock_p.h
+ 1
− 2
View file @ c746b882
......@@ -17,11 +17,10 @@ namespace AVQt {
std::atomic_bool m_active {false};
std::atomic_bool m_paused {false};
QElapsedTimer *m_elapsedTime {nullptr};
qint64 m_pausedTime {0};
qint64 m_lastPauseTimestamp {0};
friend class RenderClock;
};
}
#endif //LIBAVQT_RENDERCLOCK_P_H
#endif //LIBAVQT_RENDERCLOCK_P_H
\ No newline at end of file
Player/main.cpp
+ 4
− 4
View file @ c746b882
......@@ -62,8 +62,8 @@ int main(int argc, char *argv[]) {
AVQt::AudioDecoder decoder;
AVQt::OpenALAudioOutput output;
// demuxer.registerCallback(&decoder, AVQt::IPacketSource::CB_AUDIO);
// decoder.registerCallback(&output);
demuxer.registerCallback(&decoder, AVQt::IPacketSource::CB_AUDIO);
decoder.registerCallback(&output);
AVQt::IDecoder *videoDecoder;
#ifdef Q_OS_LINUX
......@@ -81,7 +81,7 @@ int main(int argc, char *argv[]) {
// videoDecoder->registerCallback(encoder);
videoDecoder->registerCallback(&renderer);
// renderer.setMinimumSize(QSize(360, 240));
renderer.setMinimumSize(QSize(360, 240));
// QObject::connect(&renderer, &AVQt::OpenGLRenderer::paused, [&](bool paused) {
// output.pause(nullptr, paused);
......@@ -92,7 +92,7 @@ int main(int argc, char *argv[]) {
demuxer.init();
// output.syncToOutput(&renderer);
output.syncToOutput(&renderer);
demuxer.start();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment