Merge branch 'open_source' into google_internal (cd3c19ae) · Commits · e / os / android_frameworks_native-old

libs/audioflinger/AudioFlinger.cpp

+27 −10

Original line number	Diff line number	Diff line
		@@ -651,27 +651,36 @@ status_t AudioFlinger::setStreamVolume(int stream, float value)
		return BAD_VALUE;
		}

		mHardwareMixerThread->setStreamVolume(stream, value);
		#ifdef WITH_A2DP
		mA2dpMixerThread->setStreamVolume(stream, value);
		#endif

		status_t ret = NO_ERROR;

		if (stream == AudioSystem::VOICE_CALL \|\|
		stream == AudioSystem::BLUETOOTH_SCO) {

		float hwValue = value;
		if (stream == AudioSystem::VOICE_CALL) {
		value = (float)AudioSystem::logToLinear(value)/100.0f;
		hwValue = (float)AudioSystem::logToLinear(value)/100.0f;
		// FIXME: This is a temporary fix to re-base the internally
		// generated in-call audio so that it is never muted, which is
		// already the case for the hardware routed in-call audio.
		// When audio stream handling is reworked, this should be
		// addressed more cleanly. Fixes #1324; see discussion at
		// http://review.source.android.com/8224
		value = value * 0.99 + 0.01;
		} else { // (type == AudioSystem::BLUETOOTH_SCO)
		value = 1.0f;
		hwValue = 1.0f;
		}

		AutoMutex lock(mHardwareLock);
		mHardwareStatus = AUDIO_SET_VOICE_VOLUME;
		ret = mAudioHardware->setVoiceVolume(value);
		ret = mAudioHardware->setVoiceVolume(hwValue);
		mHardwareStatus = AUDIO_HW_IDLE;

		}

		mHardwareMixerThread->setStreamVolume(stream, value);
		#ifdef WITH_A2DP
		mA2dpMixerThread->setStreamVolume(stream, value);
		#endif

		return ret;
		}

		@@ -709,7 +718,15 @@ float AudioFlinger::streamVolume(int stream) const
		if (uint32_t(stream) >= AudioSystem::NUM_STREAM_TYPES) {
		return 0.0f;
		}
		return mHardwareMixerThread->streamVolume(stream);
		float value = mHardwareMixerThread->streamVolume(stream);

		if (stream == AudioSystem::VOICE_CALL) {
		// FIXME: Re-base internally generated in-call audio,
		// reverse of above in setStreamVolume.
		value = (value - 0.01) / 0.99;
		}

		return value;
		}

		bool AudioFlinger::streamMute(int stream) const

libs/surfaceflinger/LayerScreenshot.cpp

0 → 100644

+110 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "SurfaceFlinger"

		#include <stdlib.h>
		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Errors.h>
		#include <utils/Log.h>

		#include <core/SkBitmap.h>

		#include <ui/EGLDisplaySurface.h>

		#include "LayerBase.h"
		#include "LayerScreenshot.h"
		#include "SurfaceFlinger.h"
		#include "DisplayHardware/DisplayHardware.h"

		namespace android {
		// ---------------------------------------------------------------------------

		const uint32_t LayerScreenshot::typeInfo = LayerBase::typeInfo \| 0x20;
		const char* const LayerScreenshot::typeID = "LayerScreenshot";

		// ---------------------------------------------------------------------------

		LayerScreenshot::LayerScreenshot(SurfaceFlinger* flinger, DisplayID display)
		: LayerBase(flinger, display), mReply(0)
		{
		}

		LayerScreenshot::~LayerScreenshot()
		{
		}

		void LayerScreenshot::onDraw(const Region& clip) const
		{
		const DisplayHardware& hw(graphicPlane(0).displayHardware());
		copybit_image_t dst;
		hw.getDisplaySurface(&dst);
		if (dst.base != 0) {
		uint8_t const* src = (uint8_t const*)(intptr_t(dst.base) + dst.offset);
		const int fbWidth = dst.w;
		const int fbHeight = dst.h;
		const int fbFormat = dst.format;

		int x = mTransformedBounds.left;
		int y = mTransformedBounds.top;
		int w = mTransformedBounds.width();
		int h = mTransformedBounds.height();
		Parcel* const reply = mReply;
		if (reply) {
		const size_t Bpp = bytesPerPixel(fbFormat);
		const size_t size = w * h * Bpp;
		int32_t cfg = SkBitmap::kNo_Config;
		switch (fbFormat) {
		case PIXEL_FORMAT_RGBA_4444: cfg = SkBitmap::kARGB_4444_Config; break;
		case PIXEL_FORMAT_RGBA_8888: cfg = SkBitmap::kARGB_8888_Config; break;
		case PIXEL_FORMAT_RGB_565: cfg = SkBitmap::kRGB_565_Config; break;
		case PIXEL_FORMAT_A_8: cfg = SkBitmap::kA8_Config; break;
		}
		reply->writeInt32(0);
		reply->writeInt32(cfg);
		reply->writeInt32(w);
		reply->writeInt32(h);
		reply->writeInt32(w * Bpp);
		void* data = reply->writeInplace(size);
		if (data) {
		uint8_t* d = (uint8_t*)data;
		uint8_t const* s = src + (x + yfbWidth) Bpp;
		if (w == fbWidth) {
		memcpy(d, s, whBpp);
		} else {
		for (int y=0 ; y<h ; y++) {
		memcpy(d, s, w*Bpp);
		d += w*Bpp;
		s += fbWidth*Bpp;
		}
		}
		}
		}
		}
		mCV.broadcast();
		}

		void LayerScreenshot::takeScreenshot(Mutex& lock, Parcel* reply)
		{
		mReply = reply;
		mCV.wait(lock);
		}

		// ---------------------------------------------------------------------------

		}; // namespace android

libs/surfaceflinger/SurfaceFlinger.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <fcntl.h>
		#include <errno.h>
		#include <math.h>
		#include <limits.h>
		#include <sys/types.h>
		#include <sys/stat.h>
		#include <sys/ioctl.h>

libs/utils/Parcel.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -950,7 +950,6 @@ native_handle* Parcel::readNativeHandle(native_handle* (alloc)(void, int, int)
		return 0;
		}
		}

		for (int i=0 ; err==NO_ERROR && i<numFds ; i++) {
		h->data[i] = dup(readFileDescriptor());
		if (h->data[i] < 0) err = BAD_VALUE;