diff options
author | James Dong <jdong@google.com> | 2011-10-05 20:02:05 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2011-10-05 20:43:52 -0700 |
commit | b832a03d563dd000faa44f2577e92237525edc32 (patch) | |
tree | 8b8732367ca530715553bd1e215a48161581b8a1 /media/libmediaplayerservice | |
parent | ec35a1416472865dbebc22b10199ad718ed2cc95 (diff) | |
download | frameworks_av-b832a03d563dd000faa44f2577e92237525edc32.zip frameworks_av-b832a03d563dd000faa44f2577e92237525edc32.tar.gz frameworks_av-b832a03d563dd000faa44f2577e92237525edc32.tar.bz2 |
Fix an issue where we should allow negative values but did not
Change-Id: Ia8d718b4e6aec4c17db86e30134132f767fd72c5
related-to-bug: 5419527
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 12 | ||||
-rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 6fdb726..6981668 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -554,7 +554,7 @@ status_t StagefrightRecorder::setParamTimeBetweenTimeLapseFrameCapture(int64_t t } status_t StagefrightRecorder::setParamGeoDataLongitude( - int32_t longitudex10000) { + int64_t longitudex10000) { if (longitudex10000 > 1800000 || longitudex10000 < -1800000) { return BAD_VALUE; @@ -564,7 +564,7 @@ status_t StagefrightRecorder::setParamGeoDataLongitude( } status_t StagefrightRecorder::setParamGeoDataLatitude( - int32_t latitudex10000) { + int64_t latitudex10000) { if (latitudex10000 > 900000 || latitudex10000 < -900000) { return BAD_VALUE; @@ -602,13 +602,13 @@ status_t StagefrightRecorder::setParameter( return setParam64BitFileOffset(use64BitOffset != 0); } } else if (key == "param-geotag-longitude") { - int32_t longitudex10000; - if (safe_strtoi32(value.string(), &longitudex10000)) { + int64_t longitudex10000; + if (safe_strtoi64(value.string(), &longitudex10000)) { return setParamGeoDataLongitude(longitudex10000); } } else if (key == "param-geotag-latitude") { - int32_t latitudex10000; - if (safe_strtoi32(value.string(), &latitudex10000)) { + int64_t latitudex10000; + if (safe_strtoi64(value.string(), &latitudex10000)) { return setParamGeoDataLatitude(latitudex10000); } } else if (key == "param-track-time-status") { diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h index 5c5f05c..ec5ce7e 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.h +++ b/media/libmediaplayerservice/StagefrightRecorder.h @@ -173,8 +173,8 @@ private: status_t setParamMaxFileDurationUs(int64_t timeUs); status_t setParamMaxFileSizeBytes(int64_t bytes); status_t setParamMovieTimeScale(int32_t timeScale); - status_t setParamGeoDataLongitude(int32_t longitudex10000); - status_t setParamGeoDataLatitude(int32_t latitudex10000); + status_t setParamGeoDataLongitude(int64_t longitudex10000); + status_t setParamGeoDataLatitude(int64_t latitudex10000); void clipVideoBitRate(); void clipVideoFrameRate(); void clipVideoFrameWidth(); |