Merge "NdkMediaCodec: Return NULL if the MediaCodec cannot be created" into mnc-dev (c0239eca) · Commits · e / os / android_frameworks_av

media/ndk/NdkMediaCodec.cpp

+17 −9

Original line number	Diff line number	Diff line
		@@ -154,6 +154,10 @@ static AMediaCodec * createAMediaCodec(const char *name, bool name_is_type, bool
		} else {
		mData->mCodec = android::MediaCodec::CreateByComponentName(mData->mLooper, name);
		}
		if (mData->mCodec == NULL) { // failed to create codec
		AMediaCodec_delete(mData);
		return NULL;
		}
		mData->mHandler = new CodecHandler(mData);
		mData->mLooper->registerHandler(mData->mHandler);
		mData->mGeneration = 1;
		@@ -180,17 +184,21 @@ AMediaCodec* AMediaCodec_createEncoderByType(const char *name) {

		EXPORT
		media_status_t AMediaCodec_delete(AMediaCodec *mData) {
		if (mData != NULL) {
		if (mData->mCodec != NULL) {
		mData->mCodec->release();
		mData->mCodec.clear();
		}

		if (mData->mLooper != NULL) {
		if (mData->mHandler != NULL) {
		mData->mLooper->unregisterHandler(mData->mHandler->id());
		}
		mData->mLooper->stop();
		mData->mLooper.clear();
		}
		delete mData;
		}
		return AMEDIA_OK;
		}