Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix an issue where we should allow negative values but did not"

Browse Source
This commit is contained in:
James Dong
2011-10-06 20:38:29 -07:00
committed by Android (Google) Code Review
parent 2e12977ad6 56f71d7dfa
commit f3c0056816
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/libmediaplayerservice/StagefrightRecorder.cpp
View File

@@ -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") {

4
media/libmediaplayerservice/StagefrightRecorder.h
View File

@@ -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();