Merge "C2SoftHevcEnc: Do not initialize encoder in onInit()" into qt-dev (5ad8e945) · Commits · e / devices / smdk4412 / android_frameworks_av

media/codec2/components/hevc/C2SoftHevcEnc.cpp

+5 −9

Original line number	Original line	Diff line number	Diff line
	@@ -390,27 +390,23 @@ C2SoftHevcEnc::C2SoftHevcEnc(const char* name, c2_node_id_t id,
	}		}

	C2SoftHevcEnc::~C2SoftHevcEnc() {		C2SoftHevcEnc::~C2SoftHevcEnc() {
	releaseEncoder();		onRelease();
	}		}

	c2_status_t C2SoftHevcEnc::onInit() {		c2_status_t C2SoftHevcEnc::onInit() {
	return initEncoder();		return C2_OK;
	}		}

	c2_status_t C2SoftHevcEnc::onStop() {		c2_status_t C2SoftHevcEnc::onStop() {
	if (!mStarted) {
	return C2_OK;		return C2_OK;
	}		}
	return releaseEncoder();
	}

	void C2SoftHevcEnc::onReset() {		void C2SoftHevcEnc::onReset() {
	onStop();		releaseEncoder();
	initEncoder();
	}		}

	void C2SoftHevcEnc::onRelease() {		void C2SoftHevcEnc::onRelease() {
	onStop();		releaseEncoder();
	}		}

	c2_status_t C2SoftHevcEnc::onFlush_sm() {		c2_status_t C2SoftHevcEnc::onFlush_sm() {