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

Commit 2d832a12 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Properly fill in the component name for the software decoders." into froyo

parents 08f00853 47f729a0

media/libstagefright/codecs/aacdec/AACDecoder.cpp

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

        meta->setInt64(kKeyDuration, durationUs);

    }

    }





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



    return meta;

    return meta;

}

}

media/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp

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

        meta->setInt64(kKeyDuration, durationUs);

    }

    }





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



    return meta;

    return meta;

}

}

media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp

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

        meta->setInt64(kKeyDuration, durationUs);

    }

    }





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



    return meta;

    return meta;

}

}

media/libstagefright/codecs/amrwb/AMRWBDecoder.cpp

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

        meta->setInt64(kKeyDuration, durationUs);

    }

    }





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



    return meta;

    return meta;

}

}

media/libstagefright/codecs/mp3dec/MP3Decoder.cpp

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

        meta->setInt64(kKeyDuration, durationUs);

    }

    }





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



    return meta;

    return meta;

}

}