mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-19 09:39:15 +00:00
fcb6df1f63
Also modifies UI. This allows the direct use of passphrase (SRT & RIST) used for encryption, user + password (RIST) as well as streamid (SRT). Previously, these parameters had to be set in the URL in the form: URL?option1=value1&option2=value2. They still can but there is also the option to set them in the stream key and username/password fields. SRT: - the stream_id is set in the stream key (more info on it: [1]); - the encryption passphrase is set in the password auth field. RIST: - the encryption passphrase is set in the stream key; - the srp_username and srp_password are set in the user/password auth fields [2]. Additionally, some error logging has been added when there's a disconnect caused by a wrong password. Lastly, this solves a bug when auto-reconnect is set and a wrong passphrase is provided for srt; the output would keep trying to reconnect. With this commit, an OBS_OUTPUT_INVALID_STREAM signal is emitted and the stream is immediately stopped. [1] https://github.com/Haivision/srt/blob/master/docs/features/access-control.md [2] https://code.videolan.org/rist/librist/-/wikis/Authentication-and-the-ristsrppasswd-Utility Signed-off-by: pkv <pkv@obsproject.com>
116 lines
2.5 KiB
C
116 lines
2.5 KiB
C
#pragma once
|
|
|
|
#include <libavutil/opt.h>
|
|
#include <libavutil/pixdesc.h>
|
|
#include <libavcodec/avcodec.h>
|
|
#include <libavformat/avformat.h>
|
|
#include <libswscale/swscale.h>
|
|
#ifdef NEW_MPEGTS_OUTPUT
|
|
#include "obs-ffmpeg-url.h"
|
|
#endif
|
|
|
|
struct ffmpeg_cfg {
|
|
const char *url;
|
|
const char *format_name;
|
|
const char *format_mime_type;
|
|
const char *muxer_settings;
|
|
const char *protocol_settings; // not used yet for SRT nor RIST
|
|
int gop_size;
|
|
int video_bitrate;
|
|
int audio_bitrate;
|
|
const char *video_encoder;
|
|
int video_encoder_id;
|
|
const char *audio_encoder;
|
|
int audio_encoder_id;
|
|
const char *video_settings;
|
|
const char *audio_settings;
|
|
int audio_mix_count;
|
|
int audio_tracks;
|
|
enum AVPixelFormat format;
|
|
enum AVColorRange color_range;
|
|
enum AVColorPrimaries color_primaries;
|
|
enum AVColorTransferCharacteristic color_trc;
|
|
enum AVColorSpace colorspace;
|
|
int max_luminance;
|
|
int scale_width;
|
|
int scale_height;
|
|
int width;
|
|
int height;
|
|
int frame_size; // audio frame size
|
|
const char *username;
|
|
const char *password;
|
|
const char *key;
|
|
};
|
|
|
|
struct ffmpeg_audio_info {
|
|
AVStream *stream;
|
|
AVCodecContext *ctx;
|
|
};
|
|
|
|
struct ffmpeg_data {
|
|
AVStream *video;
|
|
AVCodecContext *video_ctx;
|
|
struct ffmpeg_audio_info *audio_infos;
|
|
const AVCodec *acodec;
|
|
const AVCodec *vcodec;
|
|
AVFormatContext *output;
|
|
struct SwsContext *swscale;
|
|
|
|
int64_t total_frames;
|
|
AVFrame *vframe;
|
|
int frame_size;
|
|
|
|
uint64_t start_timestamp;
|
|
|
|
int64_t total_samples[MAX_AUDIO_MIXES];
|
|
uint32_t audio_samplerate;
|
|
enum audio_format audio_format;
|
|
size_t audio_planes;
|
|
size_t audio_size;
|
|
int num_audio_streams;
|
|
|
|
/* audio_tracks is a bitmask storing the indices of the mixes */
|
|
int audio_tracks;
|
|
struct circlebuf excess_frames[MAX_AUDIO_MIXES][MAX_AV_PLANES];
|
|
uint8_t *samples[MAX_AUDIO_MIXES][MAX_AV_PLANES];
|
|
AVFrame *aframe[MAX_AUDIO_MIXES];
|
|
|
|
struct ffmpeg_cfg config;
|
|
|
|
bool initialized;
|
|
|
|
char *last_error;
|
|
};
|
|
|
|
struct ffmpeg_output {
|
|
obs_output_t *output;
|
|
volatile bool active;
|
|
struct ffmpeg_data ff_data;
|
|
|
|
bool connecting;
|
|
pthread_t start_thread;
|
|
|
|
uint64_t total_bytes;
|
|
|
|
uint64_t audio_start_ts;
|
|
uint64_t video_start_ts;
|
|
uint64_t stop_ts;
|
|
volatile bool stopping;
|
|
|
|
bool write_thread_active;
|
|
pthread_mutex_t write_mutex;
|
|
pthread_t write_thread;
|
|
os_sem_t *write_sem;
|
|
os_event_t *stop_event;
|
|
|
|
DARRAY(AVPacket *) packets;
|
|
#ifdef NEW_MPEGTS_OUTPUT
|
|
/* used for SRT & RIST */
|
|
URLContext *h;
|
|
AVIOContext *s;
|
|
bool got_headers;
|
|
#endif
|
|
};
|
|
bool ffmpeg_data_init(struct ffmpeg_data *data, struct ffmpeg_cfg *config);
|
|
void ffmpeg_data_free(struct ffmpeg_data *data);
|