Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a4fe2aca: Merge change 25128 into eclair

Browse Source 
Merge commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379' into eclair-plus-aosp

* commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379':
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
This commit is contained in:
Andreas Huber
2009-09-15 14:51:30 -07:00
committed by Android Git Automerger
parent 1198aa27f1 a4fe2aca52
commit ecbcbf32b0
3 changed files with 111 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/media/stagefright/SoftwareRenderer.h
View File

@@ -18,6 +18,7 @@
#define SOFTWARE_RENDERER_H_
#include <OMX_Video.h>
#include <media/stagefright/VideoRenderer.h>
#include <utils/RefBase.h>
@@ -29,6 +30,7 @@ class MemoryHeapBase;
class SoftwareRenderer : public VideoRenderer {
public:
SoftwareRenderer(
OMX_COLOR_FORMATTYPE colorFormat,
const sp<ISurface> &surface,
size_t displayWidth, size_t displayHeight,
size_t decodedWidth, size_t decodedHeight);
@@ -39,6 +41,12 @@ public:
const void *data, size_t size, void *platformPrivate);
private:
uint8_t *initClip();
void renderCbYCrY(const void *data, size_t size);
void renderYUV420Planar(const void *data, size_t size);
OMX_COLOR_FORMATTYPE mColorFormat;
sp<ISurface> mISurface;
size_t mDisplayWidth, mDisplayHeight;
size_t mDecodedWidth, mDecodedHeight;
@@ -46,6 +54,8 @@ private:
sp<MemoryHeapBase> mMemoryHeap;
int mIndex;
uint8_t *mClip;
SoftwareRenderer(const SoftwareRenderer &);
SoftwareRenderer &operator=(const SoftwareRenderer &);
};

1
media/libstagefright/omx/OMX.cpp
View File

@@ -609,6 +609,7 @@ sp<IOMXRenderer> OMX::createRenderer(
} else {
LOGW("Using software renderer.");
impl = new SoftwareRenderer(
colorFormat,
surface,
displayWidth, displayHeight,
encodedWidth, encodedHeight);

115
media/libstagefright/omx/SoftwareRenderer.cpp
View File

@@ -27,17 +27,20 @@ namespace android {
#define QCOM_YUV 0
SoftwareRenderer::SoftwareRenderer(
OMX_COLOR_FORMATTYPE colorFormat,
const sp<ISurface> &surface,
size_t displayWidth, size_t displayHeight,
size_t decodedWidth, size_t decodedHeight)
: mISurface(surface),
: mColorFormat(colorFormat),
mISurface(surface),
mDisplayWidth(displayWidth),
mDisplayHeight(displayHeight),
mDecodedWidth(decodedWidth),
mDecodedHeight(decodedHeight),
mFrameSize(mDecodedWidth * mDecodedHeight * 2), // RGB565
mMemoryHeap(new MemoryHeapBase(2 * mFrameSize)),
mIndex(0) {
mIndex(0),
mClip(NULL) {
CHECK(mISurface.get() != NULL);
CHECK(mDecodedWidth > 0);
CHECK(mDecodedHeight > 0);
@@ -55,29 +58,37 @@ SoftwareRenderer::SoftwareRenderer(
SoftwareRenderer::~SoftwareRenderer() {
mISurface->unregisterBuffers();
delete[] mClip;
mClip = NULL;
}
void SoftwareRenderer::render(
const void *data, size_t size, void *platformPrivate) {
switch (mColorFormat) {
case OMX_COLOR_FormatYUV420Planar:
return renderYUV420Planar(data, size);
case OMX_COLOR_FormatCbYCrY:
return renderCbYCrY(data, size);
default:
{
LOGW("Cannot render color format %ld", mColorFormat);
break;
}
}
}
void SoftwareRenderer::renderYUV420Planar(
const void *data, size_t size) {
if (size != (mDecodedHeight * mDecodedWidth * 3) / 2) {
LOGE("size is %d, expected %d",
size, (mDecodedHeight * mDecodedWidth * 3) / 2);
}
CHECK(size >= (mDecodedWidth * mDecodedHeight * 3) / 2);
static const signed kClipMin = -278;
static const signed kClipMax = 535;
static uint8_t kClip[kClipMax - kClipMin + 1];
static uint8_t *kAdjustedClip = &kClip[-kClipMin];
static bool clipInitialized = false;
if (!clipInitialized) {
for (signed i = kClipMin; i <= kClipMax; ++i) {
kClip[i - kClipMin] = (i < 0) ? 0 : (i > 255) ? 255 : (uint8_t)i;
}
clipInitialized = true;
}
uint8_t *kAdjustedClip = initClip();
size_t offset = mIndex * mFrameSize;
@@ -172,4 +183,78 @@ void SoftwareRenderer::render(
mIndex = 1 - mIndex;
}
void SoftwareRenderer::renderCbYCrY(
const void *data, size_t size) {
if (size != (mDecodedHeight * mDecodedWidth * 2)) {
LOGE("size is %d, expected %d",
size, (mDecodedHeight * mDecodedWidth * 2));
}
CHECK(size >= (mDecodedWidth * mDecodedHeight * 2));
uint8_t *kAdjustedClip = initClip();
size_t offset = mIndex * mFrameSize;
void *dst = (uint8_t *)mMemoryHeap->getBase() + offset;
uint32_t *dst_ptr = (uint32_t *)dst;
const uint8_t *src = (const uint8_t *)data;
for (size_t y = 0; y < mDecodedHeight; ++y) {
for (size_t x = 0; x < mDecodedWidth; x += 2) {
signed y1 = (signed)src[2 * x + 1] - 16;
signed y2 = (signed)src[2 * x + 3] - 16;
signed u = (signed)src[2 * x] - 128;
signed v = (signed)src[2 * x + 2] - 128;
signed u_b = u * 517;
signed u_g = -u * 100;
signed v_g = -v * 208;
signed v_r = v * 409;
signed tmp1 = y1 * 298;
signed b1 = (tmp1 + u_b) / 256;
signed g1 = (tmp1 + v_g + u_g) / 256;
signed r1 = (tmp1 + v_r) / 256;
signed tmp2 = y2 * 298;
signed b2 = (tmp2 + u_b) / 256;
signed g2 = (tmp2 + v_g + u_g) / 256;
signed r2 = (tmp2 + v_r) / 256;
uint32_t rgb1 =
((kAdjustedClip[r1] >> 3) << 11)
| ((kAdjustedClip[g1] >> 2) << 5)
| (kAdjustedClip[b1] >> 3);
uint32_t rgb2 =
((kAdjustedClip[r2] >> 3) << 11)
| ((kAdjustedClip[g2] >> 2) << 5)
| (kAdjustedClip[b2] >> 3);
dst_ptr[x / 2] = (rgb2 << 16) | rgb1;
}
src += mDecodedWidth * 2;
dst_ptr += mDecodedWidth / 2;
}
mISurface->postBuffer(offset);
mIndex = 1 - mIndex;
}
uint8_t *SoftwareRenderer::initClip() {
static const signed kClipMin = -278;
static const signed kClipMax = 535;
if (mClip == NULL) {
mClip = new uint8_t[kClipMax - kClipMin + 1];
for (signed i = kClipMin; i <= kClipMax; ++i) {
mClip[i - kClipMin] = (i < 0) ? 0 : (i > 255) ? 255 : (uint8_t)i;
}
}
return &mClip[-kClipMin];
}
} // namespace android