← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libhybris/utopic-proposed

« back to all changes in this revision

Viewing changes to compat/media/surface_texture_client_hybris_priv.h

  • Committer: Package Import Robot
  • Author(s): Ricardo Salveti de Araujo
  • Date: 2014-01-23 02:38:35 UTC
  • Revision ID: package-import@ubuntu.com-20140123023835-wtt32jl6x1o7zyk5
Tags: 0.1.0+git20131207+e452e83-0ubuntu6
Making compat code compatible with Android 4.4.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
compat/media/surface_texture_client_hybris_priv.h
16
16
 * Authored by: Jim Hodapp <jim.hodapp@canonical.com>
17
17
 */
18
18
 
 
19
#include <gui/Surface.h>
 
20
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
19
21
#include <gui/SurfaceTextureClient.h>
 
22
#else
 
23
#include <gui/GLConsumer.h>
 
24
#endif
20
25
 
 
26
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
21
27
struct _SurfaceTextureClientHybris : public android::SurfaceTextureClient
 
28
#else
 
29
struct _SurfaceTextureClientHybris : public android::Surface
 
30
#endif
22
31
{
 
32
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
23
33
    _SurfaceTextureClientHybris();
 
34
#endif
24
35
    _SurfaceTextureClientHybris(const _SurfaceTextureClientHybris &stch);
 
36
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
25
37
    _SurfaceTextureClientHybris(const android::sp<android::ISurfaceTexture> &st);
 
38
#else
 
39
    _SurfaceTextureClientHybris(const android::sp<android::IGraphicBufferProducer> &st);
 
40
#endif
26
41
    ~_SurfaceTextureClientHybris();
27
42
 
28
43
    /** Has a texture id or EGLNativeWindowType been passed in, meaning rendering will function? **/
31
46
public:
32
47
    int dequeueBuffer(ANativeWindowBuffer** buffer, int* fenceFd);
33
48
    int queueBuffer(ANativeWindowBuffer* buffer, int fenceFd);
 
49
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
34
50
    void setISurfaceTexture(const android::sp<android::ISurfaceTexture>& surface_texture);
 
51
#else
 
52
    void setISurfaceTexture(const android::sp<android::IGraphicBufferProducer>& surface_texture);
 
53
#endif
35
54
    void setHardwareRendering(bool do_hardware_rendering);
36
55
    bool hardwareRendering();
37
56
 
38
57
    unsigned int refcount;
 
58
#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
39
59
    android::sp<android::SurfaceTexture> surface_texture;
 
60
#else
 
61
    android::sp<android::GLConsumer> surface_texture;
 
62
#endif
40
63
 
41
64
private:
42
65
    bool ready;