Ignore:
Timestamp:
Jan 18, 2017 10:55:35 AM (8 years ago)
Author:
nanang
Message:

Re #1900: Merged changes from trunk.

Location:
pjproject/branches/projects/uwp
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • pjproject/branches/projects/uwp

  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/android/app/src/main/java/MainActivity.java

    r5508 r5532  
    139139            } 
    140140        } 
     141 
     142        @Override 
     143        public void onCallVideoStart() { 
     144            MainActivity ma = ((MyHandler)ui_handler.get()).mTarget.get(); 
     145            SurfaceView surfaceView = (SurfaceView) 
     146                ma.findViewById(R.id.surfaceViewIncomingCall); 
     147 
     148            WindowHandle wh = new WindowHandle(); 
     149            wh.setWindow(surfaceView.getHolder().getSurface()); 
     150            pjsua.setVideoWindow(wh); 
     151        } 
    141152    } 
    142153 
    … …  
    262273    public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) 
    263274    { 
    264         pjsua.setIncomingVideoRenderer(holder.getSurface()); 
     275        WindowHandle wh = new WindowHandle(); 
     276        wh.setWindow(holder.getSurface()); 
     277        pjsua.setVideoWindow(wh); 
    265278    } 
    266279 
    267280    public void surfaceCreated(SurfaceHolder holder) 
    268281    { 
    269         pjsua.setIncomingVideoRenderer(holder.getSurface()); 
     282 
    270283    } 
    271284 
    272285    public void surfaceDestroyed(SurfaceHolder holder) 
    273286    { 
    274         pjsua.setIncomingVideoRenderer(null); 
     287        WindowHandle wh = new WindowHandle(); 
     288        wh.setWindow(null); 
     289        pjsua.setVideoWindow(wh); 
    275290    } 
    276291     

  • pjproject/branches/projects/uwp/pjsip-apps/src/pjsua/android/app/src/main/java/org/pjsip/pjsua

    • Property svn:ignore

      •  

        old new  
        11Pjsua*.java 
        22pjsua*.java 
         3SWIG*.java 
         4WindowHandle.java 
         5 
Note: See TracChangeset for help on using the changeset viewer.