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

Commit 82a58275 authored by Tomoharu Kasahara's avatar Tomoharu Kasahara Committed by Marco Nelissen
Browse files

Set bits per sample for FLAC and WAV 

Set bits per sample in FLAC/WAV Extractors to be used in
metadataretriever.

Bug: 112986969
Test: Check if bits per sample can be retrieved from FLAC

Change-Id: I87f917c3bba9a7a852010355cadfb7247c5375f6
parent 824d1ff6

media/extractors/flac/FLACExtractor.cpp

+2 −0
Original line number Diff line number Diff line
@@ -621,6 +621,8 @@ status_t FLACParser::init() 
                    AMEDIAFORMAT_KEY_CHANNEL_COUNT, getChannels());

            AMediaFormat_setInt32(mTrackMetadata,

                    AMEDIAFORMAT_KEY_SAMPLE_RATE, getSampleRate());

            AMediaFormat_setInt32(mTrackMetadata,

                    AMEDIAFORMAT_KEY_BITS_PER_SAMPLE, getBitsPerSample());

            AMediaFormat_setInt32(mTrackMetadata,

                    AMEDIAFORMAT_KEY_PCM_ENCODING, kAudioEncodingPcm16bit);

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

media/extractors/wav/WAVExtractor.cpp

+1 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ status_t WAVExtractor::init() { 
                AMediaFormat_setInt32(mTrackMeta, AMEDIAFORMAT_KEY_CHANNEL_COUNT, mNumChannels);

                AMediaFormat_setInt32(mTrackMeta, AMEDIAFORMAT_KEY_CHANNEL_MASK, mChannelMask);

                AMediaFormat_setInt32(mTrackMeta, AMEDIAFORMAT_KEY_SAMPLE_RATE, mSampleRate);

                AMediaFormat_setInt32(mTrackMeta, AMEDIAFORMAT_KEY_BITS_PER_SAMPLE, mBitsPerSample);

                AMediaFormat_setInt32(mTrackMeta, AMEDIAFORMAT_KEY_PCM_ENCODING,

                        kAudioEncodingPcm16bit);

media/libstagefright/Utils.cpp

+9 −0
Original line number Diff line number Diff line
@@ -787,6 +787,11 @@ status_t convertMetaDataToMessage( 
        msg->setInt32("channel-count", numChannels);

        msg->setInt32("sample-rate", sampleRate);



        int32_t bitsPerSample;

        if (meta->findInt32(kKeyBitsPerSample, &bitsPerSample)) {

            msg->setInt32("bits-per-sample", bitsPerSample);

        }



        int32_t channelMask;

        if (meta->findInt32(kKeyChannelMask, &channelMask)) {

            msg->setInt32("channel-mask", channelMask);
@@ -1526,6 +1531,10 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) { 
        if (msg->findInt32("sample-rate", &sampleRate)) {

            meta->setInt32(kKeySampleRate, sampleRate);

        }

        int32_t bitsPerSample;

        if (msg->findInt32("bits-per-sample", &bitsPerSample)) {

            meta->setInt32(kKeyBitsPerSample, bitsPerSample);

        }

        int32_t channelMask;

        if (msg->findInt32("channel-mask", &channelMask)) {

            meta->setInt32(kKeyChannelMask, channelMask);

media/ndk/NdkMediaFormat.cpp

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ EXPORT const char* AMEDIAFORMAT_KEY_AUDIO_SESSION_ID = "audio-session-id"; 
EXPORT const char* AMEDIAFORMAT_KEY_AUTHOR = "author";

EXPORT const char* AMEDIAFORMAT_KEY_BITRATE_MODE = "bitrate-mode";

EXPORT const char* AMEDIAFORMAT_KEY_BIT_RATE = "bitrate";

EXPORT const char* AMEDIAFORMAT_KEY_BITS_PER_SAMPLE = "bits-per-sample";

EXPORT const char* AMEDIAFORMAT_KEY_CAPTURE_RATE = "capture-rate";

EXPORT const char* AMEDIAFORMAT_KEY_CDTRACKNUMBER = "cdtracknum";

EXPORT const char* AMEDIAFORMAT_KEY_CHANNEL_COUNT = "channel-count";

media/ndk/include/media/NdkMediaFormat.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ extern const char* AMEDIAFORMAT_KEY_ALBUMART __INTRODUCED_IN(29); 
extern const char* AMEDIAFORMAT_KEY_ALBUMARTIST __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_ARTIST __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_AUTHOR __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_BITS_PER_SAMPLE __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_CDTRACKNUMBER __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_COMPILATION __INTRODUCED_IN(29);

extern const char* AMEDIAFORMAT_KEY_COMPOSER __INTRODUCED_IN(29);