fix the build by fixing more warnings. (ccb067b1) · Commits · e / os / android_frameworks_av

cmds/stagefright/SineSource.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,7 @@ SineSource::~SineSource() {
	}		}
	}		}

	status_t SineSource::start(MetaData *params) {		status_t SineSource::start(MetaData * /* params */) {
	CHECK(!mStarted);		CHECK(!mStarted);

	mGroup = new MediaBufferGroup;		mGroup = new MediaBufferGroup;
	@@ -58,7 +58,7 @@ sp<MetaData> SineSource::getFormat() {
	}		}

	status_t SineSource::read(		status_t SineSource::read(
	MediaBuffer *out, const ReadOptions options) {		MediaBuffer *out, const ReadOptions /* options */) {
	*out = NULL;		*out = NULL;

	MediaBuffer *buffer;		MediaBuffer *buffer;

cmds/stagefright/record.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -296,7 +296,7 @@ int main(int argc, char **argv) {
	}		}
	#else		#else

	int main(int argc, char **argv) {		int main(int /* argc /, char * /* argv */) {
	android::ProcessState::self()->startThreadPool();		android::ProcessState::self()->startThreadPool();

	OMXClient client;		OMXClient client;

media/libmediaplayerservice/StagefrightRecorder.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -243,7 +243,7 @@ status_t StagefrightRecorder::setPreviewSurface(const sp<IGraphicBufferProducer>
	return OK;		return OK;
	}		}

	status_t StagefrightRecorder::setOutputFile(const char *path) {		status_t StagefrightRecorder::setOutputFile(const char * /* path */) {
	ALOGE("setOutputFile(const char*) must not be called");		ALOGE("setOutputFile(const char*) must not be called");
	// We don't actually support this at all, as the media_server process		// We don't actually support this at all, as the media_server process
	// no longer has permissions to create files.		// no longer has permissions to create files.

media/libstagefright/ACodec.cpp

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -2967,7 +2967,8 @@ ACodec::BaseState::BaseState(ACodec *codec, const sp<AState> &parentState)
	mCodec(codec) {		mCodec(codec) {
	}		}

	ACodec::BaseState::PortMode ACodec::BaseState::getPortMode(OMX_U32 portIndex) {		ACodec::BaseState::PortMode ACodec::BaseState::getPortMode(
			OMX_U32 /* portIndex */) {
	return KEEP_BUFFERS;		return KEEP_BUFFERS;
	}		}

	@@ -3376,8 +3377,8 @@ bool ACodec::BaseState::onOMXFillBufferDone(
	size_t rangeOffset, size_t rangeLength,		size_t rangeOffset, size_t rangeLength,
	OMX_U32 flags,		OMX_U32 flags,
	int64_t timeUs,		int64_t timeUs,
	void *platformPrivate,		void * /* platformPrivate */,
	void *dataPtr) {		void * /* dataPtr */) {
	ALOGV("[%s] onOMXFillBufferDone %p time %lld us, flags = 0x%08lx",		ALOGV("[%s] onOMXFillBufferDone %p time %lld us, flags = 0x%08lx",
	mCodec->mComponentName.c_str(), bufferID, timeUs, flags);		mCodec->mComponentName.c_str(), bufferID, timeUs, flags);

	@@ -3910,7 +3911,7 @@ bool ACodec::LoadedState::onConfigureComponent(
	}		}

	void ACodec::LoadedState::onCreateInputSurface(		void ACodec::LoadedState::onCreateInputSurface(
	const sp<AMessage> &msg) {		const sp<AMessage> & /* msg */) {
	ALOGV("onCreateInputSurface");		ALOGV("onCreateInputSurface");

	sp<AMessage> notify = mCodec->mNotify->dup();		sp<AMessage> notify = mCodec->mNotify->dup();
	@@ -4154,7 +4155,7 @@ ACodec::ExecutingState::ExecutingState(ACodec *codec)
	}		}

	ACodec::BaseState::PortMode ACodec::ExecutingState::getPortMode(		ACodec::BaseState::PortMode ACodec::ExecutingState::getPortMode(
	OMX_U32 portIndex) {		OMX_U32 /* portIndex */) {
	return RESUBMIT_BUFFERS;		return RESUBMIT_BUFFERS;
	}		}

media/libstagefright/tests/SurfaceMediaSource_test.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -527,7 +527,8 @@ void SurfaceMediaSourceTest::oneBufferPass(int width, int height ) {
	}		}

	// Dequeuing and queuing the buffer without really filling it in.		// Dequeuing and queuing the buffer without really filling it in.
	void SurfaceMediaSourceTest::oneBufferPassNoFill(int width, int height ) {		void SurfaceMediaSourceTest::oneBufferPassNoFill(
			int /* width /, int / height */) {
	ANativeWindowBuffer* anb;		ANativeWindowBuffer* anb;
	ASSERT_EQ(NO_ERROR, native_window_dequeue_buffer_and_wait(mANW.get(), &anb));		ASSERT_EQ(NO_ERROR, native_window_dequeue_buffer_and_wait(mANW.get(), &anb));
	ASSERT_TRUE(anb != NULL);		ASSERT_TRUE(anb != NULL);