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

Commit e42e5aa7 authored by Preetam Singh Ranawat's avatar Preetam Singh Ranawat Committed by Steve Kondik
Browse files

NuPlayer : send the correct streaming info while opening audio sink 

 -For any offload playback NuPlayerRenderer always open the audio sink
  with isStreaming info as true.
 -Pass the streaming info to the NuPlayerRenderer while opening audio
  sink.

CRs-Fixed: 777242
Change-Id: Ic9d5e7ae0b82a316ec4b4a72037519448f1a011c
parent a92052b6

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+5 −4
Original line number Diff line number Diff line
@@ -1246,15 +1246,16 @@ void NuPlayer::openAudioSink(const sp<AMessage> &format, bool offloadOnly) { 
            //override msg with value in format if format has updated values

            ExtendedUtils::overWriteAudioFormat(msg, format);

            mOffloadAudio = mRenderer->openAudioSink(

                    msg, offloadOnly, hasVideo, flags);

                    msg, offloadOnly, hasVideo, mIsStreaming, flags);

        } else {

            mOffloadAudio = mRenderer->openAudioSink(

                    format, offloadOnly, hasVideo, flags);

                    format, offloadOnly, hasVideo, mIsStreaming, flags);

        }

    } else

#endif



    mOffloadAudio = mRenderer->openAudioSink(

                format, offloadOnly, hasVideo, flags);

            format, offloadOnly, hasVideo, mIsStreaming, flags);



    if (mOffloadAudio) {

        sendMetaDataToHal(mAudioSink, audioMeta);

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+8 −2
Original line number Diff line number Diff line
@@ -270,11 +270,13 @@ bool NuPlayer::Renderer::openAudioSink( 
        const sp<AMessage> &format,

        bool offloadOnly,

        bool hasVideo,

        bool isStreaming,

        uint32_t flags) {

    sp<AMessage> msg = new AMessage(kWhatOpenAudioSink, id());

    msg->setMessage("format", format);

    msg->setInt32("offload-only", offloadOnly);

    msg->setInt32("has-video", hasVideo);

    msg->setInt32("isStreaming", isStreaming);

    msg->setInt32("flags", flags);



    sp<AMessage> response;
@@ -308,7 +310,10 @@ void NuPlayer::Renderer::onMessageReceived(const sp<AMessage> &msg) { 
            uint32_t flags;

            CHECK(msg->findInt32("flags", (int32_t *)&flags));



            bool offload = onOpenAudioSink(format, offloadOnly, hasVideo, flags);

            uint32_t isStreaming;

            CHECK(msg->findInt32("isStreaming", (int32_t *)&isStreaming));



            bool offload = onOpenAudioSink(format, offloadOnly, hasVideo, isStreaming, flags);



            sp<AMessage> response = new AMessage;

            response->setInt32("offload", offload);
@@ -1380,6 +1385,7 @@ bool NuPlayer::Renderer::onOpenAudioSink( 
        const sp<AMessage> &format,

        bool offloadOnly,

        bool hasVideo,

        bool isStreaming,

        uint32_t flags) {

    ALOGV("openAudioSink: offloadOnly(%d) offloadingAudio(%d)",

            offloadOnly, offloadingAudio());
@@ -1448,7 +1454,7 @@ bool NuPlayer::Renderer::onOpenAudioSink( 
            offloadInfo.stream_type = AUDIO_STREAM_MUSIC;

            offloadInfo.bit_rate = avgBitRate;

            offloadInfo.has_video = hasVideo;

            offloadInfo.is_streaming = true;

            offloadInfo.is_streaming = isStreaming;

            offloadInfo.bit_width = bitsPerSample;

#ifdef ENABLE_AV_ENHANCEMENTS

            //offloadInfo.use_small_bufs = (audioFormat == AUDIO_FORMAT_PCM_16_BIT_OFFLOAD);

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ struct NuPlayer::Renderer : public AHandler { 
            const sp<AMessage> &format,

            bool offloadOnly,

            bool hasVideo,

            bool isStreaming,

            uint32_t flags);

    void closeAudioSink();
@@ -212,6 +213,7 @@ private: 
            const sp<AMessage> &format,

            bool offloadOnly,

            bool hasVideo,

            bool isStreaming,

            uint32_t flags);

    void onCloseAudioSink();