Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e46c970c authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

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

parents 1b8ba61c b832a03d

media/libmediaplayerservice/StagefrightRecorder.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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") {

media/libmediaplayerservice/StagefrightRecorder.h

+2 −2
Original line number Diff line number Diff line
@@ -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();