Commit Graph

309 Commits (42be9687596d1c747262c4cad5675602a13ad07a)

Author SHA1 Message Date
jp9000 922eb7b8e8 make direct filter rendering optional (can be useful for certain cases) 2013-12-22 02:03:40 -07:00
jp9000 bd47d9fe74 clear up a minor inconsistency in default effect naming 2013-12-22 01:33:11 -07:00
jp9000 cdeb81e3bf Merge branch 'master' of https://github.com/jp9000/obs-studio 2013-12-22 01:30:27 -07:00
jp9000 19c4ee995e add major optimization to filter processing, and as a nice side effect, make it easier to create new filters and sources 2013-12-22 01:30:18 -07:00
Palana 1dde992990 remove mipmap texture filter from min_filter for rectangle textures 2013-12-22 04:47:18 +01:00
jp9000 9218627892 add obs_source functions to allow name manipulation and lookup based upon name, and a few other functions related to getting/setting source information 2013-12-20 19:35:12 -07:00
jp9000 95a7da2d4c add names to sources, use 'id' for the internal source identifier names rather than 'name' 2013-12-20 17:23:19 -07:00
jp9000 0781670ba2 add handling of GL_TEXTURE_RECTANGLE target, and add automatic handling if using it as a sprite 2013-12-20 12:36:38 -07:00
jp9000 f41bb4b7e9 add support for texture_rect texture type in shaders, add new form, clear up a few things in the API 2013-12-20 11:58:09 -07:00
jp9000 24c45458b5 use the preview window as the main window associated with the OpenGL context 2013-12-18 22:57:39 -07:00
jp9000 4da1c193dc fix minor bug in config file parser 2013-12-18 12:08:38 -07:00
jp9000 eeb76237eb removed deprecated/unused function 2013-12-17 22:45:50 -07:00
jp9000 6d5ef2fb62 fixed some warnings (when on earth did I do a bad find/replace on these functions?) 2013-12-17 22:30:22 -07:00
jp9000 3b871a00fb fixed a bug where new locale text segments properly replace old ones if adding a new language file on top of another 2013-12-17 18:17:22 -07:00
jp9000 a4055e4257 fixed a bug writing to config files where it would use a brace instead of a bracket when creating a section 2013-12-17 18:16:36 -07:00
jp9000 0c3ed3ceca fixed bug with dynamic string where it wouldn't set the capacity properly 2013-12-17 18:15:47 -07:00
jp9000 50666040e5 allow loading of other locals on top of the current locale (to enable unfilled strings to default to english if necessary) 2013-12-17 13:55:09 -07:00
jp9000 ed388fc82e replaced boolean trap parameter in the base lexer 2013-12-16 00:05:27 -07:00
Palana 42375302d7 fixed typo 2013-12-16 01:59:07 +01:00
jp9000 aead95f5e3 converted project to vs2013, removed 2010 support (ugh) 2013-12-14 16:01:30 -07:00
jp9000 9743b0efc5 fixed a lexer bug with detecting alphanumeric character text (not happy about it though) 2013-12-12 21:46:29 -07:00
jp9000 5edc9cf9cb added some more config file functions for going through each section 2013-12-12 21:42:44 -07:00
jp9000 2a9e3a7179 Merge branch 'master' of https://github.com/jp9000/obs-studio 2013-12-12 21:41:53 -07:00
jp9000 de21e622b5 removed os_gettime_ms, added os_file_exists 2013-12-12 21:41:46 -07:00
Palana 3da014543e fix min_adjust usage in calc_torque 2013-12-12 23:57:36 +01:00
Jim 6887f00359 Merge pull request #7 from MattMcNam/master
Updated CMake with new effect file locations
2013-12-07 15:03:08 -08:00
Ján Mlynek 1005a841d4 fixed build for *nix platform 2013-12-07 22:51:58 +01:00
Ján Mlynek c37fe1fd16 added functions to platform-nix.c 2013-12-07 22:32:29 +01:00
Matthew McNamara a76a5937df Updated CMakeLists with new effect file locations, added cmake & xcode build folders to gitignore 2013-12-07 21:05:31 +01:00
jp9000 5d3f3e0d1b make text lookup use a simple linked lists rather than an unnecessary array of pointers 2013-12-07 11:23:49 -07:00
jp9000 9b882c097b should only check for ending quote character in locale data if it began with a quote 2013-12-07 10:25:34 -07:00
jp9000 70290b8c2b fixed locale code, added locale files, made wx use locale files, fixed some bugs, and added platform-specific files to the main program 2013-12-07 10:22:56 -07:00
Palana 0199c84687 updated automake files with latest osx changes 2013-12-07 17:40:27 +01:00
Palana e6017ec1ba changed allocation counter to uint64_t
also avoids format string confusion for bnum_allocs
2013-12-07 17:39:43 +01:00
Palana 968f9c03bd use %u for size_t on microsoft compilers 2013-12-07 16:50:05 +01:00
Palana 2284ef09fa compile libobs with -fobjc-arc 2013-12-06 21:31:42 +01:00
jp9000 ff47b3a2dc added functions to get current audio/video output information 2013-12-06 06:38:19 -07:00
jp9000 8298fa4dc7 With the permission of my fellow contributors, I'm switching obs-studio back to GPL v2+ to prevent issues between this project and the original OBS project, and for personal reasons to avoid legal ambiguity (not political reasons, I admittedly would prefer GPL v3+) 2013-12-02 22:24:38 -07:00
Palana 1bd2b9fd99 added os_get_home_path and os_mkdir to osx cocoa platform 2013-11-29 22:38:05 +01:00
jp9000 58810f9806 changed gs_draw_sprite to allow custom sizes, added output textures to the core, and adjusted the test code to accommodate the changes 2013-11-26 22:26:14 -07:00
jp9000 32e34ffe25 fixed a bug in matrix3_transpose - rotate the vector, don't transform the vector 2013-11-26 22:24:10 -07:00
jp9000 74dc470681 made it so that graphics device and associated objects are not lost every time video settings are changed 2013-11-26 22:20:11 -07:00
jp9000 fcf7e508a9 added os_mkdir to platform functions 2013-11-23 23:35:03 -07:00
jp9000 3c6494a11d fixed a few bugs with config files, and replaced a boolean parameter with an enum 2013-11-23 23:34:38 -07:00
jp9000 e1da9099f9 remove ssize_t because it's not even used anyway anymore 2013-11-23 11:12:44 -07:00
jp9000 93dd3cec50 made the getframe function a bit more safe and modified a few names for clarity 2013-11-22 16:18:31 -07:00
jp9000 d8b49034c9 added jansson to the main project 2013-11-22 10:02:57 -07:00
jp9000 71890e0365 removed now-redundant callback enum_children from sources 2013-11-20 21:52:20 -07:00
jp9000 f1decd08f4 adjusted the way source removal is handled to make it a bit more safe 2013-11-20 18:36:46 -07:00
Palana 5fa2f28577 fixed broken comparison 2013-11-20 23:12:12 +01:00
jp9000 409b011a8e cleaned up main internal data structure design, changed to reference counting for sources to ensure safe destruction of source objects from all parts of the system, added some service-related stuff for testing 2013-11-20 15:00:16 -07:00
jp9000 e778a4c04f added OSX files to automake scripts 2013-11-15 06:40:03 -07:00
Palana ec411fe046 added cmake build files 2013-11-14 18:36:46 +01:00
Palana d7a04aea8c added osx cocoa support files 2013-11-14 18:31:18 +01:00
Palana f263d585bf enable format string diagnostics for blog and bcrash on gcc and clang 2013-11-14 18:31:18 +01:00
Palana 3b3d612ceb add noreturn attribute to def_crash_handler 2013-11-14 18:31:17 +01:00
jp9000 146e9a7dbd added support for jansson, added new output files, made some adjustments to the API, fixed a UI subclass issue 2013-11-13 06:24:20 -07:00
John Bradley 21a0292f7a Removed unnecessary <malloc.h> include from bmem 2013-11-07 19:14:24 -06:00
jp9000 f5e41f441e added initial main program and directshow files, finally have a UI functioning 2013-11-07 16:45:03 -07:00
jp9000 37c7db5dbe fixed some bugs and fixed a variable that wasn't declared at the top 2013-11-02 14:44:40 -07:00
Palana 85dd2ad073 fixed log output 2013-11-02 02:16:18 +01:00
jp9000 0790148950 ...had the wrong code in the wrong function, fixed os_dlopen 2013-11-01 17:01:56 -07:00
Palana 727ed4d7ec actually use found path in obs_load_module 2013-11-02 00:53:26 +01:00
jp9000 8847d11e8e adjust file locations to be more portable 2013-11-01 14:33:00 -07:00
jp9000 a6a6118c04 finish up most of the source audio stuff and rename some variables/structs/enum to be a bit more consistent 2013-10-31 10:28:47 -07:00
jp9000 99d2965e21 fix a minor warning and make ffmpeg dependencies a little bit easier to deal with in VS 2013-10-30 18:19:52 -07:00
jp9000 6147446059 remove some redundant code in the resampler wrapper 2013-10-30 17:12:51 -07:00
jp9000 60e6ddbf71 add audio resampling, add ffmpeg support 2013-10-30 17:07:01 -07:00
jp9000 3adfaf7f9f not sure how a backslash slipped into an include, but it's gone now 2013-10-29 23:54:43 -07:00
jp9000 676a0bd67d update build system to autotools (finally) 2013-10-29 23:21:40 -07:00
jp9000 ab08c2c3f2 fixed a minor bug in the gl shader parser 2013-10-29 06:01:19 -07:00
jp9000 93905e516b modify w32-pthreads location in source/project files 2013-10-28 06:29:12 -07:00
jp9000 d2ba08e46b add frame flipping code 2013-10-26 15:05:51 -07:00
jp9000 7dada3bef4 fill out the rest of the source video frame functions, added nv12 decompression function, and cleaned up the design of the source video frame stuff 2013-10-26 14:32:06 -07:00
jp9000 75a1a02a97 fix function definition names for two of the conversion functions 2013-10-25 10:30:50 -07:00
jp9000 a43e291577 fill in the texture_setimage function, fill in a few other functions, and change certain names to be a little more consistent 2013-10-25 10:25:28 -07:00
jp9000 603b262d4c add format conversion functions 2013-10-25 10:23:11 -07:00
jp9000 bb329b9278 avoid using 'default' for enum switches 2013-10-24 01:29:06 -07:00
jp9000 8421690c33 made some slight corrections 2013-10-24 01:03:45 -07:00
jp9000 ac2c08927f added intial async audio/video code, fixed a few bugs, improved thread safety, and made a few other minor adjustments 2013-10-24 00:57:55 -07:00
jp9000 ae3cecf09f make data access in the threads a bit more safe (note: probably will need some more safety measures later on) 2013-10-18 20:25:13 -07:00
jp9000 ebbf4175d3 minor tweaks and get rid of the linker dependency I used for testing 2013-10-17 18:44:37 -07:00
jp9000 18834c6a45 some static analysis cleanup 2013-10-17 17:21:42 -07:00
jp9000 6e6535d568 initialize variable to NULL to be safe against uninitialized usage 2013-10-17 00:36:32 -07:00
jp9000 dfa2dc6eab fix up the rest of the GL code, add glew to project, add makefiles for opengl, fix makefiles so that it can be built with gcc, update project files to automatically output to the build directory 2013-10-16 23:31:18 -07:00
jp9000 0dfc844abc woops, left some spaces by accident 2013-10-14 12:42:45 -07:00
jp9000 9570f0b8d7 change names, fix some bugs, minor GL/D3D fixes, update tests, fix effect files, output a little more debug information 2013-10-14 12:37:52 -07:00
Peter SZTANOJEV 0301b24ace modernize header guards to #pragma once 2013-10-14 13:21:15 +02:00
jp9000 9577ddcf9b fill in the rest of the GL functions. finally 2013-10-12 20:18:05 -07:00
jp9000 c1939de49b added z-stencil buffers to GL and made a GS_MAX_TEXTURES macro 2013-10-10 12:37:03 -07:00
jp9000 806bf557e5 removed a fairly pointless constant for the time being 2013-10-10 07:46:27 -07:00
jp9000 20490010e9 fix effect parser to properly parse and output uniform variables 2013-10-09 21:38:55 -07:00
jp9000 fda2ee1147 added initial GL shader code 2013-10-09 15:48:16 -07:00
jp9000 34357f00fb finish up GLSL conversion stuff and make some minor tweaks to shader parser 2013-10-08 13:36:15 -07:00
jp9000 f9d1a4b9ed added first GLSL code, moved some graphics functions around, and adjusted some existing shader parser code 2013-10-06 18:29:29 -07:00
jp9000 f9c2aadf53 remove some more code duplication, fix a string, and remove a potential bug 2013-10-05 09:40:43 -07:00
jp9000 5c92f22f0d moved some stuff around to avoid code duplication and finish up gl 2D texture code 2013-10-05 00:34:43 -07:00
jp9000 543d2481f1 move around some graphics stuff and put in copyright comments 2013-10-04 12:13:59 -07:00
jp9000 ec86c3eaf7 fixed code that used the newer gs_create_texture version 2013-10-04 09:01:39 -07:00
jp9000 75262e6e0b update graphics subsystem code to add mipmap support and also add initial GL texture stuff and helper functions 2013-10-04 08:55:33 -07:00
jp9000 817044721b made better checks when shutting down graphics subsystem 2013-10-02 23:13:26 -07:00
jp9000 e0393ba7a9 fixed static w32-pthreads initialization (release builds should work now on windows) 2013-10-01 18:16:23 -07:00
jp9000 b44ba06543 fixed the alignment issues for good 2013-10-01 07:24:59 -07:00
jp9000 7f8a2890a1 ...and should have probably compiled it first 2013-10-01 06:19:11 -07:00
jp9000 493537d7bc forgot one more alignment call 2013-10-01 06:18:29 -07:00
jp9000 658a27362d fixed some more alignment issues for SSE usage (maybe I should cut donw the size of the align function) 2013-10-01 06:16:40 -07:00
jp9000 92f48c1aa5 remove comment about removed api export 2013-10-01 05:56:07 -07:00
jp9000 4e6affdfc3 add an optional aligned new operator and use it with the d3d11 subsystem to prevent SIMD crashes 2013-10-01 00:27:14 -07:00
jp9000 f255ae1922 first commit 2013-09-30 19:37:13 -07:00