Merge "Fix unused-parameter warnings"
diff --git a/cmds/stagefright/SimplePlayer.h b/cmds/stagefright/SimplePlayer.h
index ae9dfd2..0d8c74a 100644
--- a/cmds/stagefright/SimplePlayer.h
+++ b/cmds/stagefright/SimplePlayer.h
@@ -22,7 +22,7 @@
struct ABuffer;
struct ALooper;
-struct AudioTrack;
+class AudioTrack;
class IGraphicBufferProducer;
struct MediaCodec;
struct NuMediaExtractor;
diff --git a/include/camera/CameraParameters2.h b/include/camera/CameraParameters2.h
index 88ad812..f691cd6 100644
--- a/include/camera/CameraParameters2.h
+++ b/include/camera/CameraParameters2.h
@@ -151,7 +151,7 @@
}
ssize_t removeItem(const KeyT& key) {
- size_t vectorIdx = (size_t) indexOfKey(key);
+ ssize_t vectorIdx = indexOfKey(key);
if (vectorIdx < 0) {
return vectorIdx;
diff --git a/include/media/IMediaPlayerService.h b/include/media/IMediaPlayerService.h
index 8266b0b..f21bb3a 100644
--- a/include/media/IMediaPlayerService.h
+++ b/include/media/IMediaPlayerService.h
@@ -32,7 +32,7 @@
namespace android {
struct IHDCP;
-struct IMediaCodecList;
+class IMediaCodecList;
struct IMediaHTTPService;
class IMediaRecorder;
class IOMX;
diff --git a/include/media/MediaCodecInfo.h b/include/media/MediaCodecInfo.h
index 48d0407..6b50f22 100644
--- a/include/media/MediaCodecInfo.h
+++ b/include/media/MediaCodecInfo.h
@@ -74,7 +74,7 @@
DISALLOW_EVIL_CONSTRUCTORS(Capabilities);
- friend class MediaCodecInfo;
+ friend struct MediaCodecInfo;
};
// Use a subclass to allow setting fields on construction without allowing
@@ -136,7 +136,7 @@
DISALLOW_EVIL_CONSTRUCTORS(MediaCodecInfo);
- friend class MediaCodecList;
+ friend struct MediaCodecList;
friend class MediaCodecListOverridesTest;
};
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index 7b3e71c..b59319c 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -35,7 +35,7 @@
namespace android {
struct ABuffer;
-struct MemoryDealer;
+class MemoryDealer;
struct DescribeColorFormat2Params;
struct DataConverter;
diff --git a/include/media/stagefright/FrameRenderTracker.h b/include/media/stagefright/FrameRenderTracker.h
index 8396657..327d260 100644
--- a/include/media/stagefright/FrameRenderTracker.h
+++ b/include/media/stagefright/FrameRenderTracker.h
@@ -82,7 +82,7 @@
sp<GraphicBuffer> mGraphicBuffer;
sp<Fence> mFence;
- friend class FrameRenderTracker;
+ friend struct FrameRenderTracker;
};
FrameRenderTracker();
diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h
index 8f0eaa7..a8ba095 100644
--- a/include/media/stagefright/MPEG4Writer.h
+++ b/include/media/stagefright/MPEG4Writer.h
@@ -27,7 +27,7 @@
namespace android {
-class AMessage;
+struct AMessage;
class MediaBuffer;
class MetaData;
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h
index 497974d..d18aad8 100644
--- a/include/media/stagefright/MediaCodec.h
+++ b/include/media/stagefright/MediaCodec.h
@@ -36,11 +36,11 @@
class IBatteryStats;
struct ICrypto;
class IMemory;
-struct MemoryDealer;
+class MemoryDealer;
class IResourceManagerClient;
class IResourceManagerService;
struct PersistentSurface;
-struct SoftwareRenderer;
+class SoftwareRenderer;
class Surface;
struct MediaCodec : public AHandler {
diff --git a/include/media/stagefright/MediaExtractor.h b/include/media/stagefright/MediaExtractor.h
index 85cee53..f383e72 100644
--- a/include/media/stagefright/MediaExtractor.h
+++ b/include/media/stagefright/MediaExtractor.h
@@ -24,7 +24,7 @@
namespace android {
class DataSource;
-class MediaSource;
+struct MediaSource;
class MetaData;
class MediaExtractor : public BnMediaExtractor {
diff --git a/include/media/stagefright/MediaFilter.h b/include/media/stagefright/MediaFilter.h
index d0a572c..5725f88 100644
--- a/include/media/stagefright/MediaFilter.h
+++ b/include/media/stagefright/MediaFilter.h
@@ -23,7 +23,7 @@
struct ABuffer;
struct GraphicBufferListener;
-struct MemoryDealer;
+class MemoryDealer;
struct SimpleFilter;
struct MediaFilter : public CodecBase {
diff --git a/include/media/stagefright/NuMediaExtractor.h b/include/media/stagefright/NuMediaExtractor.h
index 03e2185..dd31447 100644
--- a/include/media/stagefright/NuMediaExtractor.h
+++ b/include/media/stagefright/NuMediaExtractor.h
@@ -34,7 +34,7 @@
class DataSource;
struct IMediaHTTPService;
class MediaBuffer;
-struct MediaExtractor;
+class MediaExtractor;
struct MediaSource;
class MetaData;
diff --git a/media/libmediaplayerservice/MediaRecorderClient.h b/media/libmediaplayerservice/MediaRecorderClient.h
index eceb653..b2d0f0e 100644
--- a/media/libmediaplayerservice/MediaRecorderClient.h
+++ b/media/libmediaplayerservice/MediaRecorderClient.h
@@ -22,7 +22,7 @@
namespace android {
-class MediaRecorderBase;
+struct MediaRecorderBase;
class MediaPlayerService;
class ICameraRecordingProxy;
class IGraphicBufferProducer;
diff --git a/media/ndk/NdkMediaExtractor.cpp b/media/ndk/NdkMediaExtractor.cpp
index 89f2d9c..805eafb 100644
--- a/media/ndk/NdkMediaExtractor.cpp
+++ b/media/ndk/NdkMediaExtractor.cpp
@@ -86,7 +86,6 @@
jobject service = NULL;
if (env == NULL) {
ALOGE("setDataSource(path) must be called from Java thread");
- env->ExceptionClear();
return AMEDIA_ERROR_UNSUPPORTED;
}