← Back to branch summary

~schwann/qtvideo-node/video-node-n10-cam-switch-fix

« back to all changes in this revision

Viewing changes to src/shadervideomaterial.cpp

  • Committer: Tarmac
  • Author(s): Jim Hodapp
  • Date: 2013-03-14 15:55:17 UTC
  • mfrom: (22.1.7 qtvideo-node)
  • Revision ID: tarmac-20130314155517-0vo0x2c5xgxde3ew
Enable Qt multithreaded rendering to work for both the media player and camera apps.

Approved by PS Jenkins bot, Günter Schwann.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shadervideomaterial.cpp
70
70
        return;
71
71
    }
72
72
 
73
 
    if (m_camControl != NULL)
74
 
    {
 
73
    if (m_camControl != NULL) {
75
74
        android_camera_update_preview_texture(m_camControl);
76
75
        android_camera_get_preview_texture_transformation(m_camControl, m_textureMatrix);
77
76
    }
78
 
    else if (m_mediaPlayerControl != NULL)
79
 
    {
 
77
    else if (m_mediaPlayerControl != NULL) {
80
78
        android_media_update_surface_texture(m_mediaPlayerControl);
81
79
        android_media_surface_texture_get_transformation_matrix(m_mediaPlayerControl, m_textureMatrix);
82
80
    }