1. 08 10月, 2017 1 次提交
  2. 07 10月, 2017 1 次提交
    • J
      UI: Add ini option to use different graphics adapters · 3dc96fbe
      jp9000 提交于
      Allows setting a specific graphics adapter index to use for Direct3D 11.
      This is currently meant to be sort of "undocumented" in implementing it
      this way due to the fact that users will be guaranteed to break their
      configurations if this is implemented in the UI (even if in advanced
      settings).
      3dc96fbe
  3. 06 10月, 2017 3 次提交
    • J
      libobs-opengl: Disable v-sync on mac · 4494e927
      jp9000 提交于
      Sets the swap interval to 0 to prevent v-sync from affecting any of the
      preview panes on mac.
      4494e927
    • J
      libobs: Disable pulseaudio dependency lookup on mac · 3399f7b8
      jp9000 提交于
      The cmake script code used to find and depend on pulseaudio for audio
      monitoring on linux was unintentionally being triggered on mac.  This
      patch makes it so that the pulseaudio cmake code is ignored on mac.
      3399f7b8
    • J
      UI: Log generic stream startup failures · 720a28ae
      jp9000 提交于
      These code paths had no logging on failure, resulting in a log file that
      would confuse people attempting to perform support for users.
      720a28ae
  4. 05 10月, 2017 1 次提交
    • J
      win-dshow: Fix video playback when default format is MJPEG · a0e8c7a5
      jp9000 提交于
      Video playback doesn't work if the default format is MJPEG and there are
      other formats to use; this is because the useDefaultConfig variable is
      still set to true, which overrides the format value that would normally
      tell it to convert to RGB.
      a0e8c7a5
  5. 04 10月, 2017 2 次提交
  6. 03 10月, 2017 1 次提交
    • J
      graphics-hook: Blacklist specific game from GL capture · e5d660e9
      jp9000 提交于
      "Life is Feudal: Your Own" will use Direct3D to render the game, then
      OpenGL to render its in-game menus, which causes a conflict with itself.
      This specifically blacklists the game from capturing OpenGL to prevent
      that from happening.
      e5d660e9
  7. 02 10月, 2017 13 次提交
    • J
      vlc-video: Set properties to defer update mode · c914c1c2
      jp9000 提交于
      Makes it so that the settings do not update every time the user touches
      a property of the source, but instead update when the user is finished.
      c914c1c2
    • J
      libobs/media-io: Fix decompress_420 function · 849944ca
      jp9000 提交于
      This function had a number of bugs and just wasn't working properly at
      all.  This function is currently not used in public builds because GPU
      is used for color conversion instead (hence why it had probably not
      really been tested), but a need came up where CPU conversion was useful
      for the sake of testing something else in the back-end, and it needed to
      be fixed before CPU conversion could be used.
      849944ca
    • J
      test: Add sync tests · 292a6e59
      jp9000 提交于
      The async source sync test verifies that async sources are playing back
      in sync properly, and the "sync pair (video)" and "sync pair (audio)"
      sources test the back-end syncing down to the exact sample via inserting
      audio data directly in to the back-end with system timestamps.
      
      For these sources, when the video is white, a C sinewave should be
      playing, and when the video is black audio is mute.
      292a6e59
    • J
      win-wasapi: Subtract frame duration from timestamp · 5b209422
      jp9000 提交于
      It would appear that the timestamp values returned by devices are not
      perfectly accurate, and in some cases may be calculated on the spot --
      to combat that, it's best to subtract the audio segment's duration from
      the current audio segment's timestamp to ensure the timing is as
      accurate as possible.
      5b209422
    • J
      win-capture: Remove buffering from window capture · 008e38f5
      jp9000 提交于
      Removes the unnecessary buffering from window capture to prevent window
      capture from being one frame out of sync
      008e38f5
    • J
      libobs: Set video timing_adjust to obs video time · ef97f15d
      jp9000 提交于
      When an async video frame comes in and it sets the timing_adjust value
      (used to sync audio to video based upon their timestamps), it would use
      os_gettime_ns as a base.  Instead, it should use OBS' current video
      frame time so that the audio and video playback is as accurate as
      possible relative to the actual exact timestamp of the video frame.
      (Results are almost insignificant, but it's nice to be as precise as
      possible)
      ef97f15d
    • J
      obs-outputs: Fix up the internal FLV output · 54e80661
      jp9000 提交于
      Fixes up the FLV output to ensure it functions properly.
      54e80661
    • J
      libobs: When interleaving packets, make video come first · 260de35b
      jp9000 提交于
      During packet interleaving (for outputs), ensure that if two packets
      coincide with the same timestamp, that the video packet always comes
      first instead of the audio packet.
      
      This fix is required to make FLV demux properly with certain demuxers;
      some FLV demuxers expect the video packet before the audio packet when
      two packets coincide with the same timestamps.
      260de35b
    • J
      obs-outputs: Fix FLV muxing bug · 8d424cf1
      jp9000 提交于
      The end of an FLV tag would contain the size of the tag, but the code
      was erroneously including the end size value in addition, which it's not
      supposed to do normally.
      8d424cf1
    • J
      libobs: Move macro to internal C file · dc1e2331
      jp9000 提交于
      Modifying this value would cause the entire project to recompile when
      it's only used in one file in the first place.
      dc1e2331
    • J
      libobs: Fix starting video packet offset in outputs · 4a5ac397
      jp9000 提交于
      (This commit also modifies the obs-outputs module)
      
      The first video packet video offset (the value used to set the starting
      point of video data) would be set to the DTS value of the first video
      packet.  However, when b-frames are used, the first DTS value will be
      negative.  This was originally done because FLV muxing requires that the
      first packet's DTS start from 0.  Unfortunately, this would also
      effectively cause the first packet's PTS/DTS value to be shifted forward
      by the negative amount, which would cause video sync to be off by a
      video frame or two.
      
      This fixes it to start at the PTS value instead and preserve any
      negative offsets.  Additionally, the FLV muxing code has been fixed to
      ensure that it adjusts the starting video DTS to 0, and now correctly
      adjusts the first audio packet's timestamp according to that DTS as well
      (which it didn't do before).
      4a5ac397
    • J
      libobs: Fix paired audio encoder discarding one segment · 2f04010a
      jp9000 提交于
      On audio encoder startup, audio encoders paired with a video encoder
      would unintentionally discard a single audio data segment, causing it to
      be 1024 audio frames out of sync.
      2f04010a
    • R
      UI/updater: Use TLS 1.2 with WinHTTP · 05fb6771
      Richard Stanway 提交于
      On Windows 7, WinHTTP defaults to using only SSL3 and TLS 1.0. The
      obsproject.com server was updated to remove TLS 1.0 support and
      this has caused updates to stop working on Windows 7.
      05fb6771
  8. 28 9月, 2017 1 次提交
  9. 17 9月, 2017 5 次提交
    • J
      obs-ffmpeg: Fix potential seek issues with media source · c9182a98
      jp9000 提交于
      (This commit also modifies deps/media-playback)
      
      Before, the media-playback library would detect whether something was
      seekable by checking the filename for "://", which is unideal because
      there are other cases where targets may not be seekable.  So instead, an
      explicit "seekable" property (off by default) is now in place in the
      media source when not in "local file" mode.  Seeking will only be
      enabled if local file mode is on, or if "seekable" is explicitly checked
      by the user.
      
      Closes jp9000/obs-studio#1022
      c9182a98
    • J
      UI: Lock graphics context when adding new sources · 8f43934b
      jp9000 提交于
      Prevents a potential cross-lock deadlock.  The UI thread would lock the
      scene's mutex in obs_scene_atomic_update, then the item would lock the
      graphics context to create a texture.  Meanwhile in the video thread, it
      could lock the graphics context in the render loop, then lock the
      scene's mutex when rendering.  When doing anything graphics-related, the
      graphics context is always supposed to be locked before the scene's
      mutex is supposed to be locked (it's designed that way), and the
      obs_scene_atomic_update would just bypass that.
      8f43934b
    • J
      obs-transitions: Fix integer conversion warning · 2386bd65
      jp9000 提交于
      2386bd65
    • M
      obs-transition: Add crossfade option to stinger · 006fc35a
      Makeenon 提交于
      Add option in properties that let you choose how audio is mixed during
      transition:
      - Fade Out/Fade In (existing behavior, default)
      - Crossfade
      
      Closes jp9000/obs-studio#1028
      006fc35a
    • M
      obs-transitions: Add audio monitoring to stinger · dab278e1
      Michel 提交于
      Closes jp9000/obs-studio#1001
      dab278e1
  10. 16 9月, 2017 4 次提交
  11. 15 9月, 2017 6 次提交
  12. 14 9月, 2017 2 次提交
    • S
      UI: Add missing option to context menu · 2b175d6d
      SuslikV 提交于
      Add 'Advanced Audio Properties' option to context menu over empty area
      of the Mixer's pane.
      2b175d6d
    • C
      UI: Allow hiding/unhiding sources in the mixer · 76b62666
      cg2121 提交于
      Allows the ability to hide/unhide sources in the mixer that the user
      doesn't care about or doesn't necessarily want to see (such as video
      sources that have audio but don't have any audio playing).  If all
      sources are hidden, the user can right-click the mixer's empty area and
      choose "unhide all" via a context menu.
      
      Closes jp9000/obs-studio#1002
      76b62666