[Bf-blender-cvs] [aab5ac25f2c] blender2.8: Remove Frame Server
Campbell Barton
noreply at git.blender.org
Wed May 9 12:50:36 CEST 2018
Commit: aab5ac25f2c2e6fbc50f9fb352e71ef0ae0ba2f1
Author: Campbell Barton
Date: Wed May 9 12:43:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBaab5ac25f2c2e6fbc50f9fb352e71ef0ae0ba2f1
Remove Frame Server
This feature is limited (only byte PPM output, no multi-view),
only works with specific configurations.
This also causes some maintenance overhead
when testing changes to the render pipeline.
===================================================================
M CMakeLists.txt
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_lite.cmake
M build_files/cmake/config/blender_release.cmake
M release/scripts/modules/bl_i18n_utils/utils_spell_check.py
M release/scripts/startup/bl_ui/space_userpref.py
D release/windows/contrib/vfapi/README
D release/windows/contrib/vfapi/vfapi-plugin.c
D source/blender/blenkernel/BKE_writeframeserver.h
M source/blender/blenkernel/CMakeLists.txt
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/writeavi.c
D source/blender/blenkernel/intern/writeframeserver.c
M source/blender/editors/interface/resources.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/CMakeLists.txt
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/python/intern/CMakeLists.txt
M source/blender/python/intern/bpy_app_build_options.c
M source/blender/render/intern/source/pipeline.c
M source/creator/creator_args.c
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a45cce83f8..0540ec85e87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -319,7 +319,6 @@ option(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON)
option(WITH_IMAGE_DDS "Enable DDS Image Support" ON)
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
-option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
option(WITH_CODEC_AVI "Enable Blenders own AVI file support (raw/jpeg)" ON)
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index 635484633c2..62a26d27834 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -23,7 +23,6 @@ set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE)
set(WITH_IK_ITASC ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_DDS ON CACHE BOOL "" FORCE)
-set(WITH_IMAGE_FRAMESERVER ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_HDR ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENEXR ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENJPEG ON CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index 5aa0f4f4bf1..b96354847f7 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -28,7 +28,6 @@ set(WITH_IK_SOLVER OFF CACHE BOOL "" FORCE)
set(WITH_IK_ITASC OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_CINEON OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_DDS OFF CACHE BOOL "" FORCE)
-set(WITH_IMAGE_FRAMESERVER OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_HDR OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENEXR OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENJPEG OFF CACHE BOOL "" FORCE)
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index a21c0d43b66..08272cef9f6 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -23,7 +23,6 @@ set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE)
set(WITH_IK_ITASC ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_DDS ON CACHE BOOL "" FORCE)
-set(WITH_IMAGE_FRAMESERVER ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_HDR ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENEXR ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_OPENJPEG ON CACHE BOOL "" FORCE)
diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
index ad25283a3fc..c8f62801af9 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -442,7 +442,6 @@ class SpellChecker:
"fedge", "fedges",
"filmic",
"fluidsim",
- "frameserver",
"freestyle",
"enum", "enums",
"gpencil",
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 454853545a6..566bcfc6b3e 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -480,7 +480,6 @@ class USERPREF_PT_system(Panel):
col = colsplit.column()
col.label(text="General:")
- col.prop(system, "frame_server_port")
col.prop(system, "scrollback", text="Console Scrollback")
col.separator()
diff --git a/release/windows/contrib/vfapi/README b/release/windows/contrib/vfapi/README
deleted file mode 100644
index f4081bfe02a..00000000000
--- a/release/windows/contrib/vfapi/README
+++ /dev/null
@@ -1,26 +0,0 @@
-VFAPI-Plugin
-
-This plugin enables TMPGEnc (or other VFAPI-compliant applications)
-to directly connect to the blender frameserver. (Well, this was the
-intention of the frameserver... ;-)
-
-Use mingw
-
-i586-mingw32msvc-gcc -shared vfapi-plugin.c -o blenderserver.vfp -lwsock32
-i586-mingw32msvc-strip blenderserver.vfp
-
-and copy the resulting plugin into your TMPGenc directory.
-
-Usage:
-
-Create a small file that only contains
-
-host:port
-
-where "host" is running blender frameserver on "port"
-
-and call it something.blu
-
-You can open the blu-file in TMPGenc. That's all. The rest is automagic.
-By the way: the whole thing is developed completely under linux and
-tested successfully with a vanilla wine-0.9.6...
diff --git a/release/windows/contrib/vfapi/vfapi-plugin.c b/release/windows/contrib/vfapi/vfapi-plugin.c
deleted file mode 100644
index 8fe19da3d72..00000000000
--- a/release/windows/contrib/vfapi/vfapi-plugin.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * VFAPI-Plugin
- *
- * Copyright (c) 2006 Peter Schlaile
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- */
-
-#include <windows.h>
-#include <winbase.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <direct.h>
-
-#define VF_STREAM_VIDEO 0x00000001
-#define VF_STREAM_AUDIO 0x00000002
-#define VF_OK 0x00000000
-#define VF_ERROR 0x80004005
-
-typedef struct {
- DWORD dwSize;
- DWORD dwAPIVersion;
- DWORD dwVersion;
- DWORD dwSupportStreamType;
- char cPluginInfo[256];
- char cFileType[256];
-} VF_PluginInfo,*LPVF_PluginInfo;
-
-typedef DWORD VF_FileHandle,*LPVF_FileHandle;
-
-typedef struct {
- DWORD dwSize;
- DWORD dwHasStreams;
-} VF_FileInfo,*LPVF_FileInfo;
-
-typedef struct {
- DWORD dwSize;
- DWORD dwLengthL;
- DWORD dwLengthH;
- DWORD dwRate;
- DWORD dwScale;
- DWORD dwWidth;
- DWORD dwHeight;
- DWORD dwBitCount;
-} VF_StreamInfo_Video,*LPVF_StreamInfo_Video;
-
-typedef struct {
- DWORD dwSize;
- DWORD dwLengthL;
- DWORD dwLengthH;
- DWORD dwRate;
- DWORD dwScale;
- DWORD dwChannels;
- DWORD dwBitsPerSample;
- DWORD dwBlockAlign;
-} VF_StreamInfo_Audio,*LPVF_StreamInfo_Audio;
-
-typedef struct {
- DWORD dwSize;
- DWORD dwFrameNumberL;
- DWORD dwFrameNumberH;
- void *lpData;
- long lPitch;
-} VF_ReadData_Video,*LPVF_ReadData_Video;
-
-typedef struct {
- DWORD dwSize;
- LONGLONG dwSamplePos;
- DWORD dwSampleCount;
- DWORD dwReadedSampleCount;
- DWORD dwBufSize;
- void *lpBuf;
-} VF_ReadData_Audio,*LPVF_ReadData_Audio;
-
-typedef struct {
- DWORD dwSize;
- HRESULT (__stdcall *OpenFile)(
- char *lpFileName, LPVF_FileHandle lpFileHandle );
- HRESULT (__stdcall *CloseFile)( VF_FileHandle hFileHandle );
- HRESULT (__stdcall *GetFileInfo)( VF_FileHandle hFileHandle,
- LPVF_FileInfo lpFileInfo );
- HRESULT (__stdcall *GetStreamInfo)( VF_FileHandle hFileHandle,
- DWORD dwStream,void *lpStreamInfo );
- HRESULT (__stdcall *ReadData)( VF_FileHandle hFileHandle,
- DWORD dwStream,void *lpData );
-} VF_PluginFunc,*LPVF_PluginFunc;
-
-__declspec(dllexport) HRESULT vfGetPluginInfo(
- LPVF_PluginInfo lpPluginInfo )
-{
- if (!lpPluginInfo || lpPluginInfo->dwSize != sizeof(VF_PluginInfo)) {
- return VF_ERROR;
- }
-
- lpPluginInfo->dwAPIVersion = 1;
- lpPluginInfo->dwVersion = 1;
- lpPluginInfo->dwSupportStreamType = VF_STREAM_VIDEO;
- strcpy(lpPluginInfo->cPluginInfo, "Blender Frameserver");
- strcpy(lpPluginInfo->cFileType,
- "Blender Frame-URL-File (*.blu)|*.blu");
-
- return VF_OK;
-}
-
-static unsigned long getipaddress(const char *ipaddr)
-{
- struct hostent *host;
- unsigned long ip;
-
- if (((ip = inet_addr(ipaddr)) == INADDR_NONE) &&
- strcmp(ipaddr, "255.255.255.255") != 0)
- {
- if ((host = gethostbyname(ipaddr)) != NULL) {
- memcpy(&ip, host->h_addr, sizeof(ip));
- }
- }
-
- return (ip);
-}
-
-static void my_send(SOCKET sock, char *str)
-{
- send(sock, str, strlen(str), 0);
-}
-
-static int my_recv(SOCKET sock, char *line, int maxlen)
-{
- int got = 0;
- int toget = maxlen;
-
- while (toget > 0) {
- got = recv(sock, line, toget, 0);
- if (got <= 0) {
- return got;
- }
- toget -= got;
- line += got;
- }
- return maxlen;
-}
-
-static int my_gets(SOCKET sock, char *line, int maxlen)
-{
- int last_rval = 0;
-
- while (((last_rval = my_recv(sock, line, 1)) == 1) && maxlen > 0) {
- if (*line == '\n') {
- line++;
- *line = 0;
- break;
- }
- else {
- line++;
- maxlen--;
- }
- }
- return last_rval;
-}
-
-typedef struct conndesc_ {
- struct sockaddr_in addr;
- int width;
- int height;
- int start;
- int end;
- int rate;
- int ratescale;
-} conndesc;
-
-
-
-HRESULT __stdcall VF_OpenFileFunc_Blen(
- char *lpFileName, LPVF_FileHandle lpFileHandle )
-{
- conndesc * rval;
- char * host;
- char * p;
- int port;
- SOCKET s_in;
- char buf[256];
- struct sockaddr_in addr;
- FILE *fp;
-
- p = lpFileName;
- while (*p && *p != '.') p++;
- if (*p) p++;
- if (strcmp(p, "blu") != 0) {
- return VF_ERROR;
- }
-
- fp = fopen(lpFileName, "r");
- if (!fp) {
- return VF_ERROR;
- }
- fgets(buf, 256, fp);
- fclose(fp);
-
- host = buf;
- p = host;
- while (*p && *p != ':') p++;
- if (*p) p++;
- p[-1] = 0;
- port = atoi(p);
- if (!port) {
- port = 8080;
- }
-
- addr.sin_family = AF_INET;
- addr.sin_port = htons(port);
- addr.sin_addr.s_addr = getipaddress(host);
-
- s_in = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
- if (s_in < 0) {
- return VF_ERROR;
- }
-
- if (connect(s_in, (struct sockaddr*) &addr,
- sizeof(addr)) < 0) {
- closesocket(s_in);
- return VF_ERROR;
- }
-
- rval = (conndesc *) malloc(sizeof(conndesc));
-
- rval->addr = addr;
-
- my_send(s_in, "GET /info.txt HTTP/1.0\n\n");
-
- for (;;) {
- char * key;
- char * val
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list