2014-04-05 01:13:11 -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/base.h>
|
|
|
|
#include <util/circlebuf.h>
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
#include <util/darray.h>
|
2014-07-09 22:12:57 -07:00
|
|
|
#include <obs-module.h>
|
2014-04-05 01:13:11 -07:00
|
|
|
|
|
|
|
#include <libavformat/avformat.h>
|
2014-04-05 07:12:32 -07:00
|
|
|
|
2014-04-05 01:13:11 -07:00
|
|
|
#include "obs-ffmpeg-formats.h"
|
2014-04-05 07:12:32 -07:00
|
|
|
#include "obs-ffmpeg-compat.h"
|
2014-04-05 01:13:11 -07:00
|
|
|
|
2015-07-05 23:53:36 -07:00
|
|
|
#define do_log(level, format, ...) \
|
|
|
|
blog(level, "[FFmpeg aac encoder: '%s'] " format, \
|
|
|
|
obs_encoder_get_name(enc->encoder), ##__VA_ARGS__)
|
|
|
|
|
|
|
|
#define warn(format, ...) do_log(LOG_WARNING, format, ##__VA_ARGS__)
|
|
|
|
#define info(format, ...) do_log(LOG_INFO, format, ##__VA_ARGS__)
|
|
|
|
#define debug(format, ...) do_log(LOG_DEBUG, format, ##__VA_ARGS__)
|
|
|
|
|
2014-04-05 01:13:11 -07:00
|
|
|
struct aac_encoder {
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_encoder_t *encoder;
|
2014-04-05 01:13:11 -07:00
|
|
|
|
|
|
|
AVCodec *aac;
|
|
|
|
AVCodecContext *context;
|
|
|
|
|
|
|
|
uint8_t *samples[MAX_AV_PLANES];
|
|
|
|
AVFrame *aframe;
|
2015-07-03 17:18:08 -07:00
|
|
|
int64_t total_samples;
|
2014-04-05 01:13:11 -07:00
|
|
|
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
DARRAY(uint8_t) packet_buffer;
|
|
|
|
|
2014-04-05 01:13:11 -07:00
|
|
|
size_t audio_planes;
|
|
|
|
size_t audio_size;
|
|
|
|
|
|
|
|
int frame_size; /* pretty much always 1024 for AAC */
|
|
|
|
int frame_size_bytes;
|
|
|
|
};
|
|
|
|
|
2015-09-16 01:30:51 -07:00
|
|
|
static const char *aac_getname(void *unused)
|
2014-04-05 01:13:11 -07:00
|
|
|
{
|
2015-09-16 01:30:51 -07:00
|
|
|
UNUSED_PARAMETER(unused);
|
2014-07-09 22:12:57 -07:00
|
|
|
return obs_module_text("FFmpegAAC");
|
2014-04-05 01:13:11 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static void aac_destroy(void *data)
|
|
|
|
{
|
|
|
|
struct aac_encoder *enc = data;
|
|
|
|
|
|
|
|
if (enc->samples[0])
|
|
|
|
av_freep(&enc->samples[0]);
|
|
|
|
if (enc->context)
|
|
|
|
avcodec_close(enc->context);
|
|
|
|
if (enc->aframe)
|
|
|
|
av_frame_free(&enc->aframe);
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
|
|
|
|
da_free(enc->packet_buffer);
|
2014-04-05 01:13:11 -07:00
|
|
|
bfree(enc);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool initialize_codec(struct aac_encoder *enc)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
enc->aframe = av_frame_alloc();
|
|
|
|
if (!enc->aframe) {
|
2015-07-05 23:53:36 -07:00
|
|
|
warn("Failed to allocate audio frame");
|
2014-04-05 01:13:11 -07:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = avcodec_open2(enc->context, enc->aac, NULL);
|
|
|
|
if (ret < 0) {
|
2015-07-05 23:53:36 -07:00
|
|
|
warn("Failed to open AAC codec: %s", av_err2str(ret));
|
2014-04-05 01:13:11 -07:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
enc->frame_size = enc->context->frame_size;
|
|
|
|
if (!enc->frame_size)
|
|
|
|
enc->frame_size = 1024;
|
|
|
|
|
|
|
|
enc->frame_size_bytes = enc->frame_size * (int)enc->audio_size;
|
|
|
|
|
|
|
|
ret = av_samples_alloc(enc->samples, NULL, enc->context->channels,
|
|
|
|
enc->frame_size, enc->context->sample_fmt, 0);
|
|
|
|
if (ret < 0) {
|
2015-07-05 23:53:36 -07:00
|
|
|
warn("Failed to create audio buffer: %s", av_err2str(ret));
|
2014-04-05 01:13:11 -07:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static void init_sizes(struct aac_encoder *enc, audio_t *audio)
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
{
|
|
|
|
const struct audio_output_info *aoi;
|
|
|
|
enum audio_format format;
|
|
|
|
|
2014-08-05 15:07:54 -07:00
|
|
|
aoi = audio_output_get_info(audio);
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
format = convert_ffmpeg_sample_format(enc->context->sample_fmt);
|
|
|
|
|
|
|
|
enc->audio_planes = get_audio_planes(format, aoi->speakers);
|
|
|
|
enc->audio_size = get_audio_size(format, aoi->speakers, 1);
|
|
|
|
}
|
|
|
|
|
2014-11-10 01:10:19 -08:00
|
|
|
#ifndef MIN
|
|
|
|
#define MIN(x, y) ((x) < (y) ? (x) : (y))
|
|
|
|
#endif
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static void *aac_create(obs_data_t *settings, obs_encoder_t *encoder)
|
2014-04-05 01:13:11 -07:00
|
|
|
{
|
|
|
|
struct aac_encoder *enc;
|
2014-08-05 11:09:29 -07:00
|
|
|
int bitrate = (int)obs_data_get_int(settings, "bitrate");
|
2014-09-25 17:44:05 -07:00
|
|
|
audio_t *audio = obs_encoder_audio(encoder);
|
2014-04-05 01:13:11 -07:00
|
|
|
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
avcodec_register_all();
|
|
|
|
|
2014-04-05 01:13:11 -07:00
|
|
|
enc = bzalloc(sizeof(struct aac_encoder));
|
|
|
|
enc->encoder = encoder;
|
|
|
|
enc->aac = avcodec_find_encoder(AV_CODEC_ID_AAC);
|
2015-07-05 23:53:36 -07:00
|
|
|
|
|
|
|
blog(LOG_INFO, "---------------------------------");
|
|
|
|
|
2014-04-05 01:13:11 -07:00
|
|
|
if (!enc->aac) {
|
2015-07-05 23:53:36 -07:00
|
|
|
warn("Couldn't find encoder");
|
2014-04-05 01:13:11 -07:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2015-07-05 23:53:36 -07:00
|
|
|
if (!bitrate) {
|
|
|
|
warn("Invalid bitrate specified");
|
|
|
|
return NULL;
|
|
|
|
}
|
2014-05-22 04:49:10 -07:00
|
|
|
|
2014-04-05 01:13:11 -07:00
|
|
|
enc->context = avcodec_alloc_context3(enc->aac);
|
|
|
|
if (!enc->context) {
|
2015-07-05 23:53:36 -07:00
|
|
|
warn("Failed to create codec context");
|
2014-04-05 01:13:11 -07:00
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
enc->context->bit_rate = bitrate * 1000;
|
2014-08-05 15:07:54 -07:00
|
|
|
enc->context->channels = (int)audio_output_get_channels(audio);
|
|
|
|
enc->context->sample_rate = audio_output_get_sample_rate(audio);
|
2014-04-05 01:13:11 -07:00
|
|
|
enc->context->sample_fmt = enc->aac->sample_fmts ?
|
|
|
|
enc->aac->sample_fmts[0] : AV_SAMPLE_FMT_FLTP;
|
|
|
|
|
2014-11-10 01:10:19 -08:00
|
|
|
/* if using FFmpeg's AAC encoder, at least set a cutoff value
|
|
|
|
* (recommended by konverter) */
|
|
|
|
if (strcmp(enc->aac->name, "aac") == 0) {
|
2015-09-21 18:35:27 -07:00
|
|
|
int cutoff1 = 4000 + (int)enc->context->bit_rate / 8;
|
|
|
|
int cutoff2 = 12000 + (int)enc->context->bit_rate / 8;
|
2014-11-10 01:10:19 -08:00
|
|
|
int cutoff3 = enc->context->sample_rate / 2;
|
|
|
|
int cutoff;
|
|
|
|
|
|
|
|
cutoff = MIN(cutoff1, cutoff2);
|
|
|
|
cutoff = MIN(cutoff, cutoff3);
|
|
|
|
enc->context->cutoff = cutoff;
|
|
|
|
}
|
|
|
|
|
2015-07-05 23:53:36 -07:00
|
|
|
info("bitrate: %d, channels: %d",
|
2014-07-13 03:10:16 -07:00
|
|
|
enc->context->bit_rate / 1000, enc->context->channels);
|
|
|
|
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
init_sizes(enc, audio);
|
2014-04-05 01:13:11 -07:00
|
|
|
|
|
|
|
/* enable experimental FFmpeg encoder if the only one available */
|
|
|
|
enc->context->strict_std_compliance = -2;
|
|
|
|
|
2014-05-08 05:19:10 -07:00
|
|
|
enc->context->flags = CODEC_FLAG_GLOBAL_HEADER;
|
|
|
|
|
2014-04-05 01:13:11 -07:00
|
|
|
if (initialize_codec(enc))
|
|
|
|
return enc;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
aac_destroy(enc);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool do_aac_encode(struct aac_encoder *enc,
|
|
|
|
struct encoder_packet *packet, bool *received_packet)
|
|
|
|
{
|
|
|
|
AVRational time_base = {1, enc->context->sample_rate};
|
|
|
|
AVPacket avpacket = {0};
|
|
|
|
int got_packet;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
enc->aframe->nb_samples = enc->frame_size;
|
|
|
|
enc->aframe->pts = av_rescale_q(enc->total_samples,
|
|
|
|
(AVRational){1, enc->context->sample_rate},
|
|
|
|
enc->context->time_base);
|
|
|
|
|
|
|
|
ret = avcodec_fill_audio_frame(enc->aframe, enc->context->channels,
|
|
|
|
enc->context->sample_fmt, enc->samples[0],
|
|
|
|
enc->frame_size_bytes * enc->context->channels, 1);
|
|
|
|
if (ret < 0) {
|
2015-07-05 23:53:36 -07:00
|
|
|
warn("avcodec_fill_audio_frame failed: %s", av_err2str(ret));
|
2014-04-05 01:13:11 -07:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
enc->total_samples += enc->frame_size;
|
|
|
|
|
|
|
|
ret = avcodec_encode_audio2(enc->context, &avpacket, enc->aframe,
|
|
|
|
&got_packet);
|
|
|
|
if (ret < 0) {
|
2015-07-05 23:53:36 -07:00
|
|
|
warn("avcodec_encode_audio2 failed: %s", av_err2str(ret));
|
2014-04-05 01:13:11 -07:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
*received_packet = !!got_packet;
|
|
|
|
if (!got_packet)
|
|
|
|
return true;
|
|
|
|
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
da_resize(enc->packet_buffer, 0);
|
|
|
|
da_push_back_array(enc->packet_buffer, avpacket.data, avpacket.size);
|
|
|
|
|
2014-04-05 01:13:11 -07:00
|
|
|
packet->pts = rescale_ts(avpacket.pts, enc->context, time_base);
|
|
|
|
packet->dts = rescale_ts(avpacket.dts, enc->context, time_base);
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
packet->data = enc->packet_buffer.array;
|
2014-04-05 01:43:59 -07:00
|
|
|
packet->size = avpacket.size;
|
2014-04-05 01:13:11 -07:00
|
|
|
packet->type = OBS_ENCODER_AUDIO;
|
|
|
|
packet->timebase_num = 1;
|
|
|
|
packet->timebase_den = (int32_t)enc->context->sample_rate;
|
|
|
|
av_free_packet(&avpacket);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool aac_encode(void *data, struct encoder_frame *frame,
|
|
|
|
struct encoder_packet *packet, bool *received_packet)
|
|
|
|
{
|
|
|
|
struct aac_encoder *enc = data;
|
|
|
|
|
|
|
|
for (size_t i = 0; i < enc->audio_planes; i++)
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
memcpy(enc->samples[i], frame->data[i], enc->frame_size_bytes);
|
2014-04-05 01:13:11 -07:00
|
|
|
|
|
|
|
return do_aac_encode(enc, packet, received_packet);
|
|
|
|
}
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
static void aac_defaults(obs_data_t *settings)
|
2014-04-05 01:13:11 -07:00
|
|
|
{
|
2014-04-05 01:17:32 -07:00
|
|
|
obs_data_set_default_int(settings, "bitrate", 128);
|
2014-04-05 01:13:11 -07:00
|
|
|
}
|
|
|
|
|
2014-09-29 08:36:13 -07:00
|
|
|
static obs_properties_t *aac_properties(void *unused)
|
2014-04-05 01:13:11 -07:00
|
|
|
{
|
2014-09-29 08:36:13 -07:00
|
|
|
UNUSED_PARAMETER(unused);
|
|
|
|
|
2014-09-25 17:44:05 -07:00
|
|
|
obs_properties_t *props = obs_properties_create();
|
2014-04-05 01:13:11 -07:00
|
|
|
|
2014-07-09 22:12:57 -07:00
|
|
|
obs_properties_add_int(props, "bitrate",
|
|
|
|
obs_module_text("Bitrate"), 32, 320, 32);
|
2014-04-05 01:13:11 -07:00
|
|
|
return props;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool aac_extra_data(void *data, uint8_t **extra_data, size_t *size)
|
|
|
|
{
|
|
|
|
struct aac_encoder *enc = data;
|
|
|
|
|
|
|
|
*extra_data = enc->context->extradata;
|
|
|
|
*size = enc->context->extradata_size;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-04-17 01:34:10 -07:00
|
|
|
static void aac_audio_info(void *data, struct audio_convert_info *info)
|
2014-04-05 01:13:11 -07:00
|
|
|
{
|
|
|
|
struct aac_encoder *enc = data;
|
|
|
|
info->format = convert_ffmpeg_sample_format(enc->context->sample_fmt);
|
|
|
|
}
|
|
|
|
|
Implement RTMP module (still needs drop code)
- Implement the RTMP output module. This time around, we just use a
simple FLV muxer, then just write to the stream with RTMP_Write.
Easy and effective.
- Fix the FLV muxer, the muxer now outputs proper FLV packets.
- Output API:
* When using encoders, automatically interleave encoded packets
before sending it to the output.
* Pair encoders and have them automatically wait for the other to
start to ensure sync.
* Change 'obs_output_signal_start_fail' to 'obs_output_signal_stop'
because it was a bit confusing, and doing this makes a lot more
sense for outputs that need to stop suddenly (disconnections/etc).
- Encoder API:
* Remove some unnecessary encoder functions from the actual API and
make them internal. Most of the encoder functions are handled
automatically by outputs anyway, so there's no real need to expose
them and end up inadvertently confusing plugin writers.
* Have audio encoders wait for the video encoder to get a frame, then
start at the exact data point that the first video frame starts to
ensure the most accrate sync of video/audio possible.
* Add a required 'frame_size' callback for audio encoders that
returns the expected number of frames desired to encode with. This
way, the libobs encoder API can handle the circular buffering
internally automatically for the encoder modules, so encoder
writers don't have to do it themselves.
- Fix a few bugs in the serializer interface. It was passing the wrong
variable for the data in a few cases.
- If a source has video, make obs_source_update defer the actual update
callback until the tick function is called to prevent threading
issues.
2014-04-07 22:00:10 -07:00
|
|
|
static size_t aac_frame_size(void *data)
|
|
|
|
{
|
|
|
|
struct aac_encoder *enc =data;
|
|
|
|
return enc->frame_size;
|
|
|
|
}
|
|
|
|
|
2014-04-05 01:13:11 -07:00
|
|
|
struct obs_encoder_info aac_encoder_info = {
|
2014-08-04 21:27:52 -07:00
|
|
|
.id = "ffmpeg_aac",
|
|
|
|
.type = OBS_ENCODER_AUDIO,
|
|
|
|
.codec = "AAC",
|
|
|
|
.get_name = aac_getname,
|
|
|
|
.create = aac_create,
|
|
|
|
.destroy = aac_destroy,
|
|
|
|
.encode = aac_encode,
|
|
|
|
.get_frame_size = aac_frame_size,
|
|
|
|
.get_defaults = aac_defaults,
|
|
|
|
.get_properties = aac_properties,
|
|
|
|
.get_extra_data = aac_extra_data,
|
|
|
|
.get_audio_info = aac_audio_info
|
2014-04-05 01:13:11 -07:00
|
|
|
};
|