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

Merge "Set crop params to ANative Window during Initialization."

Browse Source
This commit is contained in:
Andreas Huber
2011-10-05 10:36:20 -07:00
committed by Android (Google) Code Review
parent ff1cd56a79 db62a245f9
commit 50dabc5f0e
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/media/stagefright/OMXCodec.h
View File

@@ -319,6 +319,8 @@ private:
void initOutputFormat(const sp<MetaData> &inputFormat); void initOutputFormat(const sp<MetaData> &inputFormat);
status_t initNativeWindow(); status_t initNativeWindow();
void initNativeWindowCrop();
void dumpPortStatus(OMX_U32 portIndex); void dumpPortStatus(OMX_U32 portIndex);
status_t configureCodec(const sp<MetaData> &meta); status_t configureCodec(const sp<MetaData> &meta);

38
media/libstagefright/OMXCodec.cpp
View File

@@ -2351,22 +2351,6 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) {
formatHasNotablyChanged(oldOutputFormat, mOutputFormat)) { formatHasNotablyChanged(oldOutputFormat, mOutputFormat)) {
mOutputPortSettingsHaveChanged = true; mOutputPortSettingsHaveChanged = true;
if (mNativeWindow != NULL) {
int32_t left, top, right, bottom;
CHECK(mOutputFormat->findRect(
kKeyCropRect,
&left, &top, &right, &bottom));
android_native_rect_t crop;
crop.left = left;
crop.top = top;
crop.right = right + 1;
crop.bottom = bottom + 1;
// We'll ignore any errors here, if the surface is
// already invalid, we'll know soon enough.
native_window_set_crop(mNativeWindow.get(), &crop);
}
} else if (data2 == OMX_IndexConfigCommonScale) { } else if (data2 == OMX_IndexConfigCommonScale) {
OMX_CONFIG_SCALEFACTORTYPE scale; OMX_CONFIG_SCALEFACTORTYPE scale;
InitOMXParams(&scale); InitOMXParams(&scale);
@@ -4183,6 +4167,24 @@ status_t OMXCodec::initNativeWindow() {
return OK; return OK;
} }
void OMXCodec::initNativeWindowCrop() {
int32_t left, top, right, bottom;
CHECK(mOutputFormat->findRect(
kKeyCropRect,
&left, &top, &right, &bottom));
android_native_rect_t crop;
crop.left = left;
crop.top = top;
crop.right = right + 1;
crop.bottom = bottom + 1;
// We'll ignore any errors here, if the surface is
// already invalid, we'll know soon enough.
native_window_set_crop(mNativeWindow.get(), &crop);
}
void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) { void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) {
mOutputFormat = new MetaData; mOutputFormat = new MetaData;
mOutputFormat->setCString(kKeyDecoderComponent, mComponentName); mOutputFormat->setCString(kKeyDecoderComponent, mComponentName);
@@ -4366,6 +4368,10 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) {
video_def->nFrameWidth - 1, video_def->nFrameWidth - 1,
video_def->nFrameHeight - 1); video_def->nFrameHeight - 1);
} }
if (mNativeWindow != NULL) {
initNativeWindowCrop();
}
} }
break; break;
} }