← Back to branch summary

~ps-jenkins/qtvideo-node/ubuntu-vivid-proposed

« back to all changes in this revision

Viewing changes to src/shadervideomaterial.h

  • Committer: Tarmac
  • Author(s): Jim Hodapp
  • Date: 2013-09-27 22:16:25 UTC
  • mfrom: (39.1.5 qtvideo-node)
  • Revision ID: tarmac-20130927221625-tq8sax6tkz96bb3m
* Make qtvideo-node work with the new GStreamer backend for video playback. Verified this still works with the camera-app.
* Modified to work with the new SurfaceTextureClientHybris and new GStreamer backend.

Approved by Ricardo Salveti, Günter Schwann, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shadervideomaterial.h
37
37
    void setCamControl(CameraControl *cc);
38
38
    CameraControl *cameraControl() const;
39
39
 
40
 
    void setMediaPlayerControl(MediaPlayerWrapper *mp);
41
 
    MediaPlayerWrapper *mediaplayerControl() const;
 
40
    void setTextureId(GLuint textureId);
 
41
    GLuint textureId() const { return m_textureId; }
42
42
 
43
43
    void bind();
44
44
 
48
48
 
49
49
    QVideoSurfaceFormat m_format;
50
50
    CameraControl *m_camControl;
51
 
    MediaPlayerWrapper *m_mediaPlayerControl;
 
51
    GLuint m_textureId;
52
52
    static ShaderVideoShader *m_videoShader; // the shader is cached in the Qt scene graph
53
53
    GLfloat m_textureMatrix[16];
54
54
};