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

am bf8ecd7c: Merge change 22991 into eclair

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

* commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be':
  Apparently setting the preferred role of the OMX component is now required on this platform.
This commit is contained in:
Andreas Huber
2009-08-27 16:35:43 -07:00
committed by Android Git Automerger
parent 870333b1e3 bf8ecd7c7e
commit 1a66583fea
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media/libstagefright/OMXCodec.cpp
View File

@@ -499,15 +499,25 @@ void OMXCodec::setVideoOutputFormat(
// Enabling this code appears to be the right thing(tm), but,... // Enabling this code appears to be the right thing(tm), but,...
// the TI decoder then loses the ability to output YUV420 and only outputs // the TI decoder then loses the ability to output YUV420 and only outputs
// YCbYCr (16bit) // YCbYCr (16bit)
#if 1 #if 1
if (!strcmp("OMX.TI.Video.Decoder", mComponentName) if (!strcmp("OMX.TI.Video.Decoder", mComponentName)) {
&& !strcasecmp("video/avc", mime)) {
OMX_PARAM_COMPONENTROLETYPE role; OMX_PARAM_COMPONENTROLETYPE role;
role.nSize = sizeof(role); role.nSize = sizeof(role);
role.nVersion.s.nVersionMajor = 1; role.nVersion.s.nVersionMajor = 1;
role.nVersion.s.nVersionMinor = 1; role.nVersion.s.nVersionMinor = 1;
strncpy((char *)role.cRole, "video_decoder.avc",
OMX_MAX_STRINGNAME_SIZE - 1); if (!strcasecmp("video/avc", mime)) {
strncpy((char *)role.cRole, "video_decoder.avc",
OMX_MAX_STRINGNAME_SIZE - 1);
} else if (!strcasecmp("video/mp4v-es", mime)) {
strncpy((char *)role.cRole, "video_decoder.mpeg4",
OMX_MAX_STRINGNAME_SIZE - 1);
} else if (!strcasecmp("video/3gpp", mime)) {
strncpy((char *)role.cRole, "video_decoder.h263",
OMX_MAX_STRINGNAME_SIZE - 1);
}
role.cRole[OMX_MAX_STRINGNAME_SIZE - 1] = '\0'; role.cRole[OMX_MAX_STRINGNAME_SIZE - 1] = '\0';
status_t err = mOMX->set_parameter( status_t err = mOMX->set_parameter(