am 693a430c: am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders
Merge commit '693a430cff3c9fac503b5005e9fd5419611eddde'
* commit '693a430cff3c9fac503b5005e9fd5419611eddde':
Ignore errors from correction parameter query and config for M4v and H263 encoders
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index ccb614c..7a29bd2 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -999,7 +999,10 @@
status_t err = mOMX->getParameter(
mNode, OMX_IndexParamVideoErrorCorrection,
&errorCorrectionType, sizeof(errorCorrectionType));
- CHECK_EQ(err, OK);
+ if (err != OK) {
+ LOGW("Error correction param query is not supported");
+ return OK; // Optional feature. Ignore this failure
+ }
errorCorrectionType.bEnableHEC = OMX_FALSE;
errorCorrectionType.bEnableResync = OMX_TRUE;
@@ -1010,7 +1013,11 @@
err = mOMX->setParameter(
mNode, OMX_IndexParamVideoErrorCorrection,
&errorCorrectionType, sizeof(errorCorrectionType));
- CHECK_EQ(err, OK);
+ if (err != OK) {
+ LOGW("Error correction param configuration is not supported");
+ }
+
+ // Optional feature. Ignore the failure.
return OK;
}