[ios] change displaylink settings and native eaglLayer.drawableProper…

…ties to save cpu/gpu bandwidth, no visual artifacts seen with this change but cpu useage drops by 10-20 percent
AaronDnz · Apr 30, 2011 · f70236b · f70236b
1 parent 0243477
commit f70236b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 33 deletions.
diff --git a/xbmc/osx/atv2/XBMCEAGLView.mm b/xbmc/osx/atv2/XBMCEAGLView.mm
@@ -73,8 +73,8 @@ - (id)initWithFrame:(CGRect)frame
     eaglLayer.opaque = TRUE;
     eaglLayer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys:
       [NSNumber numberWithBool:FALSE], kEAGLDrawablePropertyRetainedBacking,
-      //kEAGLColorFormatRGB565, kEAGLDrawablePropertyColorFormat,
-      kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat,
+      kEAGLColorFormatRGB565, kEAGLDrawablePropertyColorFormat,
+      //kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat,
       nil];
 
     EAGLContext *aContext = [[EAGLContext alloc] 
@@ -321,18 +321,8 @@ - (void) runAnimation:(id) arg
 - (void) runDisplayLink;
 {
   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-  /*
-  static CFTimeInterval oldtimestamp;
-  CFTimeInterval frameInterval, timestamp, duration;
 
-  duration = [displayLink duration];
-  timestamp = [displayLink timestamp];
-  frameInterval = [displayLink frameInterval];
-  NSLog(@"%s:duration(%f), delta(%f), timestamp(%f)", __PRETTY_FUNCTION__, 
-    duration, timestamp-oldtimestamp, timestamp);
-  oldtimestamp = timestamp;
-  */
-  displayFPS = 1.0 / [displayLink duration];
+  displayFPS = 1.0 / ([displayLink duration] * [displayLink frameInterval]);
   if (animationThread && [animationThread isExecuting] == YES)
   {
     if (g_VideoReferenceClock)
@@ -347,9 +337,9 @@ - (void) initDisplayLink
   displayLink = [NSClassFromString(@"CADisplayLink") 
     displayLinkWithTarget:self
     selector:@selector(runDisplayLink)];
-  [displayLink setFrameInterval:1];
+  [displayLink setFrameInterval:2];
   [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
-  displayFPS = 60;
+  displayFPS = 1.0 / ([displayLink duration] * [displayLink frameInterval]);
 }
 //--------------------------------------------------------------
 - (void) deinitDisplayLink

diff --git a/xbmc/osx/ios/XBMCEAGLView.mm b/xbmc/osx/ios/XBMCEAGLView.mm
@@ -74,8 +74,8 @@ - (id)initWithFrame:(CGRect)frame
     eaglLayer.opaque = TRUE;
     eaglLayer.drawableProperties = [NSDictionary dictionaryWithObjectsAndKeys:
       [NSNumber numberWithBool:NO], kEAGLDrawablePropertyRetainedBacking,
-      //kEAGLColorFormatRGB565, kEAGLDrawablePropertyColorFormat,
-      kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat,
+      kEAGLColorFormatRGB565, kEAGLDrawablePropertyColorFormat,
+      //kEAGLColorFormatRGBA8, kEAGLDrawablePropertyColorFormat,
       nil];
 
     EAGLContext *aContext = [[EAGLContext alloc] 
@@ -342,18 +342,8 @@ - (void) runAnimation:(id) arg
 - (void) runDisplayLink;
 {
   NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
-  /*
-  static CFTimeInterval oldtimestamp;
-  CFTimeInterval frameInterval, timestamp, duration;
 
-  duration = [displayLink duration];
-  timestamp = [displayLink timestamp];
-  frameInterval = [displayLink frameInterval];
-  NSLog(@"%s:duration(%f), delta(%f), timestamp(%f)", __PRETTY_FUNCTION__, 
-    duration, timestamp-oldtimestamp, timestamp);
-  oldtimestamp = timestamp;
-  */
-  displayFPS = 1.0 / [displayLink duration];
+  displayFPS = 1.0 / ([displayLink duration] * [displayLink frameInterval]);
   if (animationThread && [animationThread isExecuting] == YES)
   {
     if (g_VideoReferenceClock)
@@ -364,25 +354,22 @@ - (void) runDisplayLink;
 //--------------------------------------------------------------
 - (void) initDisplayLink
 {
-  //NSLog(@"%s", __PRETTY_FUNCTION__);
   displayLink = [NSClassFromString(@"CADisplayLink") 
     displayLinkWithTarget:self
     selector:@selector(runDisplayLink)];
-  [displayLink setFrameInterval:1];
+  [displayLink setFrameInterval:2];
   [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
-  displayFPS = 60;
+  displayFPS = 1.0 / ([displayLink duration] * [displayLink frameInterval]);
 }
 //--------------------------------------------------------------
 - (void) deinitDisplayLink
 {
-  //NSLog(@"%s", __PRETTY_FUNCTION__);
   [displayLink invalidate];
   displayLink = nil;
 }
 //--------------------------------------------------------------
 - (double) getDisplayLinkFPS;
 {
-  //NSLog(@"%s:displayFPS(%f)", __PRETTY_FUNCTION__, displayFPS);
   return displayFPS;
 }
 //--------------------------------------------------------------

diff --git a/xbmc/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp
@@ -880,6 +880,7 @@ void CVideoReferenceClock::VblankHandler(int64_t nowtime, double fps)
   SingleLock.Leave();
 
   SendVblankSignal();
+  UpdateRefreshrate();
 }
 #endif