Change the way we start/kill sessions

No need for a modified version of segmenter anymore

5 files changed, 27 insertions, 783 deletions

diff --git a/bin/istream.sh b/bin/istream.sh
index 3476cc0..09503d3 100755
--- a/bin/istream.sh
+++ b/bin/istream.sh
@@ -33,10 +33,23 @@ fi
 
 cd ../ram/$SESSION
 
-2> /dev/null rm stream*.ts
+# Create a fifo
+2>/dev/null mkfifo ./fifo
 
-$FFPATH -i "$STREAM" -deinterlace -f mpegts -acodec libmp3lame -ab $ARATE -ac 2 -s $XY -vcodec libx264 -b $VRATE -flags +loop \
+#(trap "rm -rf $TMP; /usr/local/bin/fw" EXIT HUP INT TERM ABRT; cat $TMP/$OUT) &
+
+# Start ffmpeg
+(trap "rm -f ./ffmpeg.pid; rm -f ./fifo" EXIT HUP INT TERM ABRT; $FFPATH -i "$STREAM" -deinterlace -f mpegts -acodec libmp3lame -ab $ARATE -ac 2 -s $XY -vcodec libx264 -b $VRATE -flags +loop \
  -cmp \+chroma -partitions +parti4x4+partp8x8+partb8x8 -subq 5 -trellis 1 -refs 1 -coder 0 -me_range 16  -keyint_min 25 \
  -sc_threshold 40 -i_qfactor 0.71 -bt $VRATE -maxrate $VRATE -bufsize $VRATE -rc_eq 'blurCplx^(1-qComp)' -qcomp 0.6 \
- -qmin 10 -qmax 51 -qdiff 4 -level 30  -g 30 -async 2 -threads 4 - 2>$FFMPEGLOG | \
-$SEGMENTERPATH - $SEGDUR stream stream.m3u8 $HTTP_PATH$SESSION/ $SEGWIN &
+ -qmin 10 -qmax 51 -qdiff 4 -level 30  -g 30 -async 2 -threads 4 - 2>$FFMPEGLOG > ./fifo) &
+
+# Store ffmpeg pid
+2>/dev/null echo $! > ./ffmpeg.pid
+
+# Now start segmenter
+(trap "rm -f ./segmenter.pid" EXIT HUP INT TERM ABRT; 2>/dev/null $SEGMENTERPATH ./fifo $SEGDUR stream stream.m3u8 $HTTP_PATH$SESSION/ $SEGWIN) &
+
+# Store segmenter pid
+2>/dev/null echo $! > ./segmenter.pid
+
diff --git a/bin/session.php b/bin/session.php
index 950c855..2d63f4e 100644
--- a/bin/session.php
+++ b/bin/session.php
@@ -82,13 +82,13 @@ function sessioncreate($type, $url, $mode)
 	switch ($type)
 	{
 		case 'tv':
-			$cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh \\\"" .$url ."\\\" " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \\\"" .$ffdbg ."\\\" \" | at now";
+			$cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 2 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" >/dev/null &";
 			break;
 		case 'rec':
-			$cmd = "export SHELL=\"/bin/sh\";printf \"cat \\\"" .$url ."\\\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \\\"" .$ffdbg ."\\\" \" | at now";
+			$cmd = "cat \"" .$url ."\"/0* | ./istream.sh - " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" >/dev/null &";
 			break;
 		case 'vid':
-			$cmd = "export SHELL=\"/bin/sh\";printf \"./istream.sh \\\"" .$url ."\\\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \\\"" .$ffdbg ."\\\" \" | at now";
+			$cmd = "./istream.sh \"" .$url ."\" " .$qparams ." " .$httppath ." 1260 " .$ffmpegpath ." " .$segmenterpath ." " .$session ." \"" .$ffdbg ."\" >/dev/null &";
                         break;
 		default:
 			$cmd = "";
@@ -194,10 +194,15 @@ function sessiondeletesingle($session)
 	addlog("Deleting session " .$session);
 
 	$ram = "../ram/" .$session ."/";
+	$cmd = "";
 
-	// Get segmenter PID if any
+	// First kill ffmpeg
+	if (file_exists($ram ."ffmpeg.pid"))
+		$cmd .= " kill `cat " .$ram ."ffmpeg.pid`; rm " .$ram ."ffmpeg.pid; ";
+
+	// Then kill segmenter
 	if (file_exists($ram ."segmenter.pid"))
-		$cmd = "/usr/local/bin/fw;kill `cat " .$ram ."segmenter.pid`; rm " .$ram ."segmenter.pid; ";
+		$cmd .= " kill `cat " .$ram ."segmenter.pid`; rm " .$ram ."segmenter.pid; ";
 
 	addlog("Sending session kill command: " .$cmd);
 
diff --git a/segmenter/COPYING b/segmenter/COPYING
deleted file mode 100644
index d511905..0000000
--- a/segmenter/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-		    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.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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.
-
-  <signature of Ty Coon>, 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/segmenter/Makefile b/segmenter/Makefile
deleted file mode 100644
index 0c9abd2..0000000
--- a/segmenter/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-all:
-	gcc -Wall -g segmenter.c -o segmenter -lavformat -lavcodec -lavutil -lbz2
-
-clean:
-	rm segmenter
-
-install: segmenter
-	cp segmenter /usr/bin/
-
-uninstall:
-	rm /usr/bin/segmenter
diff --git a/segmenter/segmenter.c b/segmenter/segmenter.c
deleted file mode 100644
index 19ad979..0000000
--- a/segmenter/segmenter.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
- * Copyright (c) 2009 Chase Douglas
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * 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.
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "libavformat/avformat.h"
-
-static AVStream *add_output_stream(AVFormatContext *output_format_context, AVStream *input_stream) {
-    AVCodecContext *input_codec_context;
-    AVCodecContext *output_codec_context;
-    AVStream *output_stream;
-
-    output_stream = av_new_stream(output_format_context, 0);
-    if (!output_stream) {
-        fprintf(stderr, "Could not allocate stream\n");
-        exit(1);
-    }
-
-    input_codec_context = input_stream->codec;
-    output_codec_context = output_stream->codec;
-
-    output_codec_context->codec_id = input_codec_context->codec_id;
-    output_codec_context->codec_type = input_codec_context->codec_type;
-    output_codec_context->codec_tag = input_codec_context->codec_tag;
-    output_codec_context->bit_rate = input_codec_context->bit_rate;
-    output_codec_context->extradata = input_codec_context->extradata;
-    output_codec_context->extradata_size = input_codec_context->extradata_size;
-
-    if(av_q2d(input_codec_context->time_base) * input_codec_context->ticks_per_frame > av_q2d(input_stream->time_base) && av_q2d(input_stream->time_base) < 1.0/1000) {
-        output_codec_context->time_base = input_codec_context->time_base;
-        output_codec_context->time_base.num *= input_codec_context->ticks_per_frame;
-    }
-    else {
-        output_codec_context->time_base = input_stream->time_base;
-    }
-
-    switch (input_codec_context->codec_type) {
-        case CODEC_TYPE_AUDIO:
-            output_codec_context->channel_layout = input_codec_context->channel_layout;
-            output_codec_context->sample_rate = input_codec_context->sample_rate;
-            output_codec_context->channels = input_codec_context->channels;
-            output_codec_context->frame_size = input_codec_context->frame_size;
-            if ((input_codec_context->block_align == 1 && input_codec_context->codec_id == CODEC_ID_MP3) || input_codec_context->codec_id == CODEC_ID_AC3) {
-                output_codec_context->block_align = 0;
-            }
-            else {
-                output_codec_context->block_align = input_codec_context->block_align;
-            }
-            break;
-        case CODEC_TYPE_VIDEO:
-            output_codec_context->pix_fmt = input_codec_context->pix_fmt;
-            output_codec_context->width = input_codec_context->width;
-            output_codec_context->height = input_codec_context->height;
-            output_codec_context->has_b_frames = input_codec_context->has_b_frames;
-
-            if (output_format_context->oformat->flags & AVFMT_GLOBALHEADER) {
-                output_codec_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
-            }
-            break;
-    default:
-        break;
-    }
-
-    return output_stream;
-}
-
-int write_index_file(const char index[], const char tmp_index[], const unsigned int segment_duration, const char output_prefix[], const char http_prefix[], const unsigned int first_segment, const unsigned int last_segment, const int end, const int window) {
-    FILE *index_fp;
-    char *write_buf;
-    unsigned int i;
-
-    index_fp = fopen(tmp_index, "w");
-    if (!index_fp) {
-        fprintf(stderr, "Could not open temporary m3u8 index file (%s), no index file will be created\n", tmp_index);
-        return -1;
-    }
-
-    write_buf = malloc(sizeof(char) * 1024);
-    if (!write_buf) {
-        fprintf(stderr, "Could not allocate write buffer for index file, index file will be invalid\n");
-        fclose(index_fp);
-        return -1;
-    }
-
-    if (window) {
-        snprintf(write_buf, 1024, "#EXTM3U\n#EXT-X-TARGETDURATION:%u\n#EXT-X-MEDIA-SEQUENCE:%u\n", segment_duration, first_segment);
-    }
-    else {
-        snprintf(write_buf, 1024, "#EXTM3U\n#EXT-X-TARGETDURATION:%u\n", segment_duration);
-    }
-    if (fwrite(write_buf, strlen(write_buf), 1, index_fp) != 1) {
-        fprintf(stderr, "Could not write to m3u8 index file, will not continue writing to index file\n");
-        free(write_buf);
-        fclose(index_fp);
-        return -1;
-    }
-
-    for (i = first_segment; i <= last_segment; i++) {
-        snprintf(write_buf, 1024, "#EXTINF:%u,\n%s%s-%u.ts\n", segment_duration, http_prefix, output_prefix, i);
-        if (fwrite(write_buf, strlen(write_buf), 1, index_fp) != 1) {
-            fprintf(stderr, "Could not write to m3u8 index file, will not continue writing to index file\n");
-            free(write_buf);
-            fclose(index_fp);
-            return -1;
-        }
-    }
-
-    if (end) {
-        snprintf(write_buf, 1024, "#EXT-X-ENDLIST\n");
-        if (fwrite(write_buf, strlen(write_buf), 1, index_fp) != 1) {
-            fprintf(stderr, "Could not write last file and endlist tag to m3u8 index file\n");
-            free(write_buf);
-            fclose(index_fp);
-            return -1;
-        }
-    }
-
-    free(write_buf);
-    fclose(index_fp);
-
-    return rename(tmp_index, index);
-}
-
-int main(int argc, char **argv)
-{
-    const char *input;
-    const char *output_prefix;
-    double segment_duration;
-    char *segment_duration_check;
-    const char *index;
-    char *tmp_index;
-    const char *http_prefix;
-    long max_tsfiles = 0;
-    char *max_tsfiles_check;
-    double prev_segment_time = 0;
-    unsigned int output_index = 1;
-    AVInputFormat *ifmt;
-    AVOutputFormat *ofmt;
-    AVFormatContext *ic = NULL;
-    AVFormatContext *oc;
-    AVStream *video_st;
-    AVStream *audio_st;
-    AVCodec *codec;
-    char *output_filename;
-    char *remove_filename;
-    int video_index;
-    int audio_index;
-    unsigned int first_segment = 1;
-    unsigned int last_segment = 0;
-    int write_index = 1;
-    int decode_done;
-    char *dot;
-    int ret;
-    int i;
-    int remove_file;
-    FILE * pid_file;
-
-    if (argc < 6 || argc > 7) {
-        fprintf(stderr, "Usage: %s <input MPEG-TS file> <segment duration in seconds> <output MPEG-TS file prefix> <output m3u8 index file> <http prefix> [<segment window size>]\n", argv[0]);
-        exit(1);
-    }
-
-    // Create PID file
-    pid_file=fopen("./segmenter.pid", "w");
-    if (pid_file)
-    {
-    	fprintf(pid_file, "%d", getpid());
-        fclose(pid_file);
-    }
-
-    av_register_all();
-
-    input = argv[1];
-    if (!strcmp(input, "-")) {
-        input = "pipe:";
-    }
-    segment_duration = strtod(argv[2], &segment_duration_check);
-    if (segment_duration_check == argv[2] || segment_duration == HUGE_VAL || segment_duration == -HUGE_VAL) {
-        fprintf(stderr, "Segment duration time (%s) invalid\n", argv[2]);
-        goto error;
-    }
-    output_prefix = argv[3];
-    index = argv[4];
-    http_prefix=argv[5];
-    if (argc == 7) {
-        max_tsfiles = strtol(argv[6], &max_tsfiles_check, 10);
-        if (max_tsfiles_check == argv[6] || max_tsfiles < 0 || max_tsfiles >= INT_MAX) {
-            fprintf(stderr, "Maximum number of ts files (%s) invalid\n", argv[6]);
-            goto error;
-        }
-    }
-
-    remove_filename = malloc(sizeof(char) * (strlen(output_prefix) + 15));
-    if (!remove_filename) {
-        fprintf(stderr, "Could not allocate space for remove filenames\n");
-        goto error;
-    }
-
-    output_filename = malloc(sizeof(char) * (strlen(output_prefix) + 15));
-    if (!output_filename) {
-        fprintf(stderr, "Could not allocate space for output filenames\n");
-        goto error;
-    }
-
-    tmp_index = malloc(strlen(index) + 2);
-    if (!tmp_index) {
-        fprintf(stderr, "Could not allocate space for temporary index filename\n");
-        goto error;
-    }
-
-    strncpy(tmp_index, index, strlen(index) + 2);
-    dot = strrchr(tmp_index, '/');
-    dot = dot ? dot + 1 : tmp_index;
-    for (i = strlen(tmp_index) + 1; i > dot - tmp_index; i--) {
-        tmp_index[i] = tmp_index[i - 1];
-    }
-    *dot = '.';
-
-    ifmt = av_find_input_format("mpegts");
-    if (!ifmt) {
-        fprintf(stderr, "Could not find MPEG-TS demuxer\n");
-        goto error;
-    }
-
-    ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
-    if (ret != 0) {
-        fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret);
-        goto error;
-    }
-
-    if (av_find_stream_info(ic) < 0) {
-        fprintf(stderr, "Could not read stream information\n");
-        goto error;
-    }
-
-    ofmt = av_guess_format("mpegts", NULL, NULL);
-    if (!ofmt) {
-        fprintf(stderr, "Could not find MPEG-TS muxer\n");
-        goto error;
-    }
-
-    oc = avformat_alloc_context();
-    if (!oc) {
-        fprintf(stderr, "Could not allocated output context");
-        goto error;
-    }
-    oc->oformat = ofmt;
-
-    video_index = -1;
-    audio_index = -1;
-
-    for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
-        switch (ic->streams[i]->codec->codec_type) {
-            case CODEC_TYPE_VIDEO:
-                video_index = i;
-                ic->streams[i]->discard = AVDISCARD_NONE;
-                video_st = add_output_stream(oc, ic->streams[i]);
-                break;
-            case CODEC_TYPE_AUDIO:
-                audio_index = i;
-                ic->streams[i]->discard = AVDISCARD_NONE;
-                audio_st = add_output_stream(oc, ic->streams[i]);
-                break;
-            default:
-                ic->streams[i]->discard = AVDISCARD_ALL;
-                break;
-        }
-    }
-
-    if (av_set_parameters(oc, NULL) < 0) {
-        fprintf(stderr, "Invalid output format parameters\n");
-        goto error;
-    }
-
-    dump_format(oc, 0, output_prefix, 1);
-
-    codec = avcodec_find_decoder(video_st->codec->codec_id);
-    if (!codec) {
-        fprintf(stderr, "Could not find video decoder, key frames will not be honored\n");
-    }
-
-    if (avcodec_open(video_st->codec, codec) < 0) {
-        fprintf(stderr, "Could not open video decoder, key frames will not be honored\n");
-    }
-
-    snprintf(output_filename, strlen(output_prefix) + 15, "%s-%u.ts", output_prefix, output_index++);
-    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-        fprintf(stderr, "Could not open '%s'\n", output_filename);
-        goto error;
-    }
-
-    if (av_write_header(oc)) {
-        fprintf(stderr, "Could not write mpegts header to first output file\n");
-        goto error;
-    }
-
-    write_index = !write_index_file(index, tmp_index, segment_duration, output_prefix, http_prefix, first_segment, last_segment, 0, max_tsfiles);
-
-    do {
-        double segment_time;
-        AVPacket packet;
-
-        decode_done = av_read_frame(ic, &packet);
-        if (decode_done < 0) {
-            break;
-        }
-
-        if (av_dup_packet(&packet) < 0) {
-            fprintf(stderr, "Could not duplicate packet");
-            av_free_packet(&packet);
-            break;
-        }
-
-        if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
-            segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
-        }
-        else if (video_index < 0) {
-            segment_time = (double)audio_st->pts.val * audio_st->time_base.num / audio_st->time_base.den;
-        }
-        else {
-            segment_time = prev_segment_time;
-        }
-
-        if (segment_time - prev_segment_time >= segment_duration) {
-            put_flush_packet(oc->pb);
-            url_fclose(oc->pb);
-
-            if (max_tsfiles && (int)(last_segment - first_segment) >= max_tsfiles - 1) {
-                remove_file = 1;
-                first_segment++;
-            }
-            else {
-                remove_file = 0;
-            }
-
-            if (write_index) {
-                write_index = !write_index_file(index, tmp_index, segment_duration, output_prefix, http_prefix, first_segment, ++last_segment, 0, max_tsfiles);
-            }
-
-            if (remove_file) {
-                snprintf(remove_filename, strlen(output_prefix) + 15, "%s-%u.ts", output_prefix, first_segment - 1);
-                remove(remove_filename);
-            }
-
-            snprintf(output_filename, strlen(output_prefix) + 15, "%s-%u.ts", output_prefix, output_index++);
-            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-                fprintf(stderr, "Could not open '%s'\n", output_filename);
-                break;
-            }
-
-            prev_segment_time = segment_time;
-        }
-
-        ret = av_interleaved_write_frame(oc, &packet);
-        if (ret < 0) {
-            fprintf(stderr, "Warning: Could not write frame of stream\n");
-        }
-        else if (ret > 0) {
-            fprintf(stderr, "End of stream requested\n");
-            av_free_packet(&packet);
-            break;
-        }
-
-        av_free_packet(&packet);
-    } while (!decode_done);
-
-    av_write_trailer(oc);
-
-    avcodec_close(video_st->codec);
-
-    for(i = 0; i < oc->nb_streams; i++) {
-        av_freep(&oc->streams[i]->codec);
-        av_freep(&oc->streams[i]);
-    }
-
-    url_fclose(oc->pb);
-    av_free(oc);
-
-    if (max_tsfiles && (int)(last_segment - first_segment) >= max_tsfiles - 1) {
-        remove_file = 1;
-        first_segment++;
-    }
-    else {
-        remove_file = 0;
-    }
-
-    if (write_index) {
-        write_index_file(index, tmp_index, segment_duration, output_prefix, http_prefix, first_segment, ++last_segment, 1, max_tsfiles);
-    }
-
-    if (remove_file) {
-        snprintf(remove_filename, strlen(output_prefix) + 15, "%s-%u.ts", output_prefix, first_segment - 1);
-        remove(remove_filename);
-    }
-
-    remove("./segmenter.pid");
-
-    return 0;
-
-error:
-    remove("./segmenter.pid");
-
-    return 1;
-
-}
-
-// vim:sw=4:tw=4:ts=4:ai:expandtab