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

Commit 83e90762 authored by Andreas Huber's avatar Andreas Huber
Browse files

DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2

Change-Id: Ie711ea8d6956fa8370c78e23bf795325627164d1
related-to-bug: 4381047
parent 1a65546a
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -660,7 +660,8 @@ static void addESDSFromAudioSpecificInfo(
        // AudioSpecificInfo (with size prefix) follows
    };

    CHECK(asiSize < 128);
    // Make sure all sizes can be coded in a single byte.
    CHECK(asiSize + 22 - 2 < 128);
    size_t esdsSize = sizeof(kStaticESDS) + asiSize + 1;
    uint8_t *esds = new uint8_t[esdsSize];
    memcpy(esds, kStaticESDS, sizeof(kStaticESDS));
@@ -668,6 +669,11 @@ static void addESDSFromAudioSpecificInfo(
    *ptr++ = asiSize;
    memcpy(ptr, asi, asiSize);

    // Increment by codecPrivateSize less 2 bytes that are accounted for
    // already in lengths of 22/17
    esds[1] += asiSize - 2;
    esds[6] += asiSize - 2;

    meta->setData(kKeyESDS, 0, esds, esdsSize);

    delete[] esds;