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

Commit 7bfe5939 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5801051 from 9c6f37fa to qt-c2f2-release 

Change-Id: Icaf42d10cb52fcbbeb64844a663555825dbe80ce
parents 22398591 9c6f37fa

media/libmedia/xsd/vts/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ cc_test { 
        "libxml2",

    ],

    shared_libs: [

        "libbase",

        "liblog",

    ],

    cflags: [

media/libmedia/xsd/vts/ValidateMediaProfiles.cpp

+10 −2
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



#include <string>



#include <android-base/file.h>

#include <android-base/properties.h>

#include "utility/ValidateXml.h"



TEST(CheckConfig, mediaProfilesValidation) {
@@ -21,8 +25,12 @@ TEST(CheckConfig, mediaProfilesValidation) { 
                   "Verify that the media profiles file "

                   "is valid according to the schema");



    const char* location = "/vendor/etc";

    std::string mediaSettingsPath = android::base::GetProperty("media.settings.xml", "");

    if (mediaSettingsPath.empty()) {

        mediaSettingsPath.assign("/vendor/etc/media_profiles_V1_0.xml");

    }



    EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS("media_profiles_V1_0.xml", {location},

    EXPECT_ONE_VALID_XML_MULTIPLE_LOCATIONS(android::base::Basename(mediaSettingsPath).c_str(),

                                            {android::base::Dirname(mediaSettingsPath).c_str()},

                                            "/data/local/tmp/media_profiles.xsd");

}

media/libstagefright/MPEG4Writer.cpp

+6 −1
Original line number Diff line number Diff line
@@ -1635,8 +1635,13 @@ status_t MPEG4Writer::setCaptureRate(float captureFps) { 
        return BAD_VALUE;

    }



    // Increase moovExtraSize once only irrespective of how many times

    // setCaptureRate is called.

    bool containsCaptureFps = mMetaKeys->contains(kMetaKey_CaptureFps);

    mMetaKeys->setFloat(kMetaKey_CaptureFps, captureFps);

    if (!containsCaptureFps) {

        mMoovExtraSize += sizeof(kMetaKey_CaptureFps) + 4 + 32;

    }



    return OK;

}

media/libstagefright/MediaMuxer.cpp

+11 −3
Original line number Diff line number Diff line
@@ -96,11 +96,19 @@ ssize_t MediaMuxer::addTrack(const sp<AMessage> &format) { 


    sp<MediaAdapter> newTrack = new MediaAdapter(trackMeta);

    status_t result = mWriter->addSource(newTrack);

    if (result == OK) {

        return mTrackList.add(newTrack);

    }

    if (result != OK) {

        return -1;

    }

    float captureFps = -1.0;

    if (format->findAsFloat("time-lapse-fps", &captureFps)) {

        ALOGV("addTrack() time-lapse-fps: %f", captureFps);

        result = mWriter->setCaptureRate(captureFps);

        if (result != OK) {

            ALOGW("addTrack() setCaptureRate failed :%d", result);

        }

    }

    return mTrackList.add(newTrack);

}



status_t MediaMuxer::setOrientationHint(int degrees) {

    Mutex::Autolock autoLock(mMuxerLock);

media/libstagefright/include/media/stagefright/MediaWriter.h

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ struct MediaWriter : public RefBase { 
    virtual status_t start(MetaData *params = NULL) = 0;

    virtual status_t stop() = 0;

    virtual status_t pause() = 0;

    virtual status_t setCaptureRate(float /* captureFps */) {

        ALOGW("setCaptureRate unsupported");

        return ERROR_UNSUPPORTED;

    }



    virtual void setMaxFileSize(int64_t bytes) { mMaxFileSizeLimitBytes = bytes; }

    virtual void setMaxFileDuration(int64_t durationUs) { mMaxFileDurationLimitUs = durationUs; }