1. 26 2月, 2018 3 次提交
    • J
      obs-ffmpeg: Use FFmpeg's "fast" AAC encoder by default · aa58b9cf
      jp9000 提交于
      FFmpeg has recently made their "fast" AAC encoder the default, which
      uses less CPU and sounds better at common bitrates.
      aa58b9cf
    • J
      obs-ffmpeg: Remove cutoff hack for AAC encoder · a89470d2
      jp9000 提交于
      The cutoff hack was added many, many years ago as recommended by
      Konverter.  Since then, there has been much work on the AAC encoder, so
      this hack should no longer be necessary.
      a89470d2
    • J
      win-mf: Deprecate plugin · 26595b58
      jp9000 提交于
      The windows media foundation H264 encoders have been deprecated for over
      a year, and microsoft's media foundation AAC encoder has had a continued
      issue with occasional random audio glitches.  The FFmpeg AAC encoder has
      had recent development, and is more than sufficient to be able to handle
      the task of encoding in terms of both quality and performance, so it's
      better just to use the FFmpeg encoder from here on out.
      
      As this plugin is no longer needed, for the next year or two it'll still
      be compiled and included, but as a blank plugin that does nothing.  The
      reason why it's still being included as a blank no-operation plugin is
      to overwrite older versions of the plugin.  That way if a user installs
      a newer OBS version over an older one, it won't load up the older win-mf
      plugin where the encoders still were enabled.
      
      This also fixes some rarely reported media foundation crashes that can
      happen on startup.
      26595b58
  2. 25 2月, 2018 1 次提交
  3. 20 2月, 2018 2 次提交
  4. 16 2月, 2018 2 次提交
  5. 07 2月, 2018 2 次提交
  6. 06 2月, 2018 1 次提交
    • P
      libobs/media-io: Change speaker layout to match FFmpeg aac. · 645d6ae8
      pkviet 提交于
      (This commit also modifies the obs-ffmpeg module)
      
      The default channel layouts from aac spec are implemented in FFmpeg
      native aac encoder as follows:
      
          AV_CH_LAYOUT_MONO,
          AV_CH_LAYOUT_STEREO,
          AV_CH_LAYOUT_SURROUND,
          AV_CH_LAYOUT_4POINT0,
          AV_CH_LAYOUT_5POINT0_BACK,
          AV_CH_LAYOUT_5POINT1_BACK,
          AV_CH_LAYOUT_7POINT1,
      
      The correspondence of speaker layouts to AV_CH_LAYOUT from FFmpeg is
      changed to reflect the previous table.
      
      Although FFmpeg native aac encoder can now encode all the layouts listed
      in avutil channel_layout.h (on master), there might be issues with older
      FFmpeg binaries.
      
      Note that 2.1 speaker layout will be encoded as AV_CH_LAYOUT_SURROUND
      (FL FR FC) because it is not listed as the default layout for three
      channels.
      
      This just means some optimizations for LFE channel will not be used by
      the encoder which will treat it as an SCE (single channel element).
      
      Closes jp9000/obs-studio#1182
      645d6ae8
  7. 23 1月, 2018 2 次提交
  8. 22 1月, 2018 3 次提交
  9. 21 1月, 2018 1 次提交
    • J
      enc-amf: Test for AMF support in separate process first · d976bc94
      jp9000 提交于
      Adjusts the enc-amf submodule remote to the jp9000 fork, which tests AMF
      support in a separate process before attempting to initialize AMF
      in-process.  Reduces the possibility of driver crashes caused by AMF
      initialization.
      d976bc94
  10. 20 1月, 2018 2 次提交
    • J
      obs-ffmpeg: Remove NVENC detection code for now · 6774bbdb
      jp9000 提交于
      The reason this code is being reverted/removed is because this code is a
      risk to startup stability.  This check will be added again in the
      future, however this code needs to be executed from a secondary piped
      process instead of directly in the process to reduce risk of
      driver/hardware issues impacting program startup.  The same needs to be
      accomplished for the AMF plugin as well.
      6774bbdb
    • J
      obs-ffmpeg: Fix signed mismatch warning · f5c3af1b
      jp9000 提交于
      f5c3af1b
  11. 19 1月, 2018 1 次提交
  12. 18 1月, 2018 4 次提交
  13. 17 1月, 2018 1 次提交
    • T
      linux-pulseaudio: Surround speaker map · 48a8e750
      Tjienta Vara 提交于
      When using more than two channels, the channel map of pulse-audio is incorrect.
      
      Add an API for getting a speaker map based on OBS speaker layout. Then use the
      speaker map when connecting to a pulse-audio device, for both source and
      monitor output.
      48a8e750
  14. 14 1月, 2018 1 次提交
  15. 12 1月, 2018 1 次提交
    • J
      Revert "obs-ffmpeg: Improve NVENC detection" · 17560bf8
      jp9000 提交于
      This reverts commit 94b59822.
      
      Reverting this commit because it had some negative side effects, such as
      adding 500 milliseconds to the startup time.  NVENC detection should
      really be done through its proper API, and not via creating an encoder
      on startup.
      17560bf8
  16. 09 1月, 2018 4 次提交
    • J
      decklink: Default to 5.1 if invalid channel value 7 · 77648480
      jp9000 提交于
      Value 7 was actually 5.1 surround mode, not 7.1.
      77648480
    • J
      decklink: Fix bug with old channel formats · ed5ee5aa
      jp9000 提交于
      There were cases where the channel format could be set to 7, which used
      to be a valid format but now no longer is.  If that format is set, just
      use SPEAKERS_7POINT1 instead.
      ed5ee5aa
    • J
      win-capture: Change string for memory capture option · 10b27723
      Joel Bethke 提交于
      Makes it a bit more clear this option shouldn't be used unless you're on
      SLI/crossfire.
      
      In the future, something should be put in to the program that detects
      laptops and warns on how to set up their adapter for efficient capture.
      
      Closes jp9000/obs-studio#1138
      10b27723
    • T
      linux-pulseaudio: Default sample format float32le · 8f6d0488
      Tjienta Vara 提交于
      This pull request changes the fallback sample format for pulse-audio
      to from PA_SAMPLE_S16LE to PA_SAMPLE_FLOAT32LE.
      
      The pulseaudio plugin can handle the following sample format:
      * PA_SAMPlE_U8
      * PA_SAMPLE_S16LE
      * PA_SAMPLE_S32LE
      * PA_SAMPLE_FLOAT32LE
      
      When an audio device advertises itself as another format, the pulseaudio-plugin
      will ask pulse audio to convert to the fallback sample format.
      
      The fallback PA_SAMPLE_S16LE is not ideal when your audio interface advertises
      as PA_SAMPLE_S24LE since the conversion will lose precision.
      With PA_SAMPLE_FLOAT32LE there is no precision loss and it is also equals OBS's
      internal format.
      8f6d0488
  17. 07 1月, 2018 1 次提交
  18. 06 1月, 2018 7 次提交
    • M
      obs-outputs: Fix FMS auth with query string · 5cf11d67
      Matt Morrissette 提交于
      Fix FMS authentication to support RTMP connection URLs that have a
      query string parameter already.
      
      Closes jp9000/obs-studio#1105
      5cf11d67
    • P
      mac-capture: Update fix for Soundflower · d5140e92
      pkviet 提交于
      Some audio devices do not have a fixed number of channels.  For example,
      Soundflower.  This was previously fixed by defaulting the speaker layout
      to stereo.  With surround sound support, the default has been changed to
      the output speaker layout as set in Settings > Audio.
      
      Closes jp9000/obs-studio#1110
      d5140e92
    • P
      decklink: Add 2.1 & 4.1 surround layouts · 974e64eb
      pkviet 提交于
      The list of channel layouts available for decklink input is missing 2.1
      & 4.1 layouts.  The commit adds them.  This aligns the decklink input
      with the speaker layouts available at outputs.  Having different layouts
      as input and output invokes FFmpeg resampler, which remixes the channels
      in non trivial way except when downmixing to stereo.  This patch allows
      to avoid such uncontrolled remix of channels with decklink input.
      974e64eb
    • P
      coreaudio-encoder: Surround sound improvements · 292ad0fe
      pkviet 提交于
      The core audio aac encoder has bitrates maps specific to speaker
      layouts.  Previously, the bitrate map maxed at 320 kbs and was the map
      for stereo.  The bitrate map is now tailored to the speaker layout.  In
      practice this unlocks higher bitrates.  For instance up to 960 kbs for
      7.1.  Additionally the commit fixes a bug with 2.1 with channels not
      ordered correctly.
      292ad0fe
    • P
      obs-libdk: Unlock bitrates for surround layouts · c5e14456
      pkviet 提交于
      Bitrate map was previously maxed at 256 kbs which is OK for stereo.
      This commit enables up to 1024 kbs which can be used for surround
      channel layouts.
      c5e14456
    • P
      libobs/media-io: Replace quad with 4.0 · 67e48ecc
      pkviet 提交于
      (also obs, deps/media-playback, libobs/audio-monitoring, decklink,
      linux-alsa, linux-pulseaudio, mac-capture, obs-ffmpeg, win-dshow,
      win-wasapi)
      
      Default channel layout for 4 channels is 4.0 in FFmpeg.
      Replacing quad with 4.0 will improve compatibility since FFmpeg has
      better support of its default channel layouts.
      67e48ecc
    • P
      libobs/media-io: Clean surround API · fb580535
      pkviet 提交于
      (also modifies obs-ffmpeg, audio-monitoring, win-wasapi, decklink,
      obs-outputs)
      
      Removes speaker layouts which are not exposed in UI.  The speaker
      layouts selectable by users in the UI are the most common ones.  It is
      not necessary to keep other layouts.  (This basically removes
      5POINT1_SURROUND, 7POINT1_SURROUND, SURROUND =3.0).
      fb580535
  19. 05 1月, 2018 1 次提交