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

Commit 51db9952 authored by Tomoharu Kasahara's avatar Tomoharu Kasahara Committed by android-build-merger
Browse files

Merge "Set bits per sample for FLAC and WAV" 

am: b01ea193

Change-Id: Ib617a339cba0ae957505c4439e1052f3bfd9e526
parents a01574e5 b01ea193

media/extractors/flac/FLACExtractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ status_t FLACParser::init() 
            mTrackMetadata->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_RAW);

            mTrackMetadata->setInt32(kKeyChannelCount, getChannels());

            mTrackMetadata->setInt32(kKeySampleRate, getSampleRate());

            mTrackMetadata->setInt32(kKeyBitsPerSample, getBitsPerSample());

            mTrackMetadata->setInt32(kKeyPcmEncoding, kAudioEncodingPcm16bit);

            // sample rate is non-zero, so division by zero not possible

            mTrackMetadata->setInt64(kKeyDuration,

media/extractors/wav/WAVExtractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ status_t WAVExtractor::init() { 
                mTrackMeta.setInt32(kKeyChannelCount, mNumChannels);

                mTrackMeta.setInt32(kKeyChannelMask, mChannelMask);

                mTrackMeta.setInt32(kKeySampleRate, mSampleRate);

                mTrackMeta.setInt32(kKeyBitsPerSample, mBitsPerSample);

                mTrackMeta.setInt32(kKeyPcmEncoding, kAudioEncodingPcm16bit);



                int64_t durationUs = 0;