diff options
| author | James Dong <jdong@google.com> | 2012-08-24 10:53:31 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-08-24 13:10:16 -0700 |
| commit | aa8879d381918335c9d829fc279b76d53a15a550 (patch) | |
| tree | 0ec909da8db12815112ba15ba266d1093ff91de8 /include | |
| parent | 9a150640a28d3fa5507a590125a6c004681bb221 (diff) | |
| download | frameworks_av-aa8879d381918335c9d829fc279b76d53a15a550.zip frameworks_av-aa8879d381918335c9d829fc279b76d53a15a550.tar.gz frameworks_av-aa8879d381918335c9d829fc279b76d53a15a550.tar.bz2 | |
Fixed a native crash due to unexpected state at destroy time when encoder component's source fails to start
o Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able
to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder
ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in
OMXCodec's constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to
bring the state of the encoder component back to the expected state.
o related-to-bug: 7045494
Change-Id: I6d4a221eb809d7137f53e58098a04816998f7a25
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index bb9e595..e6739ae 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -354,6 +354,8 @@ private: const void *data, size_t size, unsigned *profile, unsigned *level); + status_t stopOmxComponent_l(); + OMXCodec(const OMXCodec &); OMXCodec &operator=(const OMXCodec &); }; |