am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument warning messages" (840797f6) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/MediaPlayerFactory.cpp

+11 −11

Original line number	Diff line number	Diff line
		@@ -176,11 +176,11 @@ sp<MediaPlayerBase> MediaPlayerFactory::createPlayer(
		class StagefrightPlayerFactory :
		public MediaPlayerFactory::IFactory {
		public:
		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		virtual float scoreFactory(const sp<IMediaPlayer>& /client/,
		int fd,
		int64_t offset,
		int64_t length,
		float curScore) {
		int64_t /length/,
		float /curScore/) {
		char buf[20];
		lseek(fd, offset, SEEK_SET);
		read(fd, buf, sizeof(buf));
		@@ -203,7 +203,7 @@ class StagefrightPlayerFactory :

		class NuPlayerFactory : public MediaPlayerFactory::IFactory {
		public:
		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		virtual float scoreFactory(const sp<IMediaPlayer>& /client/,
		const char* url,
		float curScore) {
		static const float kOurScore = 0.8;
		@@ -235,9 +235,9 @@ class NuPlayerFactory : public MediaPlayerFactory::IFactory {
		return 0.0;
		}

		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		const sp<IStreamSource> &source,
		float curScore) {
		virtual float scoreFactory(const sp<IMediaPlayer>& /client/,
		const sp<IStreamSource>& /source/,
		float /curScore/) {
		return 1.0;
		}

		@@ -249,7 +249,7 @@ class NuPlayerFactory : public MediaPlayerFactory::IFactory {

		class SonivoxPlayerFactory : public MediaPlayerFactory::IFactory {
		public:
		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		virtual float scoreFactory(const sp<IMediaPlayer>& /client/,
		const char* url,
		float curScore) {
		static const float kOurScore = 0.4;
		@@ -280,7 +280,7 @@ class SonivoxPlayerFactory : public MediaPlayerFactory::IFactory {
		return 0.0;
		}

		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		virtual float scoreFactory(const sp<IMediaPlayer>& /client/,
		int fd,
		int64_t offset,
		int64_t length,
		@@ -318,9 +318,9 @@ class SonivoxPlayerFactory : public MediaPlayerFactory::IFactory {

		class TestPlayerFactory : public MediaPlayerFactory::IFactory {
		public:
		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		virtual float scoreFactory(const sp<IMediaPlayer>& /client/,
		const char* url,
		float curScore) {
		float /curScore/) {
		if (TestPlayerStub::canBeUsed(url)) {
		return 1.0;
		}

media/libmediaplayerservice/MediaPlayerFactory.h

+13 −13

Original line number	Diff line number	Diff line
		@@ -29,19 +29,19 @@ class MediaPlayerFactory {
		public:
		virtual ~IFactory() { }

		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		const char* url,
		float curScore) { return 0.0; }

		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		int fd,
		int64_t offset,
		int64_t length,
		float curScore) { return 0.0; }

		virtual float scoreFactory(const sp<IMediaPlayer>& client,
		const sp<IStreamSource> &source,
		float curScore) { return 0.0; }
		virtual float scoreFactory(const sp<IMediaPlayer>& /client/,
		const char* /url/,
		float /curScore/) { return 0.0; }

		virtual float scoreFactory(const sp<IMediaPlayer>& /client/,
		int /fd/,
		int64_t /offset/,
		int64_t /length/,
		float /curScore/) { return 0.0; }

		virtual float scoreFactory(const sp<IMediaPlayer>& /client/,
		const sp<IStreamSource> &/source/,
		float /curScore/) { return 0.0; }

		virtual sp<MediaPlayerBase> createPlayer() = 0;
		};

media/libmediaplayerservice/MetadataRetrieverClient.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ MetadataRetrieverClient::~MetadataRetrieverClient()
		disconnect();
		}

		status_t MetadataRetrieverClient::dump(int fd, const Vector<String16>& args) const
		status_t MetadataRetrieverClient::dump(int fd, const Vector<String16>& /args/) const
		{
		const size_t SIZE = 256;
		char buffer[SIZE];

media/libmediaplayerservice/MidiFile.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ public:

		virtual status_t setDataSource(int fd, int64_t offset, int64_t length);
		virtual status_t setVideoSurfaceTexture(
		const sp<IGraphicBufferProducer>& bufferProducer)
		const sp<IGraphicBufferProducer>& /bufferProducer/)
		{ return UNKNOWN_ERROR; }
		virtual status_t prepare();
		virtual status_t prepareAsync();
		@@ -53,13 +53,13 @@ public:
		virtual status_t reset();
		virtual status_t setLooping(int loop);
		virtual player_type playerType() { return SONIVOX_PLAYER; }
		virtual status_t invoke(const Parcel& request, Parcel *reply) {
		virtual status_t invoke(const Parcel& /request/, Parcel* /reply/) {
		return INVALID_OPERATION;
		}
		virtual status_t setParameter(int key, const Parcel &request) {
		virtual status_t setParameter(int /key/, const Parcel &/request/) {
		return INVALID_OPERATION;
		}
		virtual status_t getParameter(int key, Parcel *reply) {
		virtual status_t getParameter(int /key/, Parcel* /reply/) {
		return INVALID_OPERATION;
		}