ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am ed985574: make sure screenshot are in a format supported by Bitmap.java

Browse Source 
* commit 'ed985574148a938bc3af24442eead313cc62521c':
  make sure screenshot are in a format supported by Bitmap.java
This commit is contained in:
Mathias Agopian 2013-03-22 07:32:17 +00:00 committed by Android Git Automerger
commit d59a1da80e
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -492,6 +492,10 @@ status_t SurfaceFlinger::readyToRun()
mEGLConfig = selectEGLConfig(mEGLDisplay, format); mEGLConfig = selectEGLConfig(mEGLDisplay, format);
mEGLContext = createGLContext(mEGLDisplay, mEGLConfig); mEGLContext = createGLContext(mEGLDisplay, mEGLConfig);
// figure out which format we got
eglGetConfigAttrib(mEGLDisplay, mEGLConfig,
EGL_NATIVE_VISUAL_ID, &mEGLNativeVisualId);
LOG_ALWAYS_FATAL_IF(mEGLContext == EGL_NO_CONTEXT, LOG_ALWAYS_FATAL_IF(mEGLContext == EGL_NO_CONTEXT,
"couldn't create EGLContext"); "couldn't create EGLContext");
@ -2331,13 +2335,18 @@ void SurfaceFlinger::dumpAllLocked(
" transaction-flags : %08x\n" " transaction-flags : %08x\n"
" refresh-rate : %f fps\n" " refresh-rate : %f fps\n"
" x-dpi : %f\n" " x-dpi : %f\n"
" y-dpi : %f\n", " y-dpi : %f\n"
" EGL_NATIVE_VISUAL_ID : %d\n"
" gpu_to_cpu_unsupported : %d\n"
,
mLastSwapBufferTime/1000.0, mLastSwapBufferTime/1000.0,
mLastTransactionTime/1000.0, mLastTransactionTime/1000.0,
mTransactionFlags, mTransactionFlags,
1e9 / hwc.getRefreshPeriod(HWC_DISPLAY_PRIMARY), 1e9 / hwc.getRefreshPeriod(HWC_DISPLAY_PRIMARY),
hwc.getDpiX(HWC_DISPLAY_PRIMARY), hwc.getDpiX(HWC_DISPLAY_PRIMARY),
hwc.getDpiY(HWC_DISPLAY_PRIMARY)); hwc.getDpiY(HWC_DISPLAY_PRIMARY),
mEGLNativeVisualId,
!mGpuToCpuSupported);
result.append(buffer); result.append(buffer);
snprintf(buffer, SIZE, " eglSwapBuffers time: %f us\n", snprintf(buffer, SIZE, " eglSwapBuffers time: %f us\n",
@ -2549,12 +2558,27 @@ status_t SurfaceFlinger::captureScreen(const sp<IBinder>& display,
virtual bool handler() { virtual bool handler() {
Mutex::Autolock _l(flinger->mStateLock); Mutex::Autolock _l(flinger->mStateLock);
sp<const DisplayDevice> hw(flinger->getDisplayDevice(display)); sp<const DisplayDevice> hw(flinger->getDisplayDevice(display));
bool useReadPixels = false;
if (isCpuConsumer) {
bool formatSupportedBytBitmap =
(flinger->mEGLNativeVisualId == HAL_PIXEL_FORMAT_RGBA_8888) ||
(flinger->mEGLNativeVisualId == HAL_PIXEL_FORMAT_RGBX_8888);
if (formatSupportedBytBitmap == false) {
// the pixel format we have is not compatible with
// Bitmap.java, which is the likely client of this API,
// so we just revert to glReadPixels() in that case.
useReadPixels = true;
}
if (flinger->mGpuToCpuSupported == false) {
// When we know the GL->CPU path works, we can call // When we know the GL->CPU path works, we can call
// captureScreenImplLocked() directly, instead of using the // captureScreenImplLocked() directly, instead of using the
// "CpuConsumer" version, which is much less efficient -- it is // glReadPixels() workaround.
// however needed by some older drivers. useReadPixels = true;
}
}
if (flinger->mGpuToCpuSupported || !isCpuConsumer) { if (!useReadPixels) {
result = flinger->captureScreenImplLocked(hw, result = flinger->captureScreenImplLocked(hw,
producer, reqWidth, reqHeight, minLayerZ, maxLayerZ); producer, reqWidth, reqHeight, minLayerZ, maxLayerZ);
} else { } else {

1
services/surfaceflinger/SurfaceFlinger.h
View File

@ -419,6 +419,7 @@ private:
EGLContext mEGLContext; EGLContext mEGLContext;
EGLConfig mEGLConfig; EGLConfig mEGLConfig;
EGLDisplay mEGLDisplay; EGLDisplay mEGLDisplay;
EGLint mEGLNativeVisualId;
sp<IBinder> mBuiltinDisplays[DisplayDevice::NUM_DISPLAY_TYPES]; sp<IBinder> mBuiltinDisplays[DisplayDevice::NUM_DISPLAY_TYPES];
// Can only accessed from the main thread, these members // Can only accessed from the main thread, these members