Skip to content

Commit 56f71d7

Browse files
author
James Dong
committed
Fix an issue where we should allow negative values but did not
Change-Id: Ia8d718b4e6aec4c17db86e30134132f767fd72c5 related-to-bug: 5419527
1 parent 26ae7db commit 56f71d7

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

media/libmediaplayerservice/StagefrightRecorder.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ status_t StagefrightRecorder::setParamTimeBetweenTimeLapseFrameCapture(int64_t t
554554
}
555555

556556
status_t StagefrightRecorder::setParamGeoDataLongitude(
557-
int32_t longitudex10000) {
557+
int64_t longitudex10000) {
558558

559559
if (longitudex10000 > 1800000 || longitudex10000 < -1800000) {
560560
return BAD_VALUE;
@@ -564,7 +564,7 @@ status_t StagefrightRecorder::setParamGeoDataLongitude(
564564
}
565565

566566
status_t StagefrightRecorder::setParamGeoDataLatitude(
567-
int32_t latitudex10000) {
567+
int64_t latitudex10000) {
568568

569569
if (latitudex10000 > 900000 || latitudex10000 < -900000) {
570570
return BAD_VALUE;
@@ -602,13 +602,13 @@ status_t StagefrightRecorder::setParameter(
602602
return setParam64BitFileOffset(use64BitOffset != 0);
603603
}
604604
} else if (key == "param-geotag-longitude") {
605-
int32_t longitudex10000;
606-
if (safe_strtoi32(value.string(), &longitudex10000)) {
605+
int64_t longitudex10000;
606+
if (safe_strtoi64(value.string(), &longitudex10000)) {
607607
return setParamGeoDataLongitude(longitudex10000);
608608
}
609609
} else if (key == "param-geotag-latitude") {
610-
int32_t latitudex10000;
611-
if (safe_strtoi32(value.string(), &latitudex10000)) {
610+
int64_t latitudex10000;
611+
if (safe_strtoi64(value.string(), &latitudex10000)) {
612612
return setParamGeoDataLatitude(latitudex10000);
613613
}
614614
} else if (key == "param-track-time-status") {

media/libmediaplayerservice/StagefrightRecorder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ struct StagefrightRecorder : public MediaRecorderBase {
173173
status_t setParamMaxFileDurationUs(int64_t timeUs);
174174
status_t setParamMaxFileSizeBytes(int64_t bytes);
175175
status_t setParamMovieTimeScale(int32_t timeScale);
176-
status_t setParamGeoDataLongitude(int32_t longitudex10000);
177-
status_t setParamGeoDataLatitude(int32_t latitudex10000);
176+
status_t setParamGeoDataLongitude(int64_t longitudex10000);
177+
status_t setParamGeoDataLatitude(int64_t latitudex10000);
178178
void clipVideoBitRate();
179179
void clipVideoFrameRate();
180180
void clipVideoFrameWidth();

0 commit comments

Comments
 (0)