New upstream version 26.0.0+dfsg1
This commit is contained in:
Sebastian Ramacher
parent
8e020cdacb
commit
240080891f
837 changed files with 41275 additions and 9196 deletions
|
|
@ -30,6 +30,8 @@
|
|||
//#define WRITE_FLV_HEADER
|
||||
|
||||
#define VIDEO_HEADER_SIZE 5
|
||||
#define VIDEODATA_AVCVIDEOPACKET 7.0
|
||||
#define AUDIODATA_AAC 10.0
|
||||
|
||||
static inline double encoder_bitrate(obs_encoder_t *encoder)
|
||||
{
|
||||
|
|
@ -56,11 +58,11 @@ void write_file_info(FILE *file, int64_t duration_ms, int64_t size)
|
|||
fwrite(buf, 1, enc - buf, file);
|
||||
}
|
||||
|
||||
static bool build_flv_meta_data(obs_output_t *context, uint8_t **output,
|
||||
size_t *size, size_t a_idx)
|
||||
static void build_flv_meta_data(obs_output_t *context, uint8_t **output,
|
||||
size_t *size)
|
||||
{
|
||||
obs_encoder_t *vencoder = obs_output_get_video_encoder(context);
|
||||
obs_encoder_t *aencoder = obs_output_get_audio_encoder(context, a_idx);
|
||||
obs_encoder_t *aencoder = obs_output_get_audio_encoder(context, 0);
|
||||
video_t *video = obs_encoder_video(vencoder);
|
||||
audio_t *audio = obs_encoder_audio(aencoder);
|
||||
char buf[4096];
|
||||
|
|
@ -68,31 +70,25 @@ static bool build_flv_meta_data(obs_output_t *context, uint8_t **output,
|
|||
char *end = enc + sizeof(buf);
|
||||
struct dstr encoder_name = {0};
|
||||
|
||||
if (a_idx > 0 && !aencoder)
|
||||
return false;
|
||||
|
||||
enc_str(&enc, end, "@setDataFrame");
|
||||
enc_str(&enc, end, "onMetaData");
|
||||
|
||||
*enc++ = AMF_ECMA_ARRAY;
|
||||
enc = AMF_EncodeInt32(enc, end, a_idx == 0 ? 20 : 15);
|
||||
enc = AMF_EncodeInt32(enc, end, 20);
|
||||
|
||||
enc_num_val(&enc, end, "duration", 0.0);
|
||||
enc_num_val(&enc, end, "fileSize", 0.0);
|
||||
|
||||
if (a_idx == 0) {
|
||||
enc_num_val(&enc, end, "width",
|
||||
(double)obs_encoder_get_width(vencoder));
|
||||
enc_num_val(&enc, end, "height",
|
||||
(double)obs_encoder_get_height(vencoder));
|
||||
enc_num_val(&enc, end, "width",
|
||||
(double)obs_encoder_get_width(vencoder));
|
||||
enc_num_val(&enc, end, "height",
|
||||
(double)obs_encoder_get_height(vencoder));
|
||||
|
||||
enc_str_val(&enc, end, "videocodecid", "avc1");
|
||||
enc_num_val(&enc, end, "videodatarate",
|
||||
encoder_bitrate(vencoder));
|
||||
enc_num_val(&enc, end, "framerate",
|
||||
video_output_get_frame_rate(video));
|
||||
}
|
||||
enc_num_val(&enc, end, "videocodecid", VIDEODATA_AVCVIDEOPACKET);
|
||||
enc_num_val(&enc, end, "videodatarate", encoder_bitrate(vencoder));
|
||||
enc_num_val(&enc, end, "framerate", video_output_get_frame_rate(video));
|
||||
|
||||
enc_str_val(&enc, end, "audiocodecid", "mp4a");
|
||||
enc_num_val(&enc, end, "audiocodecid", AUDIODATA_AAC);
|
||||
enc_num_val(&enc, end, "audiodatarate", encoder_bitrate(aencoder));
|
||||
enc_num_val(&enc, end, "audiosamplerate",
|
||||
(double)obs_encoder_get_sample_rate(aencoder));
|
||||
|
|
@ -129,11 +125,10 @@ static bool build_flv_meta_data(obs_output_t *context, uint8_t **output,
|
|||
|
||||
*size = enc - buf;
|
||||
*output = bmemdup(buf, *size);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool flv_meta_data(obs_output_t *context, uint8_t **output, size_t *size,
|
||||
bool write_header, size_t audio_idx)
|
||||
void flv_meta_data(obs_output_t *context, uint8_t **output, size_t *size,
|
||||
bool write_header)
|
||||
{
|
||||
struct array_output_data data;
|
||||
struct serializer s;
|
||||
|
|
@ -142,12 +137,7 @@ bool flv_meta_data(obs_output_t *context, uint8_t **output, size_t *size,
|
|||
uint32_t start_pos;
|
||||
|
||||
array_output_serializer_init(&s, &data);
|
||||
|
||||
if (!build_flv_meta_data(context, &meta_data, &meta_data_size,
|
||||
audio_idx)) {
|
||||
bfree(meta_data);
|
||||
return false;
|
||||
}
|
||||
build_flv_meta_data(context, &meta_data, &meta_data_size);
|
||||
|
||||
if (write_header) {
|
||||
s_write(&s, "FLV", 3);
|
||||
|
|
@ -173,7 +163,6 @@ bool flv_meta_data(obs_output_t *context, uint8_t **output, size_t *size,
|
|||
*size = data.bytes.num;
|
||||
|
||||
bfree(meta_data);
|
||||
return true;
|
||||
}
|
||||
|
||||
#ifdef DEBUG_TIMESTAMPS
|
||||
|
|
@ -264,3 +253,251 @@ void flv_packet_mux(struct encoder_packet *packet, int32_t dts_offset,
|
|||
*output = data.bytes.array;
|
||||
*size = data.bytes.num;
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
/* stuff for additional media streams */
|
||||
|
||||
#define s_amf_conststring(s, str) \
|
||||
do { \
|
||||
const size_t len = sizeof(str) - 1; \
|
||||
s_wb16(s, (uint16_t)len); \
|
||||
serialize(s, str, len); \
|
||||
} while (false)
|
||||
|
||||
#define s_amf_double(s, d) \
|
||||
do { \
|
||||
double d_val = d; \
|
||||
uint64_t u_val = *(uint64_t *)&d_val; \
|
||||
s_wb64(s, u_val); \
|
||||
} while (false)
|
||||
|
||||
static void flv_build_additional_meta_data(uint8_t **data, size_t *size)
|
||||
{
|
||||
struct array_output_data out;
|
||||
struct serializer s;
|
||||
|
||||
array_output_serializer_init(&s, &out);
|
||||
|
||||
s_w8(&s, AMF_STRING);
|
||||
s_amf_conststring(&s, "@setDataFrame");
|
||||
|
||||
s_w8(&s, AMF_STRING);
|
||||
s_amf_conststring(&s, "onExpectAdditionalMedia");
|
||||
|
||||
s_w8(&s, AMF_OBJECT);
|
||||
{
|
||||
s_amf_conststring(&s, "processingIntents");
|
||||
|
||||
s_w8(&s, AMF_STRICT_ARRAY);
|
||||
s_wb32(&s, 1);
|
||||
{
|
||||
s_w8(&s, AMF_STRING);
|
||||
s_amf_conststring(&s, "ArchiveProgramNarrationAudio");
|
||||
}
|
||||
|
||||
/* ---- */
|
||||
|
||||
s_amf_conststring(&s, "additionalMedia");
|
||||
|
||||
s_w8(&s, AMF_OBJECT);
|
||||
{
|
||||
s_amf_conststring(&s, "stream0");
|
||||
|
||||
s_w8(&s, AMF_OBJECT);
|
||||
{
|
||||
s_amf_conststring(&s, "type");
|
||||
|
||||
s_w8(&s, AMF_NUMBER);
|
||||
s_amf_double(&s, RTMP_PACKET_TYPE_AUDIO);
|
||||
|
||||
/* ---- */
|
||||
|
||||
s_amf_conststring(&s, "mediaLabels");
|
||||
|
||||
s_w8(&s, AMF_OBJECT);
|
||||
{
|
||||
s_amf_conststring(&s, "contentType");
|
||||
|
||||
s_w8(&s, AMF_STRING);
|
||||
s_amf_conststring(&s, "PNAR");
|
||||
}
|
||||
s_wb24(&s, AMF_OBJECT_END);
|
||||
}
|
||||
s_wb24(&s, AMF_OBJECT_END);
|
||||
}
|
||||
s_wb24(&s, AMF_OBJECT_END);
|
||||
|
||||
/* ---- */
|
||||
|
||||
s_amf_conststring(&s, "defaultMedia");
|
||||
|
||||
s_w8(&s, AMF_OBJECT);
|
||||
{
|
||||
s_amf_conststring(&s, "audio");
|
||||
|
||||
s_w8(&s, AMF_OBJECT);
|
||||
{
|
||||
s_amf_conststring(&s, "mediaLabels");
|
||||
|
||||
s_w8(&s, AMF_OBJECT);
|
||||
{
|
||||
s_amf_conststring(&s, "contentType");
|
||||
|
||||
s_w8(&s, AMF_STRING);
|
||||
s_amf_conststring(&s, "PRM");
|
||||
}
|
||||
s_wb24(&s, AMF_OBJECT_END);
|
||||
}
|
||||
s_wb24(&s, AMF_OBJECT_END);
|
||||
}
|
||||
s_wb24(&s, AMF_OBJECT_END);
|
||||
}
|
||||
s_wb24(&s, AMF_OBJECT_END);
|
||||
|
||||
*data = out.bytes.array;
|
||||
*size = out.bytes.num;
|
||||
}
|
||||
|
||||
void flv_additional_meta_data(obs_output_t *context, uint8_t **data,
|
||||
size_t *size)
|
||||
{
|
||||
UNUSED_PARAMETER(context);
|
||||
struct array_output_data out;
|
||||
struct serializer s;
|
||||
uint8_t *meta_data = NULL;
|
||||
size_t meta_data_size;
|
||||
|
||||
flv_build_additional_meta_data(&meta_data, &meta_data_size);
|
||||
|
||||
array_output_serializer_init(&s, &out);
|
||||
|
||||
s_w8(&s, RTMP_PACKET_TYPE_INFO); //18
|
||||
|
||||
s_wb24(&s, (uint32_t)meta_data_size);
|
||||
s_wb32(&s, 0);
|
||||
s_wb24(&s, 0);
|
||||
|
||||
s_write(&s, meta_data, meta_data_size);
|
||||
bfree(meta_data);
|
||||
|
||||
s_wb32(&s, (uint32_t)serializer_get_pos(&s) - 1);
|
||||
|
||||
*data = out.bytes.array;
|
||||
*size = out.bytes.num;
|
||||
}
|
||||
|
||||
static inline void s_u29(struct serializer *s, uint32_t val)
|
||||
{
|
||||
if (val <= 0x7F) {
|
||||
s_w8(s, val);
|
||||
} else if (val <= 0x3FFF) {
|
||||
s_w8(s, 0x80 | (val >> 7));
|
||||
s_w8(s, val & 0x7F);
|
||||
} else if (val <= 0x1FFFFF) {
|
||||
s_w8(s, 0x80 | (val >> 14));
|
||||
s_w8(s, 0x80 | ((val >> 7) & 0x7F));
|
||||
s_w8(s, val & 0x7F);
|
||||
} else {
|
||||
s_w8(s, 0x80 | (val >> 22));
|
||||
s_w8(s, 0x80 | ((val >> 15) & 0x7F));
|
||||
s_w8(s, 0x80 | ((val >> 8) & 0x7F));
|
||||
s_w8(s, val & 0xFF);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void s_u29b_value(struct serializer *s, uint32_t val)
|
||||
{
|
||||
s_u29(s, 1 | ((val & 0xFFFFFFF) << 1));
|
||||
}
|
||||
|
||||
static void flv_build_additional_audio(uint8_t **data, size_t *size,
|
||||
struct encoder_packet *packet,
|
||||
bool is_header, size_t index)
|
||||
{
|
||||
UNUSED_PARAMETER(index);
|
||||
struct array_output_data out;
|
||||
struct serializer s;
|
||||
|
||||
array_output_serializer_init(&s, &out);
|
||||
|
||||
s_w8(&s, AMF_STRING);
|
||||
s_amf_conststring(&s, "additionalMedia");
|
||||
|
||||
s_w8(&s, AMF_OBJECT);
|
||||
{
|
||||
s_amf_conststring(&s, "id");
|
||||
|
||||
s_w8(&s, AMF_STRING);
|
||||
s_amf_conststring(&s, "stream0");
|
||||
|
||||
/* ----- */
|
||||
|
||||
s_amf_conststring(&s, "media");
|
||||
|
||||
s_w8(&s, AMF_AVMPLUS);
|
||||
s_w8(&s, AMF3_BYTE_ARRAY);
|
||||
s_u29b_value(&s, (uint32_t)packet->size + 2);
|
||||
s_w8(&s, 0xaf);
|
||||
s_w8(&s, is_header ? 0 : 1);
|
||||
s_write(&s, packet->data, packet->size);
|
||||
}
|
||||
s_wb24(&s, AMF_OBJECT_END);
|
||||
|
||||
*data = out.bytes.array;
|
||||
*size = out.bytes.num;
|
||||
}
|
||||
|
||||
static void flv_additional_audio(struct serializer *s, int32_t dts_offset,
|
||||
struct encoder_packet *packet, bool is_header,
|
||||
size_t index)
|
||||
{
|
||||
int32_t time_ms = get_ms_time(packet, packet->dts) - dts_offset;
|
||||
uint8_t *data;
|
||||
size_t size;
|
||||
|
||||
if (!packet->data || !packet->size)
|
||||
return;
|
||||
|
||||
flv_build_additional_audio(&data, &size, packet, is_header, index);
|
||||
|
||||
s_w8(s, RTMP_PACKET_TYPE_INFO); //18
|
||||
|
||||
#ifdef DEBUG_TIMESTAMPS
|
||||
blog(LOG_DEBUG, "Audio2: %lu", time_ms);
|
||||
|
||||
if (last_time > time_ms)
|
||||
blog(LOG_DEBUG, "Non-monotonic");
|
||||
|
||||
last_time = time_ms;
|
||||
#endif
|
||||
|
||||
s_wb24(s, (uint32_t)size);
|
||||
s_wb24(s, time_ms);
|
||||
s_w8(s, (time_ms >> 24) & 0x7F);
|
||||
s_wb24(s, 0);
|
||||
|
||||
serialize(s, data, size);
|
||||
bfree(data);
|
||||
|
||||
s_wb32(s, (uint32_t)serializer_get_pos(s) - 1);
|
||||
}
|
||||
|
||||
void flv_additional_packet_mux(struct encoder_packet *packet,
|
||||
int32_t dts_offset, uint8_t **data, size_t *size,
|
||||
bool is_header, size_t index)
|
||||
{
|
||||
struct array_output_data out;
|
||||
struct serializer s;
|
||||
|
||||
array_output_serializer_init(&s, &out);
|
||||
|
||||
if (packet->type == OBS_ENCODER_VIDEO) {
|
||||
//currently unsupported
|
||||
bcrash("who said you could output an additional video packet?");
|
||||
} else {
|
||||
flv_additional_audio(&s, dts_offset, packet, is_header, index);
|
||||
}
|
||||
|
||||
*data = out.bytes.array;
|
||||
*size = out.bytes.num;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue