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

Commit f74023f0 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: return encrypted input buffer for secure codecs" into lmp-dev

parents 846202f5 0837d0ac
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -589,7 +589,12 @@ status_t MediaCodec::getBufferAndFormat(
    if (index < buffers->size()) {
        const BufferInfo &info = buffers->itemAt(index);
        if (info.mOwnedByClient) {
            // by the time buffers array is initialized, crypto is set
            if (portIndex == kPortIndexInput && mCrypto != NULL) {
                *buffer = info.mEncryptedData;
            } else {
                *buffer = info.mData;
            }
            *format = info.mFormat;
        }
    }