1. 29 4月, 2014 5 次提交
  2. 28 4月, 2014 1 次提交
  3. 27 4月, 2014 7 次提交
    • J
      Add preliminary saving/loading of scene/sources · 65455c27
      jp9000 提交于
      This saves scenes/sources from json on exit, and properly loads it back
      up when starting up the program again, as well as the currently active
      scene.
      
      I had to add a 'load' and 'save' callback to the source interface
      structure because I realizes that certain sources (such as scenes)
      operate different with their saved data; scenes for example would have
      to keep track of their settings information constantly, and that was
      somewhat unacceptable to make it functional.
      
      The optional 'load' callback will be called only after having loaded
      setttings specifically from file/imported data, and the 'save' function
      will be called only specifically when data actually needs to be saved.
      
      I also had to adjust the obs_scene code so that it's a regular input
      source type now, and I also modified it so that it doesn't have some
      strange custom creation code anymore.  The obs_scene_create function is
      now simply just a wrapper for obs_source_create.  You could even create
      a scene with obs_source_create manually as well.
      65455c27
    • J
      Add helper functions to obs_data and fix bug · 21b67d00
      jp9000 提交于
      Add math helpers to the obs_data functions for vec2/3/4 and quat, and
      fix a bug where it wouldn't load arrays from json
      21b67d00
    • J
      Fix bug with matrix rotation function · bfeb16e8
      jp9000 提交于
      bfeb16e8
    • J
      Improve output packet interleaving · 6a59aef3
      jp9000 提交于
      The 'wait' constant was a terrible means of trying to ensure that the
      packets were interleaved.  Instead, calculate the current highest
      timestamps of each encoder that's present in the interleaved buffer, and
      use that as a means of detecting whether the current packet should be
      sent off.  This will guarantee sorting without relying on some arbirary
      constant that 'assumes' that it'll be interleaved.  It also reduces
      buffering any more than what is needed to interleave.
      6a59aef3
    • J
      Merge pull request #71 from fryshorts/master · 160b44e4
      Jim 提交于
      Some minor fixes
      160b44e4
    • J
      obs-x264: Woops, forgot to remove .rc · 63474164
      jp9000 提交于
      63474164
    • J
      obs-x264: Use regular CBR if x264 version < 139 · 1a0bfe32
      jp9000 提交于
      Some linux packages on linux are way too old.  Very annoying.
      1a0bfe32
  4. 26 4月, 2014 4 次提交
  5. 25 4月, 2014 13 次提交
  6. 24 4月, 2014 5 次提交
    • P
      9f43e6c2
    • P
      Add helper to convert from FOURCC to VIDEO_FORMAT · b77b9feb
      Palana 提交于
      b77b9feb
    • J
      obs-studio UI: Implement stream settings UI · 8830c410
      jp9000 提交于
       - Updated the services API so that it links up with an output and
         the output gets data from that service rather than via settings.
         This allows the service context to have control over how an output is
         used, and makes it so that the URL/key/etc isn't necessarily some
         static setting.
      
         Also, if the service is attached to an output, it will stick around
         until the output is destroyed.
      
       - The settings interface has been updated so that it can allow the
         usage of service plugins.  What this means is that now you can create
         a service plugin that can control aspects of the stream, and it
         allows each service to create their own user interface if they create
         a service plugin module.
      
       - Testing out saving of current service information.  Saves/loads from
         JSON in to obs_data_t, seems to be working quite nicely, and the
         service object information is saved/preserved on exit, and loaded
         again on startup.
      
       - I agonized over the settings user interface for days, and eventually
         I just decided that the only way that users weren't going to be
         fumbling over options was to split up the settings in to simple/basic
         output, pre-configured, and then advanced for advanced use (such as
         multiple outputs or services, which I'll implement later).
      
         This was particularly painful to really design right, I wanted more
         features and wanted to include everything in one interface but
         ultimately just realized from experience that users are just not
         technically knowledgable about it and will end up fumbling with the
         settings rather than getting things done.
      
         Basically, what this means is that casual users only have to enter in
         about 3 things to configure their stream:  Stream key, audio bitrate,
         and video bitrate.  I am really happy with this interface for those
         types of users, but it definitely won't be sufficient for advanced
         usage or for custom outputs, so that stuff will have to be separated.
      
       - Improved the JSON usage for the 'common streaming services' context,
         I realized that JSON arrays are there to ensure sorting, while
         forgetting that general items are optimized for hashing.  So
         basically I'm just using arrays now to sort items in it.
      8830c410
    • J
      Add obs_data JSON loading/saving functions · 3cbc711f
      jp9000 提交于
      3cbc711f
    • J
      Fix an issue with properties view · 21db9465
      jp9000 提交于
      If a control changed the properties layout, it would lose focus on the
      control.  Also, fiddled with the sizing policy a bit, because it wasn't
      expanding when I used it in other windows.
      21db9465
  7. 23 4月, 2014 1 次提交
    • J
      Fix draw callback for main/properties views · 9edde0b8
      jp9000 提交于
      Drawing position wasn't being calculated correctly, viewport/ortho
      should have been used instead.  It would cause items to render out of
      position on the main viewport (though not on the actual output)
      9edde0b8
  8. 22 4月, 2014 2 次提交
  9. 20 4月, 2014 2 次提交