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

Commit 876d943f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow graceful degradation of MediaProfile with broken configuration."... 

Merge "Allow graceful degradation of MediaProfile with broken configuration." am: df913f7b am: 11e60002 am: ed26941c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1289076

Change-Id: I6d536e6b1059fc53acec94f22cddd6783da66999
parents 6848641a ed26941c

media/libmedia/MediaProfiles.cpp

+53 −14
Original line number Diff line number Diff line
@@ -240,7 +240,10 @@ MediaProfiles::createVideoCodec(const char **atts, MediaProfiles *profiles) 


    const size_t nMappings = sizeof(sVideoEncoderNameMap)/sizeof(sVideoEncoderNameMap[0]);

    const int codec = findTagForName(sVideoEncoderNameMap, nMappings, atts[1]);

    CHECK(codec != -1);

    if (codec == -1) {

      ALOGE("MediaProfiles::createVideoCodec failed to locate codec %s", atts[1]);

      return nullptr;

    }



    MediaProfiles::VideoCodec *videoCodec =

        new MediaProfiles::VideoCodec(static_cast<video_encoder>(codec),
@@ -262,7 +265,10 @@ MediaProfiles::createAudioCodec(const char **atts, MediaProfiles *profiles) 
          !strcmp("channels",   atts[6]));

    const size_t nMappings = sizeof(sAudioEncoderNameMap)/sizeof(sAudioEncoderNameMap[0]);

    const int codec = findTagForName(sAudioEncoderNameMap, nMappings, atts[1]);

    CHECK(codec != -1);

    if (codec == -1) {

      ALOGE("MediaProfiles::createAudioCodec failed to locate codec %s", atts[1]);

      return nullptr;

    }



    MediaProfiles::AudioCodec *audioCodec =

        new MediaProfiles::AudioCodec(static_cast<audio_encoder>(codec),
@@ -282,7 +288,10 @@ MediaProfiles::createAudioDecoderCap(const char **atts) 


    const size_t nMappings = sizeof(sAudioDecoderNameMap)/sizeof(sAudioDecoderNameMap[0]);

    const int codec = findTagForName(sAudioDecoderNameMap, nMappings, atts[1]);

    CHECK(codec != -1);

    if (codec == -1) {

      ALOGE("MediaProfiles::createAudioDecoderCap failed to locate codec %s", atts[1]);

      return nullptr;

    }



    MediaProfiles::AudioDecoderCap *cap =

        new MediaProfiles::AudioDecoderCap(static_cast<audio_decoder>(codec));
@@ -298,7 +307,10 @@ MediaProfiles::createVideoDecoderCap(const char **atts) 


    const size_t nMappings = sizeof(sVideoDecoderNameMap)/sizeof(sVideoDecoderNameMap[0]);

    const int codec = findTagForName(sVideoDecoderNameMap, nMappings, atts[1]);

    CHECK(codec != -1);

    if (codec == -1) {

      ALOGE("MediaProfiles::createVideoDecoderCap failed to locate codec %s", atts[1]);

      return nullptr;

    }



    MediaProfiles::VideoDecoderCap *cap =

        new MediaProfiles::VideoDecoderCap(static_cast<video_decoder>(codec));
@@ -322,7 +334,10 @@ MediaProfiles::createVideoEncoderCap(const char **atts) 


    const size_t nMappings = sizeof(sVideoEncoderNameMap)/sizeof(sVideoEncoderNameMap[0]);

    const int codec = findTagForName(sVideoEncoderNameMap, nMappings, atts[1]);

    CHECK(codec != -1);

    if (codec == -1) {

      ALOGE("MediaProfiles::createVideoEncoderCap failed to locate codec %s", atts[1]);

      return nullptr;

    }



    MediaProfiles::VideoEncoderCap *cap =

        new MediaProfiles::VideoEncoderCap(static_cast<video_encoder>(codec),
@@ -346,7 +361,10 @@ MediaProfiles::createAudioEncoderCap(const char **atts) 


    const size_t nMappings = sizeof(sAudioEncoderNameMap)/sizeof(sAudioEncoderNameMap[0]);

    const int codec = findTagForName(sAudioEncoderNameMap, nMappings, atts[1]);

    CHECK(codec != -1);

    if (codec == -1) {

      ALOGE("MediaProfiles::createAudioEncoderCap failed to locate codec %s", atts[1]);

      return nullptr;

    }



    MediaProfiles::AudioEncoderCap *cap =

        new MediaProfiles::AudioEncoderCap(static_cast<audio_encoder>(codec), atoi(atts[5]),
@@ -386,11 +404,17 @@ MediaProfiles::createCamcorderProfile(int cameraId, const char **atts, Vector<in 
    const size_t nProfileMappings = sizeof(sCamcorderQualityNameMap)/

            sizeof(sCamcorderQualityNameMap[0]);

    const int quality = findTagForName(sCamcorderQualityNameMap, nProfileMappings, atts[1]);

    CHECK(quality != -1);

    if (quality == -1) {

      ALOGE("MediaProfiles::createCamcorderProfile failed to locate quality %s", atts[1]);

      return nullptr;

    }



    const size_t nFormatMappings = sizeof(sFileFormatMap)/sizeof(sFileFormatMap[0]);

    const int fileFormat = findTagForName(sFileFormatMap, nFormatMappings, atts[3]);

    CHECK(fileFormat != -1);

    if (fileFormat == -1) {

      ALOGE("MediaProfiles::createCamcorderProfile failed to locate file format %s", atts[1]);

      return nullptr;

    }



    MediaProfiles::CamcorderProfile *profile = new MediaProfiles::CamcorderProfile;

    profile->mCameraId = cameraId;
@@ -462,24 +486,39 @@ MediaProfiles::startElementHandler(void *userData, const char *name, const char 
        createAudioCodec(atts, profiles);

    } else if (strcmp("VideoEncoderCap", name) == 0 &&

               strcmp("true", atts[3]) == 0) {

        profiles->mVideoEncoders.add(createVideoEncoderCap(atts));

        MediaProfiles::VideoEncoderCap* cap = createVideoEncoderCap(atts);

        if (cap != nullptr) {

          profiles->mVideoEncoders.add(cap);

        }

    } else if (strcmp("AudioEncoderCap", name) == 0 &&

               strcmp("true", atts[3]) == 0) {

        profiles->mAudioEncoders.add(createAudioEncoderCap(atts));

        MediaProfiles::AudioEncoderCap* cap = createAudioEncoderCap(atts);

        if (cap != nullptr) {

          profiles->mAudioEncoders.add(cap);

        }

    } else if (strcmp("VideoDecoderCap", name) == 0 &&

               strcmp("true", atts[3]) == 0) {

        profiles->mVideoDecoders.add(createVideoDecoderCap(atts));

        MediaProfiles::VideoDecoderCap* cap = createVideoDecoderCap(atts);

        if (cap != nullptr) {

          profiles->mVideoDecoders.add(cap);

        }

    } else if (strcmp("AudioDecoderCap", name) == 0 &&

               strcmp("true", atts[3]) == 0) {

        profiles->mAudioDecoders.add(createAudioDecoderCap(atts));

        MediaProfiles::AudioDecoderCap* cap = createAudioDecoderCap(atts);

        if (cap != nullptr) {

          profiles->mAudioDecoders.add(cap);

        }

    } else if (strcmp("EncoderOutputFileFormat", name) == 0) {

        profiles->mEncoderOutputFileFormats.add(createEncoderOutputFileFormat(atts));

    } else if (strcmp("CamcorderProfiles", name) == 0) {

        profiles->mCurrentCameraId = getCameraId(atts);

        profiles->addStartTimeOffset(profiles->mCurrentCameraId, atts);

    } else if (strcmp("EncoderProfile", name) == 0) {

        profiles->mCamcorderProfiles.add(

            createCamcorderProfile(profiles->mCurrentCameraId, atts, profiles->mCameraIds));

      MediaProfiles::CamcorderProfile* profile = createCamcorderProfile(

          profiles->mCurrentCameraId, atts, profiles->mCameraIds);

      if (profile != nullptr) {

        profiles->mCamcorderProfiles.add(profile);

      }

    } else if (strcmp("ImageEncoding", name) == 0) {

        profiles->addImageEncodingQualityLevel(profiles->mCurrentCameraId, atts);

    }