Merge "libstagefright: remove CHECK from SoftHEVC ctor." into mnc-dev (4d9492f1) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/hevcdec/SoftHEVC.cpp

+10 −2

Original line number	Diff line number	Diff line
		@@ -82,7 +82,10 @@ SoftHEVC::SoftHEVC(
		initPorts(
		kNumBuffers, max(kMaxOutputBufferSize / kMinCompressionRatio, (size_t)INPUT_BUF_SIZE),
		kNumBuffers, CODEC_MIME_TYPE, kMinCompressionRatio);
		CHECK_EQ(initDecoder(), (status_t)OK);
		}

		status_t SoftHEVC::init() {
		return initDecoder();
		}

		SoftHEVC::~SoftHEVC() {
		@@ -766,5 +769,10 @@ void SoftHEVC::onQueueFilled(OMX_U32 portIndex) {
		android::SoftOMXComponent createSoftOMXComponent(const char name,
		const OMX_CALLBACKTYPE *callbacks, OMX_PTR appData,
		OMX_COMPONENTTYPE **component) {
		return new android::SoftHEVC(name, callbacks, appData, component);
		android::SoftHEVC *codec = new android::SoftHEVC(name, callbacks, appData, component);
		if (codec->init() != android::OK) {
		android::sp<android::SoftOMXComponent> release = codec;
		return NULL;
		}
		return codec;
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,8 @@ struct SoftHEVC: public SoftVideoDecoderOMXComponent {
		SoftHEVC(const char name, const OMX_CALLBACKTYPE callbacks,
		OMX_PTR appData, OMX_COMPONENTTYPE **component);

		status_t init();

		protected:
		virtual ~SoftHEVC();