| commit | 4793ecdd638d48f73e5127e4857ffa189b5cad76 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 14 19:33:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 14 19:33:41 2020 +0000 |
| tree | 44f1ced7b42c2685907302116c5a0208c3d86e74 | |
| parent | 255f610f5ab71b5e36d93744dfe058daf6c96041 [diff] | |
| parent | ac81ff8387b9683ebf3c929c50c0cdc28d3a42b2 [diff] |
Merge "benchmark: Fix NPD in Encode::deInitCodec()" am: ba385271f7 am: b932492244 am: ac81ff8387 Change-Id: Ibf2aa69cc07dff9a0686a846a76681b193e52856
diff --git a/media/tests/benchmark/src/native/encoder/Encoder.cpp b/media/tests/benchmark/src/native/encoder/Encoder.cpp index f119cf3..8dc7cc6 100644 --- a/media/tests/benchmark/src/native/encoder/Encoder.cpp +++ b/media/tests/benchmark/src/native/encoder/Encoder.cpp
@@ -159,6 +159,7 @@ AMediaFormat_delete(mFormat); mFormat = nullptr; } + if (!mCodec) return; AMediaCodec_stop(mCodec); AMediaCodec_delete(mCodec); int64_t eTime = mStats->getCurTime();