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

Commit 2f7cc277 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 8fdebd35: am 9cfc52d9: am 99e330b5: Merge "Properly fill in the component...

am 8fdebd35: am 9cfc52d9: am 99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo
parents 6ad28aff 8fdebd35
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ sp<MetaData> AACDecoder::getFormat() {
        meta->setInt64(kKeyDuration, durationUs);
    }

    meta->setCString(kKeyDecoderComponent, "AACDecoder");

    return meta;
}

+2 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ sp<MetaData> AMRNBDecoder::getFormat() {
        meta->setInt64(kKeyDuration, durationUs);
    }

    meta->setCString(kKeyDecoderComponent, "AMRNBDecoder");

    return meta;
}

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ sp<MetaData> AMRNBEncoder::getFormat() {
        meta->setInt64(kKeyDuration, durationUs);
    }

    meta->setCString(kKeyDecoderComponent, "AMRNBEncoder");

    return meta;
}

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ sp<MetaData> AMRWBDecoder::getFormat() {
        meta->setInt64(kKeyDuration, durationUs);
    }

    meta->setCString(kKeyDecoderComponent, "AMRWBDecoder");

    return meta;
}

+2 −0
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ sp<MetaData> MP3Decoder::getFormat() {
        meta->setInt64(kKeyDuration, durationUs);
    }

    meta->setCString(kKeyDecoderComponent, "MP3Decoder");

    return meta;
}