jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add preliminary FLV/RTMP output (incomplete)

Browse Source 
- obs-outputs module:  Add preliminary code to send out data, and add
   an FLV muxer.  This time we don't really need to build the packets
   ourselves, we can just use the FLV muxer and send it directly to
   RTMP_Write and it should automatically parse the entire stream for us
   without us having to do much manual code at all.  We'll see how it
   goes.

 - libobs:  Add AVC NAL packet parsing code

 - libobs/media-io:  Add quick helper functions for audio/video to get
   the width/height/fps/samplerate/etc rather than having to query the
   info structures each time.

 - libobs (obs-output.c):  Change 'connect' signal to 'start' and 'stop'
   signals.  'start' now specifies an error code rather than whether it
   simply failed, that way the client can actually know *why* a failure
   occurred.  Added those error codes to obs-defs.h.

 - libobs:  Add a few functions to duplicate/free encoder packets
This commit is contained in:
jp9000
2014-04-01 11:55:18 -07:00
parent ed6fc7b122
commit 0cf9e0cfdd
29 changed files with 1083 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
plugins/obs-outputs/rtmp-helpers.h Normal file
View File

@@ -0,0 +1,46 @@
/******************************************************************************
Copyright (C) 2014 by Hugh Bailey <obs.jim@gmail.com>
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, see <http://www.gnu.org/licenses/>.
******************************************************************************/
#include "librtmp/rtmp.h"
static inline AVal *flv_str(AVal *out, const char *str)
{
out->av_val = (char*)str;
out->av_len = (int)strlen(str);
return out;
}
static inline void enc_num(char **enc, char *end, const char *name, double val)
{
AVal s;
*enc = AMF_EncodeNamedNumber(*enc, end, flv_str(&s, name), val);
}
static inline void enc_bool(char **enc, char *end, const char *name, bool val)
{
AVal s;
*enc = AMF_EncodeNamedBoolean(*enc, end, flv_str(&s, name), val);
}
static inline void enc_str(char **enc, char *end, const char *name,
const char *val)
{
AVal s1, s2;
*enc = AMF_EncodeNamedString(*enc, end,
flv_str(&s1, name),
flv_str(&s2, val));
}