Merge "aac: set initial timestamp to zero" (bdf22197) · Commits · e / os / android_frameworks_av

media/codec2/components/aac/C2SoftAacEnc.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ C2SoftAacEnc::C2SoftAacEnc(
		mSentCodecSpecificData(false),
		mInputTimeSet(false),
		mInputSize(0),
		mInputTimeUs(-1ll),
		mInputTimeUs(0),
		mSignalledError(false),
		mOutIndex(0u) {
		}
		@@ -179,7 +179,7 @@ c2_status_t C2SoftAacEnc::onStop() {
		mSentCodecSpecificData = false;
		mInputTimeSet = false;
		mInputSize = 0u;
		mInputTimeUs = -1ll;
		mInputTimeUs = 0;
		mSignalledError = false;
		return C2_OK;
		}
		@@ -197,6 +197,7 @@ c2_status_t C2SoftAacEnc::onFlush_sm() {
		mSentCodecSpecificData = false;
		mInputTimeSet = false;
		mInputSize = 0u;
		mInputTimeUs = 0;
		return C2_OK;
		}

		@@ -558,6 +559,7 @@ c2_status_t C2SoftAacEnc::drain(
		mSentCodecSpecificData = false;
		mInputTimeSet = false;
		mInputSize = 0u;
		mInputTimeUs = 0;

		// TODO: we don't have any pending work at this time to drain.
		return C2_OK;