Merge "Translate codec specific data for mp4v-es for MediaMuxer"

    // reassemble the csd data into its original form

    sp<ABuffer> csd0;

    if (msg->findBuffer("csd-0", &csd0)) {

        if (mime.startsWith("video/")) { // do we need to be stricter than this?

        if (mime == MEDIA_MIMETYPE_VIDEO_AVC) {

            sp<ABuffer> csd1;

            if (msg->findBuffer("csd-1", &csd1)) {

                char avcc[1024]; // that oughta be enough, right?

                size_t outsize = reassembleAVCC(csd0, csd1, avcc);

                meta->setData(kKeyAVCC, kKeyAVCC, avcc, outsize);

            }

        } else if (mime.startsWith("audio/")) {

        } else if (mime == MEDIA_MIMETYPE_AUDIO_AAC || mime == MEDIA_MIMETYPE_VIDEO_MPEG4) {

            int csd0size = csd0->size();

            char esds[csd0size + 31];

            // The written ESDS is actually for an audio stream, but it's enough

            // for transporting the CSD to muxers.

            reassembleESDS(csd0, esds);

            meta->setData(kKeyESDS, kKeyESDS, esds, sizeof(esds));

        }