← Back to branch summary

~ci-train-bot/qtvideo-node/qtvideo-node-ubuntu-yakkety-landing-024

« back to all changes in this revision

Viewing changes to src/shadervideonode.h

  • Committer: CI bot
  • Author(s): Jim Hodapp
  • Date: 2014-04-29 13:55:23 UTC
  • mfrom: (43.3.12 qtvideo-node-test)
  • Revision ID: ps-jenkins@lists.canonical.com-20140429135523-pjzem31qu9skt9bq
* Cleanup code for media-hub and merge with Qt5.2 upstream changes.
* Pass in a GLConsumer instance to update the rendered frame on.
* Add frame available listener callback.
* Add functionality to return a new texture-id when sent a blank frame with "GetTextureId" metadata. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shadervideonode.h
29
29
{
30
30
    Q_OBJECT
31
31
public:
32
 
    typedef void* SurfaceTextureClientHybris;
 
32
    typedef void* GLConsumerWrapperHybris;
33
33
 
34
34
    ShaderVideoNode(const QVideoSurfaceFormat &format);
35
35
    ~ShaderVideoNode();
48
48
    QVideoSurfaceFormat m_format;
49
49
    ShaderVideoMaterial *m_material;
50
50
    GLuint m_textureId;
51
 
    SurfaceTextureClientHybris m_surfaceTextureClient;
 
51
    GLConsumerWrapperHybris m_glConsumer;
52
52
    SnapshotGenerator *m_snapshotGenerator;
53
53
};
54
54