diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraParameters.h | 21 | ||||
| -rw-r--r-- | include/media/mediascanner.h | 5 |
2 files changed, 14 insertions, 12 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index e272839..db81721 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -265,11 +265,12 @@ public: // (-1000,-1000) is the upper left point. (1000, 1000) is the lower right // point. The length and width of focus areas cannot be 0 or negative. // - // The fifth element is the weight. The weight ranges from 1 to 1000. - // The sum of the weights of all focus areas must be 1000. Focus areas - // can partially overlap and the driver will add the weights in the - // overlap region. But apps should not set two focus areas that have - // identical coordinates. + // The fifth element is the weight. Values for weight must range from 1 to + // 1000. The weight should be interpreted as a per-pixel weight - all + // pixels in the area have the specified weight. This means a small area + // with the same weight as a larger area will have less influence on the + // focusing than the larger area. Focus areas can partially overlap and the + // driver will add the weights in the overlap region. // // A special case of single focus area (0,0,0,0,0) means driver to decide // the focus area. For example, the driver may use more signals to decide @@ -327,10 +328,12 @@ public: // is the lower right point. The length and width of metering areas cannot // be 0 or negative. // - // The weight ranges from 1 to 1000. The sum of the weights of all metering - // areas must be 1000. Metering areas can partially overlap and the driver - // will add the weights in the overlap region. But apps should not set two - // metering areas that have identical coordinates. + // The fifth element is the weight. Values for weight must range from 1 to + // 1000. The weight should be interpreted as a per-pixel weight - all + // pixels in the area have the specified weight. This means a small area + // with the same weight as a larger area will have less influence on the + // metering than the larger area. Metering areas can partially overlap and + // the driver will add the weights in the overlap region. // // A special case of all-zero single metering area means driver to decide // the metering area. For example, the driver may use more signals to decide diff --git a/include/media/mediascanner.h b/include/media/mediascanner.h index df5be32..765c039 100644 --- a/include/media/mediascanner.h +++ b/include/media/mediascanner.h @@ -55,7 +55,7 @@ private: status_t doProcessDirectory( char *path, int pathRemaining, MediaScannerClient &client, - ExceptionCheck exceptionCheck, void *exceptionEnv); + bool noMedia, ExceptionCheck exceptionCheck, void *exceptionEnv); MediaScanner(const MediaScanner &); MediaScanner &operator=(const MediaScanner &); @@ -72,10 +72,9 @@ public: void endFile(); virtual bool scanFile(const char* path, long long lastModified, - long long fileSize, bool isDirectory) = 0; + long long fileSize, bool isDirectory, bool noMedia) = 0; virtual bool handleStringTag(const char* name, const char* value) = 0; virtual bool setMimeType(const char* mimeType) = 0; - virtual bool addNoMediaFolder(const char* path) = 0; protected: void convertValues(uint32_t encoding); |