Implement encoder interface (still preliminary)
- Implement OBS encoder interface. It was previously incomplete, but
now is reaching some level of completion, though probably should
still be considered preliminary.
I had originally implemented it so that encoders only have a 'reset'
function to reset their parameters, but I felt that having both a
'start' and 'stop' function would be useful.
Encoders are now assigned to a specific video/audio media output each
rather than implicitely assigned to the main obs video/audio
contexts. This allows separate encoder contexts that aren't
necessarily assigned to the main video/audio context (which is useful
for things such as recording specific sources). Will probably have
to do this for regular obs outputs as well.
When creating an encoder, you must now explicitely state whether that
encoder is an audio or video encoder.
Audio and video can optionally be automatically converted depending
on what the encoder specifies.
When something 'attaches' to an encoder, the first attachment starts
the encoder, and the encoder automatically attaches to the media
output context associated with it. Subsequent attachments won't have
the same effect, they will just start receiving the same encoder data
when the next keyframe plays (along with SEI if any). When detaching
from the encoder, the last detachment will fully stop the encoder and
detach the encoder from the media output context associated with the
encoder.
SEI must actually be exported separately; because new encoder
attachments may not always be at the beginning of the stream, the
first keyframe they get must have that SEI data in it. If the
encoder has SEI data, it needs only add one small function to simply
query that SEI data, and then that data will be handled automatically
by libobs for all subsequent encoder attachments.
- Implement x264 encoder plugin, move x264 files to separate plugin to
separate necessary dependencies.
- Change video/audio frame output structures to not use const
qualifiers to prevent issues with non-const function usage elsewhere.
This was an issue when writing the x264 encoder, as the x264 encoder
expects non-const frame data.
Change stagesurf_map to return a non-const data type to prevent this
as well.
- Change full range parameter of video scaler to be an enum rather than
boolean
2014-03-16 16:21:34 -07:00
|
|
|
/******************************************************************************
|
|
|
|
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 <util/dstr.h>
|
|
|
|
#include <util/darray.h>
|
|
|
|
#include <obs.h>
|
|
|
|
#include <x264.h>
|
|
|
|
|
|
|
|
struct obs_x264 {
|
|
|
|
obs_encoder_t encoder;
|
|
|
|
|
|
|
|
x264_param_t params;
|
|
|
|
x264_t *context;
|
|
|
|
|
|
|
|
DARRAY(uint8_t) packet_data;
|
|
|
|
|
|
|
|
uint8_t *extra_data;
|
|
|
|
uint8_t *sei;
|
|
|
|
|
|
|
|
size_t extra_data_size;
|
|
|
|
size_t sei_size;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* ------------------------------------------------------------------------- */
|
|
|
|
|
|
|
|
static const char *obs_x264_getname(const char *locale)
|
|
|
|
{
|
|
|
|
/* TODO locale lookup */
|
|
|
|
UNUSED_PARAMETER(locale);
|
|
|
|
return "x264";
|
|
|
|
}
|
|
|
|
|
|
|
|
static void obs_x264_stop(void *data);
|
|
|
|
|
Implement encoder usage with outputs
- Make it so that encoders can be assigned to outputs. If an encoder
is destroyed, it will automatically remove itself from that output.
I specifically didn't want to do reference counting because it leaves
too much potential for unchecked references and it just felt like it
would be more trouble than it's worth.
- Add a 'flags' value to the output definition structure. This lets
the output specify if it uses video/audio, and whether the output is
meant to be used with OBS encoders or not.
- Remove boilerplate code for outputs. This makes it easier to program
outputs. The boilerplate code involved before was mostly just
involving connecting to the audio/video data streams directly in each
output plugin.
Instead of doing that, simply add plugin callback functions for
receiving video/audio (either encoded or non-encoded, whichever it's
set to use), and then call obs_output_begin_data_capture and
obs_output_end_data_capture to automatically handle setting up
connections to raw or encoded video/audio streams for the plugin.
- Remove 'active' function from output callbacks, as it's no longer
really needed now that the libobs output context automatically knows
when the output is active or not.
- Make it so that an encoder cannot be destroyed until all data
connections to the encoder have been removed.
- Change the 'start' and 'stop' functions in the encoder interface to
just an 'initialize' callback, which initializes the encoder.
- Make it so that the encoder must be initialized first before the data
stream can be started. The reason why initialization was separated
from starting the encoder stream was because we need to be able to
check that the settings used with the encoder *can* be used first.
This problem was especially annoying if you had both video/audio
encoding. Before, you'd have to check the return value from
obs_encoder_start, and if that second encoder fails, then you
basically had to stop the first encoder again, making for
unnecessary boilerplate code whenever starting up two encoders.
2014-03-27 21:50:15 -07:00
|
|
|
static void clear_data(struct obs_x264 *obsx264)
|
|
|
|
{
|
|
|
|
if (obsx264->context) {
|
|
|
|
x264_encoder_close(obsx264->context);
|
|
|
|
bfree(obsx264->sei);
|
|
|
|
bfree(obsx264->extra_data);
|
|
|
|
|
|
|
|
obsx264->context = NULL;
|
|
|
|
obsx264->sei = NULL;
|
|
|
|
obsx264->extra_data = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Implement encoder interface (still preliminary)
- Implement OBS encoder interface. It was previously incomplete, but
now is reaching some level of completion, though probably should
still be considered preliminary.
I had originally implemented it so that encoders only have a 'reset'
function to reset their parameters, but I felt that having both a
'start' and 'stop' function would be useful.
Encoders are now assigned to a specific video/audio media output each
rather than implicitely assigned to the main obs video/audio
contexts. This allows separate encoder contexts that aren't
necessarily assigned to the main video/audio context (which is useful
for things such as recording specific sources). Will probably have
to do this for regular obs outputs as well.
When creating an encoder, you must now explicitely state whether that
encoder is an audio or video encoder.
Audio and video can optionally be automatically converted depending
on what the encoder specifies.
When something 'attaches' to an encoder, the first attachment starts
the encoder, and the encoder automatically attaches to the media
output context associated with it. Subsequent attachments won't have
the same effect, they will just start receiving the same encoder data
when the next keyframe plays (along with SEI if any). When detaching
from the encoder, the last detachment will fully stop the encoder and
detach the encoder from the media output context associated with the
encoder.
SEI must actually be exported separately; because new encoder
attachments may not always be at the beginning of the stream, the
first keyframe they get must have that SEI data in it. If the
encoder has SEI data, it needs only add one small function to simply
query that SEI data, and then that data will be handled automatically
by libobs for all subsequent encoder attachments.
- Implement x264 encoder plugin, move x264 files to separate plugin to
separate necessary dependencies.
- Change video/audio frame output structures to not use const
qualifiers to prevent issues with non-const function usage elsewhere.
This was an issue when writing the x264 encoder, as the x264 encoder
expects non-const frame data.
Change stagesurf_map to return a non-const data type to prevent this
as well.
- Change full range parameter of video scaler to be an enum rather than
boolean
2014-03-16 16:21:34 -07:00
|
|
|
static void obs_x264_destroy(void *data)
|
|
|
|
{
|
|
|
|
struct obs_x264 *obsx264 = data;
|
|
|
|
|
|
|
|
if (obsx264) {
|
Implement encoder usage with outputs
- Make it so that encoders can be assigned to outputs. If an encoder
is destroyed, it will automatically remove itself from that output.
I specifically didn't want to do reference counting because it leaves
too much potential for unchecked references and it just felt like it
would be more trouble than it's worth.
- Add a 'flags' value to the output definition structure. This lets
the output specify if it uses video/audio, and whether the output is
meant to be used with OBS encoders or not.
- Remove boilerplate code for outputs. This makes it easier to program
outputs. The boilerplate code involved before was mostly just
involving connecting to the audio/video data streams directly in each
output plugin.
Instead of doing that, simply add plugin callback functions for
receiving video/audio (either encoded or non-encoded, whichever it's
set to use), and then call obs_output_begin_data_capture and
obs_output_end_data_capture to automatically handle setting up
connections to raw or encoded video/audio streams for the plugin.
- Remove 'active' function from output callbacks, as it's no longer
really needed now that the libobs output context automatically knows
when the output is active or not.
- Make it so that an encoder cannot be destroyed until all data
connections to the encoder have been removed.
- Change the 'start' and 'stop' functions in the encoder interface to
just an 'initialize' callback, which initializes the encoder.
- Make it so that the encoder must be initialized first before the data
stream can be started. The reason why initialization was separated
from starting the encoder stream was because we need to be able to
check that the settings used with the encoder *can* be used first.
This problem was especially annoying if you had both video/audio
encoding. Before, you'd have to check the return value from
obs_encoder_start, and if that second encoder fails, then you
basically had to stop the first encoder again, making for
unnecessary boilerplate code whenever starting up two encoders.
2014-03-27 21:50:15 -07:00
|
|
|
clear_data(obsx264);
|
Implement encoder interface (still preliminary)
- Implement OBS encoder interface. It was previously incomplete, but
now is reaching some level of completion, though probably should
still be considered preliminary.
I had originally implemented it so that encoders only have a 'reset'
function to reset their parameters, but I felt that having both a
'start' and 'stop' function would be useful.
Encoders are now assigned to a specific video/audio media output each
rather than implicitely assigned to the main obs video/audio
contexts. This allows separate encoder contexts that aren't
necessarily assigned to the main video/audio context (which is useful
for things such as recording specific sources). Will probably have
to do this for regular obs outputs as well.
When creating an encoder, you must now explicitely state whether that
encoder is an audio or video encoder.
Audio and video can optionally be automatically converted depending
on what the encoder specifies.
When something 'attaches' to an encoder, the first attachment starts
the encoder, and the encoder automatically attaches to the media
output context associated with it. Subsequent attachments won't have
the same effect, they will just start receiving the same encoder data
when the next keyframe plays (along with SEI if any). When detaching
from the encoder, the last detachment will fully stop the encoder and
detach the encoder from the media output context associated with the
encoder.
SEI must actually be exported separately; because new encoder
attachments may not always be at the beginning of the stream, the
first keyframe they get must have that SEI data in it. If the
encoder has SEI data, it needs only add one small function to simply
query that SEI data, and then that data will be handled automatically
by libobs for all subsequent encoder attachments.
- Implement x264 encoder plugin, move x264 files to separate plugin to
separate necessary dependencies.
- Change video/audio frame output structures to not use const
qualifiers to prevent issues with non-const function usage elsewhere.
This was an issue when writing the x264 encoder, as the x264 encoder
expects non-const frame data.
Change stagesurf_map to return a non-const data type to prevent this
as well.
- Change full range parameter of video scaler to be an enum rather than
boolean
2014-03-16 16:21:34 -07:00
|
|
|
da_free(obsx264->packet_data);
|
|
|
|
bfree(obsx264);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void obs_x264_defaults(obs_data_t settings)
|
|
|
|
{
|
|
|
|
obs_data_set_default_int (settings, "bitrate", 1000);
|
|
|
|
obs_data_set_default_int (settings, "buffer_size", 1000);
|
|
|
|
obs_data_set_default_int (settings, "keyint_sec", 0);
|
|
|
|
|
|
|
|
obs_data_set_default_string(settings, "preset", "veryfast");
|
|
|
|
obs_data_set_default_string(settings, "profile", "");
|
|
|
|
obs_data_set_default_string(settings, "tune", "");
|
|
|
|
obs_data_set_default_string(settings, "x264opts", "");
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void add_strings(obs_property_t list, const char *const *strings)
|
|
|
|
{
|
|
|
|
while (*strings) {
|
|
|
|
obs_property_list_add_item(list, *strings, *strings);
|
|
|
|
strings++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static obs_properties_t obs_x264_props(const char *locale)
|
|
|
|
{
|
|
|
|
UNUSED_PARAMETER(locale);
|
|
|
|
/* TODO: locale */
|
|
|
|
|
|
|
|
obs_properties_t props = obs_properties_create();
|
|
|
|
obs_property_t list;
|
|
|
|
|
|
|
|
obs_properties_add_int(props, "bitrate", "Bitrate", 50, 100000, 1);
|
|
|
|
obs_properties_add_int(props, "buffer_size", "Buffer Size", 50, 100000,
|
|
|
|
1);
|
|
|
|
obs_properties_add_int(props,
|
|
|
|
"keyint_sec", "Keyframe interval (seconds, 0=auto)",
|
|
|
|
0, 20, 1);
|
|
|
|
|
|
|
|
list = obs_properties_add_list(props,
|
|
|
|
"preset", "CPU Usage Preset (encoder speed)",
|
|
|
|
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
|
|
|
|
add_strings(list, x264_preset_names);
|
|
|
|
|
|
|
|
list = obs_properties_add_list(props, "profile", "Profile",
|
|
|
|
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
|
|
|
|
obs_property_list_add_item(list, "baseline", "baseline");
|
|
|
|
obs_property_list_add_item(list, "main", "main");
|
|
|
|
obs_property_list_add_item(list, "high", "high");
|
|
|
|
|
|
|
|
list = obs_properties_add_list(props, "tune", "Tune",
|
|
|
|
OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
|
|
|
|
add_strings(list, x264_tune_names);
|
|
|
|
|
|
|
|
obs_properties_add_text(props, "x264opts",
|
|
|
|
"x264 encoder options (separated by ':')");
|
|
|
|
|
|
|
|
return props;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool getparam(const char *param, char **name, const char **value)
|
|
|
|
{
|
|
|
|
const char *assign;
|
|
|
|
|
|
|
|
if (!param || !*param || (*param == '='))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
assign = strchr(param, '=');
|
|
|
|
if (!assign || !*assign || !*(assign+1))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
*name = bstrdup_n(param, assign-param);
|
|
|
|
*value = assign+1;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void override_base_param(const char *param,
|
|
|
|
char **preset, char **profile, char **tune)
|
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
const char *val;
|
|
|
|
|
|
|
|
if (getparam(param, &name, &val)) {
|
|
|
|
if (astrcmpi(name, "preset") == 0) {
|
|
|
|
bfree(*preset);
|
|
|
|
*preset = bstrdup(val);
|
|
|
|
|
|
|
|
} else if (astrcmpi(name, "profile") == 0) {
|
|
|
|
bfree(*profile);
|
|
|
|
*profile = bstrdup(val);
|
|
|
|
|
|
|
|
} else if (astrcmpi(name, "tune") == 0) {
|
|
|
|
bfree(*tune);
|
|
|
|
*tune = bstrdup(val);
|
|
|
|
}
|
|
|
|
|
|
|
|
bfree(name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void override_base_params(char **params,
|
|
|
|
char **preset, char **profile, char **tune)
|
|
|
|
{
|
|
|
|
while (*params)
|
|
|
|
override_base_param(*(params++), preset, profile, tune);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void set_param(struct obs_x264 *obsx264, const char *param)
|
|
|
|
{
|
|
|
|
char *name;
|
|
|
|
const char *val;
|
|
|
|
|
|
|
|
if (getparam(param, &name, &val)) {
|
|
|
|
if (x264_param_parse(&obsx264->params, name, val) != 0)
|
|
|
|
blog(LOG_WARNING, "x264 param: %s failed", param);
|
|
|
|
|
|
|
|
bfree(name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void apply_x264_profile(struct obs_x264 *obsx264,
|
|
|
|
const char *profile)
|
|
|
|
{
|
|
|
|
if (!*profile) profile = NULL;
|
|
|
|
|
|
|
|
if (!obsx264->context && profile) {
|
|
|
|
int ret = x264_param_apply_profile(&obsx264->params, profile);
|
|
|
|
if (ret != 0)
|
|
|
|
blog(LOG_WARNING, "Failed to set x264 "
|
|
|
|
"profile '%s'", profile);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool reset_x264_params(struct obs_x264 *obsx264,
|
|
|
|
const char *preset, const char *tune)
|
|
|
|
{
|
|
|
|
if (!*preset) preset = NULL;
|
|
|
|
if (!*tune) tune = NULL;
|
|
|
|
|
|
|
|
return x264_param_default_preset(&obsx264->params, preset, tune) == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void log_x264(void *param, int level, const char *format, va_list args)
|
|
|
|
{
|
|
|
|
blogva(LOG_INFO, format, args);
|
|
|
|
|
|
|
|
UNUSED_PARAMETER(param);
|
|
|
|
UNUSED_PARAMETER(level);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void update_params(struct obs_x264 *obsx264, obs_data_t settings,
|
|
|
|
char **params)
|
|
|
|
{
|
|
|
|
video_t video = obs_encoder_video(obsx264->encoder);
|
|
|
|
const struct video_output_info *voi = video_output_getinfo(video);
|
|
|
|
|
|
|
|
int bitrate = (int)obs_data_getint(settings, "bitrate");
|
|
|
|
int buffer_size = (int)obs_data_getint(settings, "buffer_size");
|
|
|
|
int keyint_sec = (int)obs_data_getint(settings, "keyint_sec");
|
|
|
|
|
|
|
|
if (keyint_sec)
|
|
|
|
obsx264->params.i_keyint_max =
|
|
|
|
keyint_sec * voi->fps_num / voi->fps_den;
|
|
|
|
|
|
|
|
obsx264->params.rc.i_vbv_max_bitrate = bitrate;
|
|
|
|
obsx264->params.rc.i_vbv_buffer_size = buffer_size;
|
|
|
|
obsx264->params.rc.i_bitrate = bitrate;
|
|
|
|
obsx264->params.i_width = voi->width;
|
|
|
|
obsx264->params.i_height = voi->height;
|
|
|
|
obsx264->params.i_fps_num = voi->fps_num;
|
|
|
|
obsx264->params.i_fps_den = voi->fps_den;
|
|
|
|
obsx264->params.i_timebase_num = voi->fps_den;
|
|
|
|
obsx264->params.i_timebase_den = voi->fps_num;
|
|
|
|
obsx264->params.pf_log = log_x264;
|
|
|
|
obsx264->params.i_log_level = X264_LOG_WARNING;
|
|
|
|
|
|
|
|
if (voi->format == VIDEO_FORMAT_NV12)
|
|
|
|
obsx264->params.i_csp = X264_CSP_NV12;
|
|
|
|
else if (voi->format == VIDEO_FORMAT_I420)
|
|
|
|
obsx264->params.i_csp = X264_CSP_I420;
|
|
|
|
else
|
|
|
|
obsx264->params.i_csp = X264_CSP_NV12;
|
|
|
|
|
|
|
|
while (*params)
|
|
|
|
set_param(obsx264, *(params++));
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool update_settings(struct obs_x264 *obsx264, obs_data_t settings)
|
|
|
|
{
|
|
|
|
char *preset = bstrdup(obs_data_getstring(settings, "preset"));
|
|
|
|
char *profile = bstrdup(obs_data_getstring(settings, "profile"));
|
|
|
|
char *tune = bstrdup(obs_data_getstring(settings, "tune"));
|
|
|
|
const char *opts = obs_data_getstring(settings, "x264opts");
|
|
|
|
|
|
|
|
char **paramlist;
|
|
|
|
bool success = true;
|
|
|
|
|
|
|
|
paramlist = strlist_split(opts, ':', false);
|
|
|
|
|
|
|
|
if (!obsx264->context) {
|
|
|
|
override_base_params(paramlist, &preset, &tune, &profile);
|
|
|
|
success = reset_x264_params(obsx264, preset, tune);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (success) {
|
|
|
|
update_params(obsx264, settings, paramlist);
|
|
|
|
|
|
|
|
if (!obsx264->context)
|
|
|
|
apply_x264_profile(obsx264, profile);
|
|
|
|
}
|
|
|
|
|
|
|
|
strlist_free(paramlist);
|
|
|
|
bfree(preset);
|
|
|
|
bfree(profile);
|
|
|
|
bfree(tune);
|
|
|
|
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool obs_x264_update(void *data, obs_data_t settings)
|
|
|
|
{
|
|
|
|
struct obs_x264 *obsx264 = data;
|
|
|
|
bool success = update_settings(obsx264, settings);
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (success) {
|
|
|
|
ret = x264_encoder_reconfig(obsx264->context, &obsx264->params);
|
|
|
|
if (ret != 0)
|
|
|
|
blog(LOG_WARNING, "Failed to reconfigure x264: %d",
|
|
|
|
ret);
|
|
|
|
return ret == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void load_headers(struct obs_x264 *obsx264)
|
|
|
|
{
|
|
|
|
x264_nal_t *nals;
|
|
|
|
int nal_count;
|
|
|
|
DARRAY(uint8_t) header;
|
|
|
|
DARRAY(uint8_t) sei;
|
|
|
|
|
|
|
|
da_init(header);
|
|
|
|
da_init(sei);
|
|
|
|
|
|
|
|
x264_encoder_headers(obsx264->context, &nals, &nal_count);
|
|
|
|
|
|
|
|
for (int i = 0; i < nal_count; i++) {
|
|
|
|
x264_nal_t *nal = nals+i;
|
|
|
|
|
|
|
|
if (nal->i_type == NAL_SEI)
|
|
|
|
da_push_back_array(sei, nal->p_payload, nal->i_payload);
|
|
|
|
else
|
|
|
|
da_push_back_array(header, nal->p_payload,
|
|
|
|
nal->i_payload);
|
|
|
|
}
|
|
|
|
|
|
|
|
obsx264->extra_data = header.array;
|
|
|
|
obsx264->extra_data_size = header.num;
|
|
|
|
obsx264->sei = sei.array;
|
|
|
|
obsx264->sei_size = sei.num;
|
|
|
|
}
|
|
|
|
|
Implement encoder usage with outputs
- Make it so that encoders can be assigned to outputs. If an encoder
is destroyed, it will automatically remove itself from that output.
I specifically didn't want to do reference counting because it leaves
too much potential for unchecked references and it just felt like it
would be more trouble than it's worth.
- Add a 'flags' value to the output definition structure. This lets
the output specify if it uses video/audio, and whether the output is
meant to be used with OBS encoders or not.
- Remove boilerplate code for outputs. This makes it easier to program
outputs. The boilerplate code involved before was mostly just
involving connecting to the audio/video data streams directly in each
output plugin.
Instead of doing that, simply add plugin callback functions for
receiving video/audio (either encoded or non-encoded, whichever it's
set to use), and then call obs_output_begin_data_capture and
obs_output_end_data_capture to automatically handle setting up
connections to raw or encoded video/audio streams for the plugin.
- Remove 'active' function from output callbacks, as it's no longer
really needed now that the libobs output context automatically knows
when the output is active or not.
- Make it so that an encoder cannot be destroyed until all data
connections to the encoder have been removed.
- Change the 'start' and 'stop' functions in the encoder interface to
just an 'initialize' callback, which initializes the encoder.
- Make it so that the encoder must be initialized first before the data
stream can be started. The reason why initialization was separated
from starting the encoder stream was because we need to be able to
check that the settings used with the encoder *can* be used first.
This problem was especially annoying if you had both video/audio
encoding. Before, you'd have to check the return value from
obs_encoder_start, and if that second encoder fails, then you
basically had to stop the first encoder again, making for
unnecessary boilerplate code whenever starting up two encoders.
2014-03-27 21:50:15 -07:00
|
|
|
static bool obs_x264_initialize(void *data, obs_data_t settings)
|
Implement encoder interface (still preliminary)
- Implement OBS encoder interface. It was previously incomplete, but
now is reaching some level of completion, though probably should
still be considered preliminary.
I had originally implemented it so that encoders only have a 'reset'
function to reset their parameters, but I felt that having both a
'start' and 'stop' function would be useful.
Encoders are now assigned to a specific video/audio media output each
rather than implicitely assigned to the main obs video/audio
contexts. This allows separate encoder contexts that aren't
necessarily assigned to the main video/audio context (which is useful
for things such as recording specific sources). Will probably have
to do this for regular obs outputs as well.
When creating an encoder, you must now explicitely state whether that
encoder is an audio or video encoder.
Audio and video can optionally be automatically converted depending
on what the encoder specifies.
When something 'attaches' to an encoder, the first attachment starts
the encoder, and the encoder automatically attaches to the media
output context associated with it. Subsequent attachments won't have
the same effect, they will just start receiving the same encoder data
when the next keyframe plays (along with SEI if any). When detaching
from the encoder, the last detachment will fully stop the encoder and
detach the encoder from the media output context associated with the
encoder.
SEI must actually be exported separately; because new encoder
attachments may not always be at the beginning of the stream, the
first keyframe they get must have that SEI data in it. If the
encoder has SEI data, it needs only add one small function to simply
query that SEI data, and then that data will be handled automatically
by libobs for all subsequent encoder attachments.
- Implement x264 encoder plugin, move x264 files to separate plugin to
separate necessary dependencies.
- Change video/audio frame output structures to not use const
qualifiers to prevent issues with non-const function usage elsewhere.
This was an issue when writing the x264 encoder, as the x264 encoder
expects non-const frame data.
Change stagesurf_map to return a non-const data type to prevent this
as well.
- Change full range parameter of video scaler to be an enum rather than
boolean
2014-03-16 16:21:34 -07:00
|
|
|
{
|
|
|
|
struct obs_x264 *obsx264 = data;
|
|
|
|
|
Implement encoder usage with outputs
- Make it so that encoders can be assigned to outputs. If an encoder
is destroyed, it will automatically remove itself from that output.
I specifically didn't want to do reference counting because it leaves
too much potential for unchecked references and it just felt like it
would be more trouble than it's worth.
- Add a 'flags' value to the output definition structure. This lets
the output specify if it uses video/audio, and whether the output is
meant to be used with OBS encoders or not.
- Remove boilerplate code for outputs. This makes it easier to program
outputs. The boilerplate code involved before was mostly just
involving connecting to the audio/video data streams directly in each
output plugin.
Instead of doing that, simply add plugin callback functions for
receiving video/audio (either encoded or non-encoded, whichever it's
set to use), and then call obs_output_begin_data_capture and
obs_output_end_data_capture to automatically handle setting up
connections to raw or encoded video/audio streams for the plugin.
- Remove 'active' function from output callbacks, as it's no longer
really needed now that the libobs output context automatically knows
when the output is active or not.
- Make it so that an encoder cannot be destroyed until all data
connections to the encoder have been removed.
- Change the 'start' and 'stop' functions in the encoder interface to
just an 'initialize' callback, which initializes the encoder.
- Make it so that the encoder must be initialized first before the data
stream can be started. The reason why initialization was separated
from starting the encoder stream was because we need to be able to
check that the settings used with the encoder *can* be used first.
This problem was especially annoying if you had both video/audio
encoding. Before, you'd have to check the return value from
obs_encoder_start, and if that second encoder fails, then you
basically had to stop the first encoder again, making for
unnecessary boilerplate code whenever starting up two encoders.
2014-03-27 21:50:15 -07:00
|
|
|
clear_data(data);
|
Implement encoder interface (still preliminary)
- Implement OBS encoder interface. It was previously incomplete, but
now is reaching some level of completion, though probably should
still be considered preliminary.
I had originally implemented it so that encoders only have a 'reset'
function to reset their parameters, but I felt that having both a
'start' and 'stop' function would be useful.
Encoders are now assigned to a specific video/audio media output each
rather than implicitely assigned to the main obs video/audio
contexts. This allows separate encoder contexts that aren't
necessarily assigned to the main video/audio context (which is useful
for things such as recording specific sources). Will probably have
to do this for regular obs outputs as well.
When creating an encoder, you must now explicitely state whether that
encoder is an audio or video encoder.
Audio and video can optionally be automatically converted depending
on what the encoder specifies.
When something 'attaches' to an encoder, the first attachment starts
the encoder, and the encoder automatically attaches to the media
output context associated with it. Subsequent attachments won't have
the same effect, they will just start receiving the same encoder data
when the next keyframe plays (along with SEI if any). When detaching
from the encoder, the last detachment will fully stop the encoder and
detach the encoder from the media output context associated with the
encoder.
SEI must actually be exported separately; because new encoder
attachments may not always be at the beginning of the stream, the
first keyframe they get must have that SEI data in it. If the
encoder has SEI data, it needs only add one small function to simply
query that SEI data, and then that data will be handled automatically
by libobs for all subsequent encoder attachments.
- Implement x264 encoder plugin, move x264 files to separate plugin to
separate necessary dependencies.
- Change video/audio frame output structures to not use const
qualifiers to prevent issues with non-const function usage elsewhere.
This was an issue when writing the x264 encoder, as the x264 encoder
expects non-const frame data.
Change stagesurf_map to return a non-const data type to prevent this
as well.
- Change full range parameter of video scaler to be an enum rather than
boolean
2014-03-16 16:21:34 -07:00
|
|
|
|
|
|
|
if (update_settings(obsx264, settings)) {
|
|
|
|
obsx264->context = x264_encoder_open(&obsx264->params);
|
|
|
|
|
|
|
|
if (obsx264->context == NULL)
|
|
|
|
blog(LOG_WARNING, "x264 failed to load");
|
|
|
|
else
|
|
|
|
load_headers(obsx264);
|
|
|
|
} else {
|
|
|
|
blog(LOG_WARNING, "bad settings specified for x264");
|
|
|
|
}
|
|
|
|
|
|
|
|
return obsx264->context != NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void *obs_x264_create(obs_data_t settings, obs_encoder_t encoder)
|
|
|
|
{
|
|
|
|
struct obs_x264 *data = bzalloc(sizeof(struct obs_x264));
|
|
|
|
data->encoder = encoder;
|
Implement encoder usage with outputs
- Make it so that encoders can be assigned to outputs. If an encoder
is destroyed, it will automatically remove itself from that output.
I specifically didn't want to do reference counting because it leaves
too much potential for unchecked references and it just felt like it
would be more trouble than it's worth.
- Add a 'flags' value to the output definition structure. This lets
the output specify if it uses video/audio, and whether the output is
meant to be used with OBS encoders or not.
- Remove boilerplate code for outputs. This makes it easier to program
outputs. The boilerplate code involved before was mostly just
involving connecting to the audio/video data streams directly in each
output plugin.
Instead of doing that, simply add plugin callback functions for
receiving video/audio (either encoded or non-encoded, whichever it's
set to use), and then call obs_output_begin_data_capture and
obs_output_end_data_capture to automatically handle setting up
connections to raw or encoded video/audio streams for the plugin.
- Remove 'active' function from output callbacks, as it's no longer
really needed now that the libobs output context automatically knows
when the output is active or not.
- Make it so that an encoder cannot be destroyed until all data
connections to the encoder have been removed.
- Change the 'start' and 'stop' functions in the encoder interface to
just an 'initialize' callback, which initializes the encoder.
- Make it so that the encoder must be initialized first before the data
stream can be started. The reason why initialization was separated
from starting the encoder stream was because we need to be able to
check that the settings used with the encoder *can* be used first.
This problem was especially annoying if you had both video/audio
encoding. Before, you'd have to check the return value from
obs_encoder_start, and if that second encoder fails, then you
basically had to stop the first encoder again, making for
unnecessary boilerplate code whenever starting up two encoders.
2014-03-27 21:50:15 -07:00
|
|
|
|
|
|
|
UNUSED_PARAMETER(settings);
|
Implement encoder interface (still preliminary)
- Implement OBS encoder interface. It was previously incomplete, but
now is reaching some level of completion, though probably should
still be considered preliminary.
I had originally implemented it so that encoders only have a 'reset'
function to reset their parameters, but I felt that having both a
'start' and 'stop' function would be useful.
Encoders are now assigned to a specific video/audio media output each
rather than implicitely assigned to the main obs video/audio
contexts. This allows separate encoder contexts that aren't
necessarily assigned to the main video/audio context (which is useful
for things such as recording specific sources). Will probably have
to do this for regular obs outputs as well.
When creating an encoder, you must now explicitely state whether that
encoder is an audio or video encoder.
Audio and video can optionally be automatically converted depending
on what the encoder specifies.
When something 'attaches' to an encoder, the first attachment starts
the encoder, and the encoder automatically attaches to the media
output context associated with it. Subsequent attachments won't have
the same effect, they will just start receiving the same encoder data
when the next keyframe plays (along with SEI if any). When detaching
from the encoder, the last detachment will fully stop the encoder and
detach the encoder from the media output context associated with the
encoder.
SEI must actually be exported separately; because new encoder
attachments may not always be at the beginning of the stream, the
first keyframe they get must have that SEI data in it. If the
encoder has SEI data, it needs only add one small function to simply
query that SEI data, and then that data will be handled automatically
by libobs for all subsequent encoder attachments.
- Implement x264 encoder plugin, move x264 files to separate plugin to
separate necessary dependencies.
- Change video/audio frame output structures to not use const
qualifiers to prevent issues with non-const function usage elsewhere.
This was an issue when writing the x264 encoder, as the x264 encoder
expects non-const frame data.
Change stagesurf_map to return a non-const data type to prevent this
as well.
- Change full range parameter of video scaler to be an enum rather than
boolean
2014-03-16 16:21:34 -07:00
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int drop_priority(int priority)
|
|
|
|
{
|
|
|
|
switch (priority) {
|
|
|
|
case NAL_PRIORITY_DISPOSABLE: return NAL_PRIORITY_DISPOSABLE;
|
|
|
|
case NAL_PRIORITY_LOW: return NAL_PRIORITY_LOW;
|
|
|
|
case NAL_PRIORITY_HIGH: return NAL_PRIORITY_HIGHEST;
|
|
|
|
case NAL_PRIORITY_HIGHEST: return NAL_PRIORITY_HIGHEST;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NAL_PRIORITY_HIGHEST;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void parse_packet(struct obs_x264 *obsx264,
|
|
|
|
struct encoder_packet *packet, x264_nal_t *nals,
|
|
|
|
int nal_count, x264_picture_t *pic_out)
|
|
|
|
{
|
|
|
|
if (!nal_count) return;
|
|
|
|
|
|
|
|
da_resize(obsx264->packet_data, 0);
|
|
|
|
|
|
|
|
for (int i = 0; i < nal_count; i++) {
|
|
|
|
x264_nal_t *nal = nals+i;
|
|
|
|
da_push_back_array(obsx264->packet_data, nal->p_payload,
|
|
|
|
nal->i_payload);
|
|
|
|
}
|
|
|
|
|
|
|
|
packet->data = obsx264->packet_data.array;
|
|
|
|
packet->size = obsx264->packet_data.num;
|
|
|
|
packet->type = OBS_ENCODER_VIDEO;
|
|
|
|
packet->pts = pic_out->i_pts;
|
|
|
|
packet->dts = pic_out->i_dts;
|
|
|
|
packet->keyframe = nals[0].i_type == NAL_SLICE_IDR;
|
|
|
|
packet->priority = nals[0].i_ref_idc;
|
|
|
|
packet->drop_priority = drop_priority(nals[0].i_ref_idc);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void init_pic_data(struct obs_x264 *obsx264, x264_picture_t *pic,
|
|
|
|
struct encoder_frame *frame)
|
|
|
|
{
|
|
|
|
x264_picture_init(pic);
|
|
|
|
|
|
|
|
pic->i_pts = frame->pts;
|
|
|
|
pic->img.i_csp = obsx264->params.i_csp;
|
|
|
|
|
|
|
|
if (obsx264->params.i_csp == X264_CSP_NV12)
|
|
|
|
pic->img.i_plane = 2;
|
|
|
|
else if (obsx264->params.i_csp == X264_CSP_I420)
|
|
|
|
pic->img.i_plane = 3;
|
|
|
|
|
|
|
|
for (int i = 0; i < pic->img.i_plane; i++) {
|
|
|
|
pic->img.i_stride[i] = (int)frame->linesize[i];
|
|
|
|
pic->img.plane[i] = frame->data[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool obs_x264_encode(void *data, struct encoder_frame *frame,
|
|
|
|
struct encoder_packet *packet, bool *received_packet)
|
|
|
|
{
|
|
|
|
struct obs_x264 *obsx264 = data;
|
|
|
|
x264_nal_t *nals;
|
|
|
|
int nal_count;
|
|
|
|
int ret;
|
|
|
|
x264_picture_t pic, pic_out;
|
|
|
|
|
|
|
|
if (!frame || !packet || !received_packet)
|
|
|
|
return false;
|
|
|
|
|
Implement encoder usage with outputs
- Make it so that encoders can be assigned to outputs. If an encoder
is destroyed, it will automatically remove itself from that output.
I specifically didn't want to do reference counting because it leaves
too much potential for unchecked references and it just felt like it
would be more trouble than it's worth.
- Add a 'flags' value to the output definition structure. This lets
the output specify if it uses video/audio, and whether the output is
meant to be used with OBS encoders or not.
- Remove boilerplate code for outputs. This makes it easier to program
outputs. The boilerplate code involved before was mostly just
involving connecting to the audio/video data streams directly in each
output plugin.
Instead of doing that, simply add plugin callback functions for
receiving video/audio (either encoded or non-encoded, whichever it's
set to use), and then call obs_output_begin_data_capture and
obs_output_end_data_capture to automatically handle setting up
connections to raw or encoded video/audio streams for the plugin.
- Remove 'active' function from output callbacks, as it's no longer
really needed now that the libobs output context automatically knows
when the output is active or not.
- Make it so that an encoder cannot be destroyed until all data
connections to the encoder have been removed.
- Change the 'start' and 'stop' functions in the encoder interface to
just an 'initialize' callback, which initializes the encoder.
- Make it so that the encoder must be initialized first before the data
stream can be started. The reason why initialization was separated
from starting the encoder stream was because we need to be able to
check that the settings used with the encoder *can* be used first.
This problem was especially annoying if you had both video/audio
encoding. Before, you'd have to check the return value from
obs_encoder_start, and if that second encoder fails, then you
basically had to stop the first encoder again, making for
unnecessary boilerplate code whenever starting up two encoders.
2014-03-27 21:50:15 -07:00
|
|
|
if (frame)
|
|
|
|
init_pic_data(obsx264, &pic, frame);
|
Implement encoder interface (still preliminary)
- Implement OBS encoder interface. It was previously incomplete, but
now is reaching some level of completion, though probably should
still be considered preliminary.
I had originally implemented it so that encoders only have a 'reset'
function to reset their parameters, but I felt that having both a
'start' and 'stop' function would be useful.
Encoders are now assigned to a specific video/audio media output each
rather than implicitely assigned to the main obs video/audio
contexts. This allows separate encoder contexts that aren't
necessarily assigned to the main video/audio context (which is useful
for things such as recording specific sources). Will probably have
to do this for regular obs outputs as well.
When creating an encoder, you must now explicitely state whether that
encoder is an audio or video encoder.
Audio and video can optionally be automatically converted depending
on what the encoder specifies.
When something 'attaches' to an encoder, the first attachment starts
the encoder, and the encoder automatically attaches to the media
output context associated with it. Subsequent attachments won't have
the same effect, they will just start receiving the same encoder data
when the next keyframe plays (along with SEI if any). When detaching
from the encoder, the last detachment will fully stop the encoder and
detach the encoder from the media output context associated with the
encoder.
SEI must actually be exported separately; because new encoder
attachments may not always be at the beginning of the stream, the
first keyframe they get must have that SEI data in it. If the
encoder has SEI data, it needs only add one small function to simply
query that SEI data, and then that data will be handled automatically
by libobs for all subsequent encoder attachments.
- Implement x264 encoder plugin, move x264 files to separate plugin to
separate necessary dependencies.
- Change video/audio frame output structures to not use const
qualifiers to prevent issues with non-const function usage elsewhere.
This was an issue when writing the x264 encoder, as the x264 encoder
expects non-const frame data.
Change stagesurf_map to return a non-const data type to prevent this
as well.
- Change full range parameter of video scaler to be an enum rather than
boolean
2014-03-16 16:21:34 -07:00
|
|
|
|
Implement encoder usage with outputs
- Make it so that encoders can be assigned to outputs. If an encoder
is destroyed, it will automatically remove itself from that output.
I specifically didn't want to do reference counting because it leaves
too much potential for unchecked references and it just felt like it
would be more trouble than it's worth.
- Add a 'flags' value to the output definition structure. This lets
the output specify if it uses video/audio, and whether the output is
meant to be used with OBS encoders or not.
- Remove boilerplate code for outputs. This makes it easier to program
outputs. The boilerplate code involved before was mostly just
involving connecting to the audio/video data streams directly in each
output plugin.
Instead of doing that, simply add plugin callback functions for
receiving video/audio (either encoded or non-encoded, whichever it's
set to use), and then call obs_output_begin_data_capture and
obs_output_end_data_capture to automatically handle setting up
connections to raw or encoded video/audio streams for the plugin.
- Remove 'active' function from output callbacks, as it's no longer
really needed now that the libobs output context automatically knows
when the output is active or not.
- Make it so that an encoder cannot be destroyed until all data
connections to the encoder have been removed.
- Change the 'start' and 'stop' functions in the encoder interface to
just an 'initialize' callback, which initializes the encoder.
- Make it so that the encoder must be initialized first before the data
stream can be started. The reason why initialization was separated
from starting the encoder stream was because we need to be able to
check that the settings used with the encoder *can* be used first.
This problem was especially annoying if you had both video/audio
encoding. Before, you'd have to check the return value from
obs_encoder_start, and if that second encoder fails, then you
basically had to stop the first encoder again, making for
unnecessary boilerplate code whenever starting up two encoders.
2014-03-27 21:50:15 -07:00
|
|
|
ret = x264_encoder_encode(obsx264->context, &nals, &nal_count,
|
|
|
|
(frame ? &pic : NULL), &pic_out);
|
Implement encoder interface (still preliminary)
- Implement OBS encoder interface. It was previously incomplete, but
now is reaching some level of completion, though probably should
still be considered preliminary.
I had originally implemented it so that encoders only have a 'reset'
function to reset their parameters, but I felt that having both a
'start' and 'stop' function would be useful.
Encoders are now assigned to a specific video/audio media output each
rather than implicitely assigned to the main obs video/audio
contexts. This allows separate encoder contexts that aren't
necessarily assigned to the main video/audio context (which is useful
for things such as recording specific sources). Will probably have
to do this for regular obs outputs as well.
When creating an encoder, you must now explicitely state whether that
encoder is an audio or video encoder.
Audio and video can optionally be automatically converted depending
on what the encoder specifies.
When something 'attaches' to an encoder, the first attachment starts
the encoder, and the encoder automatically attaches to the media
output context associated with it. Subsequent attachments won't have
the same effect, they will just start receiving the same encoder data
when the next keyframe plays (along with SEI if any). When detaching
from the encoder, the last detachment will fully stop the encoder and
detach the encoder from the media output context associated with the
encoder.
SEI must actually be exported separately; because new encoder
attachments may not always be at the beginning of the stream, the
first keyframe they get must have that SEI data in it. If the
encoder has SEI data, it needs only add one small function to simply
query that SEI data, and then that data will be handled automatically
by libobs for all subsequent encoder attachments.
- Implement x264 encoder plugin, move x264 files to separate plugin to
separate necessary dependencies.
- Change video/audio frame output structures to not use const
qualifiers to prevent issues with non-const function usage elsewhere.
This was an issue when writing the x264 encoder, as the x264 encoder
expects non-const frame data.
Change stagesurf_map to return a non-const data type to prevent this
as well.
- Change full range parameter of video scaler to be an enum rather than
boolean
2014-03-16 16:21:34 -07:00
|
|
|
if (ret < 0) {
|
|
|
|
blog(LOG_WARNING, "x264 encode failed");
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
*received_packet = (nal_count != 0);
|
|
|
|
parse_packet(obsx264, packet, nals, nal_count, &pic_out);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool obs_x264_extra_data(void *data, uint8_t **extra_data, size_t *size)
|
|
|
|
{
|
|
|
|
struct obs_x264 *obsx264 = data;
|
|
|
|
|
|
|
|
if (!obsx264->context)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
*extra_data = obsx264->extra_data;
|
|
|
|
*size = obsx264->extra_data_size;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool obs_x264_sei(void *data, uint8_t **sei, size_t *size)
|
|
|
|
{
|
|
|
|
struct obs_x264 *obsx264 = data;
|
|
|
|
|
|
|
|
if (!obsx264->context)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
*sei = obsx264->sei;
|
|
|
|
*size = obsx264->sei_size;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool obs_x264_video_info(void *data, struct video_scale_info *info)
|
|
|
|
{
|
|
|
|
struct obs_x264 *obsx264 = data;
|
|
|
|
video_t video = obs_encoder_video(obsx264->encoder);
|
|
|
|
const struct video_output_info *vid_info = video_output_getinfo(video);
|
|
|
|
|
|
|
|
if (vid_info->format == VIDEO_FORMAT_I420 ||
|
|
|
|
vid_info->format == VIDEO_FORMAT_NV12)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
info->format = VIDEO_FORMAT_NV12;
|
|
|
|
info->width = vid_info->width;
|
|
|
|
info->height = vid_info->height;
|
|
|
|
info->range = VIDEO_RANGE_DEFAULT;
|
|
|
|
info->colorspace = VIDEO_CS_DEFAULT;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct obs_encoder_info obs_x264_encoder = {
|
|
|
|
.id = "obs_x264",
|
|
|
|
.type = OBS_ENCODER_VIDEO,
|
|
|
|
.codec = "h264",
|
|
|
|
.getname = obs_x264_getname,
|
|
|
|
.create = obs_x264_create,
|
|
|
|
.destroy = obs_x264_destroy,
|
Implement encoder usage with outputs
- Make it so that encoders can be assigned to outputs. If an encoder
is destroyed, it will automatically remove itself from that output.
I specifically didn't want to do reference counting because it leaves
too much potential for unchecked references and it just felt like it
would be more trouble than it's worth.
- Add a 'flags' value to the output definition structure. This lets
the output specify if it uses video/audio, and whether the output is
meant to be used with OBS encoders or not.
- Remove boilerplate code for outputs. This makes it easier to program
outputs. The boilerplate code involved before was mostly just
involving connecting to the audio/video data streams directly in each
output plugin.
Instead of doing that, simply add plugin callback functions for
receiving video/audio (either encoded or non-encoded, whichever it's
set to use), and then call obs_output_begin_data_capture and
obs_output_end_data_capture to automatically handle setting up
connections to raw or encoded video/audio streams for the plugin.
- Remove 'active' function from output callbacks, as it's no longer
really needed now that the libobs output context automatically knows
when the output is active or not.
- Make it so that an encoder cannot be destroyed until all data
connections to the encoder have been removed.
- Change the 'start' and 'stop' functions in the encoder interface to
just an 'initialize' callback, which initializes the encoder.
- Make it so that the encoder must be initialized first before the data
stream can be started. The reason why initialization was separated
from starting the encoder stream was because we need to be able to
check that the settings used with the encoder *can* be used first.
This problem was especially annoying if you had both video/audio
encoding. Before, you'd have to check the return value from
obs_encoder_start, and if that second encoder fails, then you
basically had to stop the first encoder again, making for
unnecessary boilerplate code whenever starting up two encoders.
2014-03-27 21:50:15 -07:00
|
|
|
.initialize = obs_x264_initialize,
|
Implement encoder interface (still preliminary)
- Implement OBS encoder interface. It was previously incomplete, but
now is reaching some level of completion, though probably should
still be considered preliminary.
I had originally implemented it so that encoders only have a 'reset'
function to reset their parameters, but I felt that having both a
'start' and 'stop' function would be useful.
Encoders are now assigned to a specific video/audio media output each
rather than implicitely assigned to the main obs video/audio
contexts. This allows separate encoder contexts that aren't
necessarily assigned to the main video/audio context (which is useful
for things such as recording specific sources). Will probably have
to do this for regular obs outputs as well.
When creating an encoder, you must now explicitely state whether that
encoder is an audio or video encoder.
Audio and video can optionally be automatically converted depending
on what the encoder specifies.
When something 'attaches' to an encoder, the first attachment starts
the encoder, and the encoder automatically attaches to the media
output context associated with it. Subsequent attachments won't have
the same effect, they will just start receiving the same encoder data
when the next keyframe plays (along with SEI if any). When detaching
from the encoder, the last detachment will fully stop the encoder and
detach the encoder from the media output context associated with the
encoder.
SEI must actually be exported separately; because new encoder
attachments may not always be at the beginning of the stream, the
first keyframe they get must have that SEI data in it. If the
encoder has SEI data, it needs only add one small function to simply
query that SEI data, and then that data will be handled automatically
by libobs for all subsequent encoder attachments.
- Implement x264 encoder plugin, move x264 files to separate plugin to
separate necessary dependencies.
- Change video/audio frame output structures to not use const
qualifiers to prevent issues with non-const function usage elsewhere.
This was an issue when writing the x264 encoder, as the x264 encoder
expects non-const frame data.
Change stagesurf_map to return a non-const data type to prevent this
as well.
- Change full range parameter of video scaler to be an enum rather than
boolean
2014-03-16 16:21:34 -07:00
|
|
|
.encode = obs_x264_encode,
|
|
|
|
.properties = obs_x264_props,
|
|
|
|
.defaults = obs_x264_defaults,
|
|
|
|
.update = obs_x264_update,
|
|
|
|
.extra_data = obs_x264_extra_data,
|
|
|
|
.sei_data = obs_x264_sei,
|
|
|
|
.video_info = obs_x264_video_info
|
|
|
|
};
|