diff options
| author | Lajos Molnar <lajos@google.com> | 2014-06-24 17:56:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-24 17:32:49 +0000 |
| commit | bc0c2c2d2a4cc058ab404f940f0ca65f595e047b (patch) | |
| tree | 13bd35a2315fb7ac4b6c7ae85c980ea420bc95c4 | |
| parent | 940c688d76828ffd83929c661e75b5197903d30f (diff) | |
| parent | fd1e188dc142a8a7adf36e854aa60464faedf0a0 (diff) | |
| download | frameworks_av-bc0c2c2d2a4cc058ab404f940f0ca65f595e047b.zip frameworks_av-bc0c2c2d2a4cc058ab404f940f0ca65f595e047b.tar.gz frameworks_av-bc0c2c2d2a4cc058ab404f940f0ca65f595e047b.tar.bz2 | |
Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"
| -rw-r--r-- | media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp index eb9fcf7..20a7076 100644 --- a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp +++ b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp @@ -177,18 +177,19 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::internalGetParameter( { OMX_VIDEO_PARAM_PROFILELEVELTYPE *profileLevel = (OMX_VIDEO_PARAM_PROFILELEVELTYPE *) params; + OMX_U32 profileIndex = profileLevel->nProfileIndex; if (profileLevel->nPortIndex != kInputPortIndex) { ALOGE("Invalid port index: %" PRIu32, profileLevel->nPortIndex); return OMX_ErrorUnsupportedIndex; } - if (index >= mNumProfileLevels) { + if (profileIndex >= mNumProfileLevels) { return OMX_ErrorNoMore; } - profileLevel->eProfile = mProfileLevels[index].mProfile; - profileLevel->eLevel = mProfileLevels[index].mLevel; + profileLevel->eProfile = mProfileLevels[profileIndex].mProfile; + profileLevel->eLevel = mProfileLevels[profileIndex].mLevel; return OMX_ErrorNone; } |