diff options
| -rw-r--r-- | libs/surfaceflinger/LayerBase.cpp | 26 | ||||
| -rw-r--r-- | libs/ui/GraphicBuffer.cpp | 15 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/ThrottledSource.cpp | 84 | ||||
| -rw-r--r-- | media/libstagefright/include/ThrottledSource.h | 52 |
5 files changed, 156 insertions, 22 deletions
diff --git a/libs/surfaceflinger/LayerBase.cpp b/libs/surfaceflinger/LayerBase.cpp index 76733a9..7ab74b4 100644 --- a/libs/surfaceflinger/LayerBase.cpp +++ b/libs/surfaceflinger/LayerBase.cpp @@ -379,33 +379,21 @@ void LayerBase::drawWithOpenGL(const Region& clip, const Texture& texture) const glEnable(GL_TEXTURE_2D); + GLenum src = mPremultipliedAlpha ? GL_ONE : GL_SRC_ALPHA; if (UNLIKELY(s.alpha < 0xFF)) { - // We have an alpha-modulation. We need to modulate all - // texture components by alpha because we're always using - // premultiplied alpha. - - // If the texture doesn't have an alpha channel we can - // use REPLACE and switch to non premultiplied alpha - // blending (SRCA/ONE_MINUS_SRCA). - - GLenum env, src; - if (needsBlending()) { - env = GL_MODULATE; - src = mPremultipliedAlpha ? GL_ONE : GL_SRC_ALPHA; + const GLfloat alpha = s.alpha * (1.0f/255.0f); + if (mPremultipliedAlpha) { + glColor4f(alpha, alpha, alpha, alpha); } else { - env = GL_REPLACE; - src = GL_SRC_ALPHA; + glColor4f(1, 1, 1, alpha); } - const GLfloat alpha = s.alpha * (1.0f/255.0f); - glColor4f(alpha, alpha, alpha, alpha); glEnable(GL_BLEND); glBlendFunc(src, GL_ONE_MINUS_SRC_ALPHA); - glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, env); + glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); } else { - glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); glColor4f(1, 1, 1, 1); + glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); if (needsBlending()) { - GLenum src = mPremultipliedAlpha ? GL_ONE : GL_SRC_ALPHA; glEnable(GL_BLEND); glBlendFunc(src, GL_ONE_MINUS_SRC_ALPHA); } else { diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp index ba1fd9c..35e4af3 100644 --- a/libs/ui/GraphicBuffer.cpp +++ b/libs/ui/GraphicBuffer.cpp @@ -122,11 +122,20 @@ status_t GraphicBuffer::reallocate(uint32_t w, uint32_t h, PixelFormat f, status_t GraphicBuffer::initSize(uint32_t w, uint32_t h, PixelFormat format, uint32_t reqUsage) { - if (format == PIXEL_FORMAT_RGBX_8888) - format = PIXEL_FORMAT_RGBA_8888; - GraphicBufferAllocator& allocator = GraphicBufferAllocator::get(); status_t err = allocator.alloc(w, h, format, reqUsage, &handle, &stride); + + if (err<0 && format == PIXEL_FORMAT_RGBX_8888) { + /* + * There is currently a bug with some gralloc implementations + * not supporting RGBX_8888. In this case, we revert to using RGBA_8888 + * which is not exactly the same, as GL_REPLACE will yield a different + * result. + */ + format = PIXEL_FORMAT_RGBA_8888; + err = allocator.alloc(w, h, format, reqUsage, &handle, &stride); + } + if (err == NO_ERROR) { this->width = w; this->height = h; diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 8d15013..f00fad8 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -40,6 +40,7 @@ LOCAL_SRC_FILES += \ ShoutcastSource.cpp \ StagefrightMediaScanner.cpp \ StagefrightMetadataRetriever.cpp \ + ThrottledSource.cpp \ TimeSource.cpp \ TimedEventQueue.cpp \ WAVExtractor.cpp \ diff --git a/media/libstagefright/ThrottledSource.cpp b/media/libstagefright/ThrottledSource.cpp new file mode 100644 index 0000000..4711f7c --- /dev/null +++ b/media/libstagefright/ThrottledSource.cpp @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2010 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. + */ + +#include "include/ThrottledSource.h" + +#include <media/stagefright/MediaDebug.h> + +namespace android { + +static int64_t getNowUs() { + struct timeval tv; + gettimeofday(&tv, NULL); + + return (int64_t)tv.tv_usec + tv.tv_sec * 1000000ll; +} + +ThrottledSource::ThrottledSource( + const sp<DataSource> &source, + int32_t bandwidthLimitBytesPerSecond) + : mSource(source), + mBandwidthLimitBytesPerSecond(bandwidthLimitBytesPerSecond), + mStartTimeUs(-1), + mTotalTransferred(0) { + CHECK(mBandwidthLimitBytesPerSecond > 0); +} + +status_t ThrottledSource::initCheck() const { + return mSource->initCheck(); +} + +ssize_t ThrottledSource::readAt(off_t offset, void *data, size_t size) { + Mutex::Autolock autoLock(mLock); + + ssize_t n = mSource->readAt(offset, data, size); + + if (n <= 0) { + return n; + } + + mTotalTransferred += n; + + int64_t nowUs = getNowUs(); + + if (mStartTimeUs < 0) { + mStartTimeUs = nowUs; + } + + // How long would it have taken to transfer everything we ever + // transferred given the limited bandwidth. + int64_t durationUs = + mTotalTransferred * 1000000ll / mBandwidthLimitBytesPerSecond; + + int64_t whenUs = mStartTimeUs + durationUs; + + if (whenUs > nowUs) { + usleep(whenUs - nowUs); + } + + return n; +} + +status_t ThrottledSource::getSize(off_t *size) { + return mSource->getSize(size); +} + +uint32_t ThrottledSource::flags() { + return mSource->flags(); +} + +} // namespace android + diff --git a/media/libstagefright/include/ThrottledSource.h b/media/libstagefright/include/ThrottledSource.h new file mode 100644 index 0000000..88164b3 --- /dev/null +++ b/media/libstagefright/include/ThrottledSource.h @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2010 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. + */ + +#ifndef THROTTLED_SOURCE_H_ + +#define THROTTLED_SOURCE_H_ + +#include <media/stagefright/DataSource.h> +#include <utils/threads.h> + +namespace android { + +struct ThrottledSource : public DataSource { + ThrottledSource( + const sp<DataSource> &source, + int32_t bandwidthLimitBytesPerSecond); + + virtual status_t initCheck() const; + + virtual ssize_t readAt(off_t offset, void *data, size_t size); + + virtual status_t getSize(off_t *size); + virtual uint32_t flags(); + +private: + Mutex mLock; + + sp<DataSource> mSource; + int32_t mBandwidthLimitBytesPerSecond; + int64_t mStartTimeUs; + size_t mTotalTransferred; + + ThrottledSource(const ThrottledSource &); + ThrottledSource &operator=(const ThrottledSource &); +}; + +} // namespace android + +#endif // THROTTLED_SOURCE_H_ |