Add Double-Buffering Frame Uploader

This commit is contained in:
Florian Märkl 2019-08-05 13:56:59 +02:00
commit 3358759aab
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
5 changed files with 178 additions and 53 deletions

View file

@ -0,0 +1,42 @@
/*
* This file is part of Chiaki.
*
* Chiaki is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Chiaki is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Chiaki. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef CHIAKI_AVOPENGLFRAMEUPLOADER_H
#define CHIAKI_AVOPENGLFRAMEUPLOADER_H
#include <QObject>
#include <QOpenGLWidget>
class AVOpenGLWidget;
class VideoDecoder;
class AVOpenGLFrameUploader: public QObject
{
Q_OBJECT
private:
VideoDecoder *decoder;
AVOpenGLWidget *widget;
private slots:
void UpdateFrame();
public:
AVOpenGLFrameUploader(VideoDecoder *decoder, AVOpenGLWidget *widget);
};
#endif // CHIAKI_AVOPENGLFRAMEUPLOADER_H

View file

@ -19,6 +19,7 @@
#define CHIAKI_AVOPENGLWIDGET_H
#include <QOpenGLWidget>
#include <QMutex>
extern "C"
{
@ -26,6 +27,16 @@ extern "C"
}
class VideoDecoder;
class AVOpenGLFrameUploader;
struct AVOpenGLFrame
{
GLuint tex[3];
unsigned int width;
unsigned int height;
bool Update(AVFrame *frame);
};
class AVOpenGLWidget: public QOpenGLWidget
{
@ -37,13 +48,18 @@ class AVOpenGLWidget: public QOpenGLWidget
GLuint program;
GLuint vbo;
GLuint vao;
GLuint tex[3];
unsigned int frame_width, frame_height;
void UpdateTextures(AVFrame *frame);
AVOpenGLFrame frames[2];
int frame_fg;
QMutex frames_mutex;
AVOpenGLFrameUploader *frame_uploader;
public:
explicit AVOpenGLWidget(VideoDecoder *decoder, QWidget *parent = nullptr);
~AVOpenGLWidget() override;
void SwapFrames();
AVOpenGLFrame *GetBackgroundFrame() { return &frames[1 - frame_fg]; }
protected:
void initializeGL() override;