tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "bug fix: handle multiple port settings change events signalled at once" into oc-dev

Browse source 
am: f8677dcfdb

Change-Id: If65c243e72e890660fc4481b375b23ba109ae577
This commit is contained in:
Ram Mohan M 2017-09-07 23:40:43 +00:00 committed by android-build-merger
commit 37b490df35
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp
View file

@ -498,6 +498,21 @@ void portReconfiguration(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
ASSERT_EQ(msg.data.eventData.data1, kPortIndexOutput);
if (msg.data.eventData.data2 == OMX_IndexParamPortDefinition ||
msg.data.eventData.data2 == 0) {
// Components can send various kinds of port settings changed events
// all at once. Before committing to a full port reconfiguration,
// defer any events waiting in the queue to be addressed to a later
// point.
android::List<Message> msgQueueDefer;
while (1) {
status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT,
iBuffer, oBuffer);
if (status !=
android::hardware::media::omx::V1_0::Status::TIMED_OUT) {
msgQueueDefer.push_back(msg);
continue;
} else
break;
}
status = omxNode->sendCommand(
toRawCommandType(OMX_CommandPortDisable), kPortIndexOutput);
ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::OK);
@ -577,6 +592,16 @@ void portReconfiguration(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
ASSERT_EQ(msg.data.eventData.data1, OMX_CommandPortEnable);
ASSERT_EQ(msg.data.eventData.data2, kPortIndexOutput);
// Push back deferred messages to the list
android::List<Message>::iterator it = msgQueueDefer.begin();
while (it != msgQueueDefer.end()) {
status = omxNode->dispatchMessage(*it);
ASSERT_EQ(
status,
::android::hardware::media::omx::V1_0::Status::OK);
it++;
}
// dispatch output buffers
for (size_t i = 0; i < oBuffer->size(); i++) {
dispatchOutputBuffer(omxNode, oBuffer, i, oPortMode);