remove transcode audio to preserve multichannel

Author: cewert

components/ItemGrid/LoadVideoContentTask.brs

@@ -62,8 +62,6 @@ function LoadItems_VideoPlayer(id as string, mediaSourceId = invalid as dynamic,
         return invalid
     end if
 
-    print "video=", video
-    print "video.content=", video.content
     return video
 end function
 
@@ -143,13 +141,6 @@ sub LoadItems_AddVideoContent(video as object, mediaSourceId as dynamic, audio_s
 
 
     ' 'TODO: allow user selection of subtitle track before playback initiated, for now set to no subtitles
-    print "m.playbackInfo.MediaSources[0]", m.playbackInfo.MediaSources[0]
-    print "m.playbackInfo.MediaSources[0].Formats", m.playbackInfo.MediaSources[0].Formats
-    print "m.playbackInfo.MediaSources[0].MediaStreams", m.playbackInfo.MediaSources[0].MediaStreams
-    for each stream in m.playbackInfo.MediaSources[0].MediaStreams
-        print "stream=", stream
-    end for
-    print "video.audioIndex=", video.audioIndex
     video.directPlaySupported = m.playbackInfo.MediaSources[0].SupportsDirectPlay
     fully_external = false
 
@@ -219,36 +210,6 @@ sub addVideoContentURL(video, mediaSourceId, audio_stream_idx, fully_external)
             "AudioStreamIndex": audio_stream_idx
         }
 
-        selectedAudioStream = m.playbackInfo.MediaSources[0].MediaStreams[audio_stream_idx]
-        if selectedAudioStream.Channels > 2 and Lcase(selectedAudioStream.Codec) = "aac" or Lcase(selectedAudioStream.Codec) = "opus"
-            ' does the user have an HDMI device attached that can decode this multichannel audio stream?
-            di = CreateObject("roDeviceInfo")
-            if not di.CanDecodeAudio({ Codec: selectedAudioStream.Codec, ChCnt: selectedAudioStream.Channels, PassThru: 1 }).Result
-                print "Attached HDMI device can not decode the selected multichannel audio codec"
-                ' check to see if the attached HDMI device can decode our preferred audio codec
-                preferredAudioCodec = m.global.session.user.playback.preferredAudioCodec
-
-                if di.CanDecodeAudio({ Codec: preferredAudioCodec, Container: selectedAudioStream.Container, ChCnt: selectedAudioStream.Channels, PassThru: 1 }).Result
-                    print "Attached HDMI device can decode our preferred multichannel audio codec"
-                    print "Attempting to transcode audio to the users preferred multichannel audio codec"
-                    ' transcode the audio to keep multichannel support
-                    ' otherwise the roku device will downmix aac/opus to stereo
-                    params.Static = false
-                    params.context = "Streaming"
-                    params.audioCodec = preferredAudioCodec
-                    ' force all multichannel aac files to use mkv container
-                    if selectedAudioStream.Codec = "aac"
-                        params.container = "mkv"
-                    end if
-
-                    video.isTranscoded = true
-                    video.directplaysupported = false
-                    params.transcodeReasons = "Switching audio codecs to preserve multichannel audio support"
-                    video.transcodeReasons = params.transcodeReasons
-                end if
-            end if
-        end if
-
         if mediaSourceId <> ""
             params.MediaSourceId = mediaSourceId
         end if

source/utils/session.bs

@@ -10,7 +10,6 @@ namespace session
                 server: {},
                 user: {
                     Configuration: {},
-                    playback: {},
                     Policy: {},
                     settings: {}
                 }
@@ -108,24 +107,6 @@ namespace session
 
     namespace user
 
-        sub SavePlaybackSettings()
-            playbackArray = {}
-            di = CreateObject("roDeviceInfo")
-
-            ' Preferred Audio Codec
-            ' Use AAC for everything
-            playbackArray.preferredAudioCodec = "aac"
-            if di.GetAudioOutputChannel() <> "Stereo"
-                ' Use Dolby Digital as default surround sound codec
-                playbackArray.preferredAudioCodec = "ac3"
-                if m.global.session.user.settings["playback.forceDTS"]
-                    playbackArray.preferredAudioCodec = "dts"
-                end if
-            end if
-
-            session.user.Update("playback", playbackArray)
-        end sub
-
         ' Add or update one value from the global user session array (m.global.session.user)
         sub Update(key as string, value as dynamic)
             ' validate parameters
@@ -171,9 +152,6 @@ namespace session
                 session.user.settings.Save(setting, userSettings[setting])
             end for
 
-            session.user.SavePlaybackSettings()
-
-            ' debugging
             if m.global.app.isDev
                 print "m.global.session.user.settings = ", m.global.session.user.settings
             end if