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

Commit 26ade0b4 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am d2d16b93: Merge "We don\'t support mid-stream format changes" into mnc-dev

* commit 'd2d16b93':
  We don't support mid-stream format changes
parents b4953d16 d2d16b93
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -674,7 +674,10 @@ MediaBuffer *FLACParser::readBuffer(bool doSeek, FLAC__uint64 sample)
    if (mWriteHeader.sample_rate != getSampleRate() ||
        mWriteHeader.channels != getChannels() ||
        mWriteHeader.bits_per_sample != getBitsPerSample()) {
        ALOGE("FLACParser::readBuffer write changed parameters mid-stream");
        ALOGE("FLACParser::readBuffer write changed parameters mid-stream: %d/%d/%d -> %d/%d/%d",
                getSampleRate(), getChannels(), getBitsPerSample(),
                mWriteHeader.sample_rate, mWriteHeader.channels, mWriteHeader.bits_per_sample);
        return NULL;
    }
    // acquire a media buffer
    CHECK(mGroup != NULL);