From aa3c6213114be76ab3adcfc3eeeed7865c746280 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 13 Apr 2013 23:03:49 +0200 Subject: [PATCH] Make more usable documentation. --- COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++ README | 51 ++++++- vlc-metacube.diff | 251 ++++++++++++++++++++++++++++++++++ 3 files changed, 636 insertions(+), 5 deletions(-) create mode 100644 COPYING create mode 100644 vlc-metacube.diff diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README b/README index 06c1c64..a869221 100644 --- a/README +++ b/README @@ -1,7 +1,48 @@ -Cubemap is a high-performance, high-availaility video reflector, -specifically made for use with VLC. +Cubemap is a high-performance, high-availability video reflector, +specifically made for use with VLC. It is currently in alpha stage. -Copyright 2013 Steinar H. Gunderson . -Licensed under the GNU GPL, version 2. +A short list of features: + + - High-performance. Exactly how high-performance remains to be seen, + but it is designed to go to 10 Gbit/sec and beyond, through a + design with multiple worker threads, epoll and sendfile + (yes, sendfile). + - High-availability. You can change any part of the configuration + (and even upgrade to a newer version of Cubemap) by changing cubemap.config + and sending a SIGHUP; all clients will continue as if nothing had happened + (unless you delete the stream they are watching, of course). + Cubemap also survives the encoder dying and reconnecting. + - Per-stream fwmark support, for TCP pacing through tc (separate config needed). + - Reflects anything VLC can reflect over HTTP, even the muxes VLC + has problems reflecting itself (in particular, FLV). + - IPv4 support. Yes, Cubemap even supports (some) legacy protocols. + + +HOWTO: + + sudo aptitude install libprotobuf-dev protobuf-compiler + make -j4 + +If you want to use HTTP input (you probably want to), patch VLC with the +included file vlc-metacube.diff. Then start the VLC encoder with the +“metacube” flag to the http access mux, like this: + + cvlc [...] --sout '#std{access=http{metacube,mime=video/x-flv},mux=flv,dst=:4013/test.flv}' -More information to come here, later. :-) +Then look through cubemap.config.sample, copy it to cubemap.config, +compile and start cubemap. + +To upgrade cubemap (after you've compiled a new binary), or to pick up new +config: + + killall -HUP cubemap + +Cubemap will serialize itself to disk, check that the new binary and config +are OK, and then exec() the new version, which deserializes everything and +keeps going. + + +Legalese: + +Copyright 2013 Steinar H. Gunderson . +Licensed under the GNU GPL, version 2. See the included COPYING file. diff --git a/vlc-metacube.diff b/vlc-metacube.diff new file mode 100644 index 0000000..0d965a1 --- /dev/null +++ b/vlc-metacube.diff @@ -0,0 +1,251 @@ +diff --git a/include/vlc_httpd.h b/include/vlc_httpd.h +index 6100dd0..46d557a 100644 +--- a/include/vlc_httpd.h ++++ b/include/vlc_httpd.h +@@ -135,10 +135,10 @@ VLC_API void httpd_RedirectDelete( httpd_redirect_t * ); + + + typedef struct httpd_stream_t httpd_stream_t; +-VLC_API httpd_stream_t * httpd_StreamNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password ) VLC_USED; ++VLC_API httpd_stream_t * httpd_StreamNew( httpd_host_t *, const char *psz_url, const char *psz_mime, const char *psz_user, const char *psz_password, bool b_metacube ) VLC_USED; + VLC_API void httpd_StreamDelete( httpd_stream_t * ); + VLC_API int httpd_StreamHeader( httpd_stream_t *, uint8_t *p_data, int i_data ); +-VLC_API int httpd_StreamSend( httpd_stream_t *, uint8_t *p_data, int i_data ); ++VLC_API int httpd_StreamSend( httpd_stream_t *, uint8_t *p_data, int i_data, bool b_header ); + + + /* Msg functions facilities */ +diff --git a/modules/access_output/http.c b/modules/access_output/http.c +index 61095f5..95dd705 100644 +--- a/modules/access_output/http.c ++++ b/modules/access_output/http.c +@@ -72,6 +72,8 @@ vlc_module_begin () + PASS_TEXT, PASS_LONGTEXT, true ) + add_string( SOUT_CFG_PREFIX "mime", "", + MIME_TEXT, MIME_LONGTEXT, true ) ++ add_bool( SOUT_CFG_PREFIX "metacube", false, ++ "Use the metacube protocol", "Use the metacube protocol", true ) + set_callbacks( Open, Close ) + vlc_module_end () + +@@ -80,7 +82,7 @@ vlc_module_end () + * Exported prototypes + *****************************************************************************/ + static const char *const ppsz_sout_options[] = { +- "user", "pwd", "mime", NULL ++ "user", "pwd", "mime", "metacube", NULL + }; + + static ssize_t Write( sout_access_out_t *, block_t * ); +@@ -114,6 +116,8 @@ static int Open( vlc_object_t *p_this ) + char *psz_pwd; + char *psz_mime; + ++ bool b_metacube; ++ + if( !( p_sys = p_access->p_sys = + malloc( sizeof( sout_access_out_sys_t ) ) ) ) + return VLC_ENOMEM ; +@@ -188,10 +192,12 @@ static int Open( vlc_object_t *p_this ) + { + psz_mime = var_GetNonEmptyString( p_access, SOUT_CFG_PREFIX "mime" ); + } ++ ++ b_metacube = var_GetBool( p_access, SOUT_CFG_PREFIX "metacube" ); + + p_sys->p_httpd_stream = + httpd_StreamNew( p_sys->p_httpd_host, path, psz_mime, +- psz_user, psz_pwd ); ++ psz_user, psz_pwd, b_metacube ); + free( psz_user ); + free( psz_pwd ); + free( psz_mime ); +@@ -263,8 +269,9 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) + while( p_buffer ) + { + block_t *p_next; +- +- if( p_buffer->i_flags & BLOCK_FLAG_HEADER ) ++ bool b_header_block = p_buffer->i_flags & BLOCK_FLAG_HEADER; ++ ++ if( b_header_block ) + { + /* gather header */ + if( p_sys->b_header_complete ) +@@ -295,9 +302,10 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) + } + + i_len += p_buffer->i_buffer; ++ + /* send data */ + i_err = httpd_StreamSend( p_sys->p_httpd_stream, p_buffer->p_buffer, +- p_buffer->i_buffer ); ++ p_buffer->i_buffer, b_header_block ); + + p_next = p_buffer->p_next; + block_Release( p_buffer ); +diff --git a/src/network/httpd.c b/src/network/httpd.c +index f76c47c..dcda968 100644 +--- a/src/network/httpd.c ++++ b/src/network/httpd.c +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + #include "../libvlc.h" + + #include +@@ -66,6 +67,7 @@ + #endif + + static void httpd_ClientClean( httpd_client_t *cl ); ++static void httpd_AppendData( httpd_stream_t *stream, uint8_t *p_data, int i_data ); + + /* each host run in his own thread */ + struct httpd_host_t +@@ -621,6 +623,7 @@ struct httpd_stream_t + httpd_url_t *url; + + char *psz_mime; ++ bool b_metacube; + + /* Header to send as first packet */ + uint8_t *p_header; +@@ -712,9 +715,24 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, + /* Send the header */ + if( stream->i_header > 0 ) + { +- answer->i_body = stream->i_header; +- answer->p_body = xmalloc( stream->i_header ); +- memcpy( answer->p_body, stream->p_header, stream->i_header ); ++ if ( stream->b_metacube ) ++ { ++ struct metacube_block_header hdr; ++ memcpy( hdr.sync, METACUBE_SYNC, sizeof(METACUBE_SYNC) ); ++ hdr.size = htonl( stream->i_header ); ++ hdr.flags = htonl( METACUBE_FLAGS_HEADER ); ++ ++ answer->i_body = stream->i_header + sizeof( hdr ); ++ answer->p_body = xmalloc( answer->i_body ); ++ memcpy( answer->p_body, &hdr, sizeof( hdr ) ); ++ memcpy( answer->p_body + sizeof( hdr ), stream->p_header, stream->i_header ); ++ } ++ else ++ { ++ answer->i_body = stream->i_header; ++ answer->p_body = xmalloc( stream->i_header ); ++ memcpy( answer->p_body, stream->p_header, stream->i_header ); ++ } + } + answer->i_body_offset = stream->i_buffer_last_pos; + vlc_mutex_unlock( &stream->lock ); +@@ -758,13 +776,18 @@ static int httpd_StreamCallBack( httpd_callback_sys_t *p_sys, + httpd_MsgAdd( answer, "Content-type", "%s", stream->psz_mime ); + } + httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" ); ++ if ( stream->b_metacube ) ++ { ++ httpd_MsgAdd( answer, "Content-encoding", "metacube"); ++ } + return VLC_SUCCESS; + } + } + + httpd_stream_t *httpd_StreamNew( httpd_host_t *host, + const char *psz_url, const char *psz_mime, +- const char *psz_user, const char *psz_password ) ++ const char *psz_user, const char *psz_password, ++ bool b_metacube ) + { + httpd_stream_t *stream = xmalloc( sizeof( httpd_stream_t ) ); + +@@ -783,6 +806,7 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host, + { + stream->psz_mime = strdup( vlc_mime_Ext2Mime( psz_url ) ); + } ++ stream->b_metacube = b_metacube; + stream->i_header = 0; + stream->p_header = NULL; + stream->i_buffer_size = 5000000; /* 5 Mo per stream */ +@@ -819,22 +843,10 @@ int httpd_StreamHeader( httpd_stream_t *stream, uint8_t *p_data, int i_data ) + return VLC_SUCCESS; + } + +-int httpd_StreamSend( httpd_stream_t *stream, uint8_t *p_data, int i_data ) ++static void httpd_AppendData( httpd_stream_t *stream, uint8_t *p_data, int i_data ) + { +- int i_count; +- int i_pos; +- +- if( i_data < 0 || p_data == NULL ) +- { +- return VLC_SUCCESS; +- } +- vlc_mutex_lock( &stream->lock ); +- +- /* save this pointer (to be used by new connection) */ +- stream->i_buffer_last_pos = stream->i_buffer_pos; +- +- i_pos = stream->i_buffer_pos % stream->i_buffer_size; +- i_count = i_data; ++ int i_pos = stream->i_buffer_pos % stream->i_buffer_size; ++ int i_count = i_data; + while( i_count > 0) + { + int i_copy; +@@ -850,6 +862,31 @@ int httpd_StreamSend( httpd_stream_t *stream, uint8_t *p_data, int i_data ) + } + + stream->i_buffer_pos += i_data; ++} ++ ++int httpd_StreamSend( httpd_stream_t *stream, uint8_t *p_data, int i_data, bool b_header ) ++{ ++ if( i_data < 0 || p_data == NULL ) ++ { ++ return VLC_SUCCESS; ++ } ++ vlc_mutex_lock( &stream->lock ); ++ ++ /* save this pointer (to be used by new connection) */ ++ stream->i_buffer_last_pos = stream->i_buffer_pos; ++ ++ if ( stream->b_metacube ) { ++ struct metacube_block_header hdr; ++ memcpy( hdr.sync, METACUBE_SYNC, sizeof(METACUBE_SYNC) ); ++ hdr.size = htonl( i_data ); ++ if ( b_header ) { ++ hdr.flags = htonl( METACUBE_FLAGS_HEADER ); ++ } else { ++ hdr.flags = htonl( 0 ); ++ } ++ httpd_AppendData( stream, (uint8_t *)&hdr, sizeof(hdr) ); ++ } ++ httpd_AppendData( stream, p_data, i_data ); + + vlc_mutex_unlock( &stream->lock ); + return VLC_SUCCESS; +diff --git a/include/metacube.h b/include/metacube.h +new file mode 100644 +index 0000000..b40a42e +--- /dev/null ++++ b/include/metacube.h +@@ -0,0 +1,17 @@ ++#ifndef _METACUBE_H ++#define _METACUBE_H ++ ++/* Definitions for the Metacube protocol, used to communicate with Cubemap. */ ++ ++#include ++ ++#define METACUBE_SYNC "\\o/_metacube_\\o/" /* 16 bytes long. */ ++#define METACUBE_FLAGS_HEADER 0x1 ++ ++struct metacube_block_header { ++ char sync[16]; /* METACUBE_SYNC */ ++ uint32_t size; /* Network byte order. Does not include header. */ ++ uint32_t flags; /* Network byte order. METACUBE_FLAGS_*. */ ++}; ++ ++#endif /* !defined(_METACUBE_H) */ -- 2.39.2