1. 07 5月, 2017 17 次提交
    • J
      UI: Remove colon from a few locale items · 51e5f5fc
      jp9000 提交于
      The colon makes it difficult to use these locale items for other
      purposes, and the colon isn't used much elsewhere, so just remove them.
      51e5f5fc
    • J
      UI: Add 1920x1080/1280x720 to the settings base res list · f9595938
      jp9000 提交于
      Adds 1920x1080 and 1280x720 to the drop-down list of "default"
      base/canvas resolutions rather than just the user's monitor resolutions,
      in case the user wants to set the canvas to 1920x1080 or 1280x720
      without having to manually type it in.  Added as a minor convenience.
      f9595938
    • J
      UI: Limit default canvas res to 1920x1080 or below · 9d019e90
      jp9000 提交于
      The reasoning behind this is because having a very large canvas size can
      negatively affect the user experience -- most sources end up seeming
      smaller than they need to be to users, resulting in the user needing to
      size up the sources, or in the case of webcams it makes the user try to
      use much larger webcam resolutions than they should reasonably need to
      do, resulting in higher unintentional resource usage.  The program will
      additionally require more fillrate to render and downscale things as
      well.
      
      This applies only to the default starting base/canvas resolution for new
      users only.
      
      Additionally, users that ran the program pre-19 will be unaffected by
      this change, as it will detect that and set the old defaults to prevent
      an unexpected change in resolution for those users.
      9d019e90
    • J
      UI: Don't subject base/output resolutions defaults · ca0d4d18
      jp9000 提交于
      If defaults change for the base or output resolutions, it could
      unintentionally affect users who are using defaults by chance and have
      never changed those values.
      
      Instead, save those values are soon as defaults are set if the users
      haven't already set them.
      ca0d4d18
    • J
      UI: Add function to enable/disable outputs · b850bc64
      jp9000 提交于
      b850bc64
    • J
      obs-outputs: Fix frame dropping when using ultrafast · d1329d17
      jp9000 提交于
      x264 on ultrafast won't drop any b-frames, so it might buffer packets a
      bit too much in that case.
      
      The frame drop duration calculation now searches for the first valid
      video frame within the packets buffer.  Additionally, it no longer
      prevents frame dropping for a specific time after dropping frames,
      because the first case eliminates the need for that.
      d1329d17
    • J
      obs-outputs: Add connect time callback for rtmp output · 585b3ed9
      jp9000 提交于
      585b3ed9
    • J
      obs-outputs: Add null output · f6517d2b
      jp9000 提交于
      Allows encoding without necessarily outputting to a file or stream.
      Useful for running encoding tests.
      f6517d2b
    • J
      libobs: Don't allow lagged frames to be counted as skipped · a81646ed
      jp9000 提交于
      Prevents lagged frames (frames that took too long to render) to be
      counted as skipped frames (frames that are skipped due to encoding
      taking too long to process)
      a81646ed
    • J
      libobs: Add function to allow getting output connect time · 66876355
      jp9000 提交于
      66876355
    • J
      libobs: Add function to allow custom output drawing · ad57aa15
      jp9000 提交于
      Optionally allows drawing directly to the primary output instead of
      having to use a source to draw.
      ad57aa15
    • J
      libobs: Pass exact data when calling obs_get_video_info · ffef7366
      jp9000 提交于
      Originally, obs_get_video_info would recreate the obs_video_info
      structure that was originally passed to it from obs_reset_video.  This
      changes that to just store a copy of the obs_video_info when calling
      obs_reset_video, and then copying that to the parameter of
      obs_get_video_info when called.
      ffef7366
    • J
      libobs: Add functions to get logical/physical cores · 6fc74d69
      jp9000 提交于
      6fc74d69
    • J
      libobs: Fix skipped frames reporting · 829ec5be
      jp9000 提交于
      When frames are skipped the skipped frame count would increment, but the
      total frame count would not increment, causing the percentage
      calculation to fail.
      
      Additionally, the skipped frames log reporting has been moved to
      media-io/video-io.c instead of each output.
      829ec5be
    • J
      libobs: Add random shader · 7c6c7bc4
      jp9000 提交于
      Strangely, to the "Solid" effect file.
      7c6c7bc4
    • J
      libobs: Fix tex.Load lookup (needs int3, not int2) · f9b5da51
      jp9000 提交于
      libobs' shader language is basically HLSL, and tex.Load uses an int3 for
      2D textures, with texture mipmap index for the last component.  This bug
      bypassed testing because the front-end automatically switches to OpenGL
      if D3D11 initialization fails, and when converted to GLSL, works fine
      because texelFetch only requires two components.  This also means
      there's a bug in GLSL shader conversion code, because it's essentially
      ignoring the third component when it shouldn't be.
      f9b5da51
    • J
      Merge pull request #907 from fryshorts/settings-crash-fix · 5ad446b4
      Jim 提交于
      UI: Fix settings dialog crashing on linux
      5ad446b4
  2. 06 5月, 2017 5 次提交
    • F
      UI: Fix settings dialog crashing on linux · 937356cc
      fryshorts 提交于
      Fix a double free in the settings window that occurs on linux only.
      The UI Element already gets deleted above as a child of the
      advAudioGroupBox which is not present on linux.
      Apart from making the code even more unreadable, this will likely
      come back to haunt us if the advAudioGroup will ever be shown on linux.
      937356cc
    • J
      libobs: Use tex.Load for reverse NV12/I420 funcs · e7f754df
      jp9000 提交于
      Eventually, most things should be replaced with Load where applicable
      (though in some cases sub-pixel sampling is desired).
      
      This commit also fixes a bug where NV12 async sources wouldn't render
      correctly.
      e7f754df
    • J
      text-freetype2: Make font lookup recursive on mac · e04ab3da
      jp9000 提交于
      On macs, some fonts can be in sub-folders of the font folder, and may
      not properly be found.  This fixes that to detect directories and make
      the lookup recursive.
      e04ab3da
    • R
      Various: Optimize bundled PNG files · a23c009a
      Richard Stanway 提交于
      By losslessly recompressing and removing redundant metadata, this saves
      around 910 KB.
      a23c009a
    • J
      Merge pull request #904 from cg2121/vlc-source-random · b0f56941
      Jim 提交于
      vlc-video: Add ability to shuffle playlist in VLC source
      b0f56941
  3. 05 5月, 2017 9 次提交
  4. 04 5月, 2017 8 次提交
    • E
      UI: Fix warning in VisualStudio 2017 · 26c28b45
      e00E 提交于
      When building with VS2017 the compiler shows some warnings which is
      undesirable.
      
      The compiler rightly complains about declarations which hide older ones
      which are trivially fixed.
      
      Finally only POD types should be passed to variadic functions which is
      why the String should be converted to c_str().
      Relying on the current undefined behavior is a bad idea as it can change
      with compilers and compiler versions.
      
      Closes jp9000/obs-studio#902
      26c28b45
    • E
      UI, obs-qsv11: Fix build in VisualStudio 2017 · 4361c5bd
      e00E 提交于
      OBS did not build out of the box in VS2017 but it does with these
      changes.
      
      Closes jp9000/obs-studio#902
      4361c5bd
    • J
      libobs/util: Add Get function to BPtr<> · 82d72803
      jp9000 提交于
      82d72803
    • J
      Merge pull request #900 from cg2121/linux-scene-switcher · 965e2eea
      Jim 提交于
      frontend-tools: Add automatic scene switcher for Linux
      965e2eea
    • J
      Merge pull request #889 from cg2121/drag-drop-bug · da0f3c27
      Jim 提交于
      UI: Fix drag & drop bug
      da0f3c27
    • J
      Merge pull request #901 from derrod/purge-services · 7ee643e2
      Jim 提交于
      rtmp-services: Update ingests
      7ee643e2
    • D
      rtmp-services: Update ingests · 31121a8f
      derrod 提交于
      - Remove livecoding.tv (now using per-user ingest assignment)
      - Remove Connectcast.tv (Shutting down)
      - Remove Cashplay.tv (Shut down)
      - Remove Restream.io LA ingest (removed)
      - Rename Stre.am to Stream.live and update URL
      31121a8f
    • M
      UI: Add option to disable audio ducking on windows · 9efd2b87
      mntone 提交于
      The audio subsystem of windows is by default configured to lower the
      volume of other things while a communications device (mic) is currently
      active.  This patch prevents that from being enabled with OBS.  If the
      user needs audio ducking enabled again for whatever reason, there is now
      an option to re-enable it in advanced settings.
      
      Closes jp9000/obs-studio#884
      9efd2b87
  5. 03 5月, 2017 1 次提交