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

obs-ffmpeg: Remove unnecessary function 

This terrible boilerplate code is no longer necessary, as it is now
fixed by the previous commit.
master
jp9000 2019-07-07 12:14:17 -07:00
parent 85ca1b6918
commit 3b581a3727
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/obs-ffmpeg/obs-ffmpeg-output.c
View File

@ -900,34 +900,6 @@ static void encode_audio(struct ffmpeg_output *output, int idx,
os_sem_post(output->write_sem);
}
static bool prepare_audio(struct ffmpeg_data *data,
const struct audio_data *frame,
struct audio_data *output)
{
*output = *frame;
if (frame->timestamp < data->start_timestamp) {
uint64_t duration = (uint64_t)frame->frames * 1000000000 /
(uint64_t)data->audio_samplerate;
uint64_t end_ts = (frame->timestamp + duration);
uint64_t cutoff;
if (end_ts <= data->start_timestamp)
return false;
cutoff = data->start_timestamp - frame->timestamp;
output->timestamp += cutoff;
cutoff = cutoff * (uint64_t)data->audio_samplerate / 1000000000;
for (size_t i = 0; i < data->audio_planes; i++)
output->data[i] += data->audio_size * (uint32_t)cutoff;
output->frames -= (uint32_t)cutoff;
}
return true;
}
/* Given a bitmask for the selected tracks and the mix index,
* this returns the stream index which will be passed to the muxer. */
static int get_track_order(int track_config, size_t mix_index)
@ -945,7 +917,7 @@ static void receive_audio(void *param, size_t mix_idx, struct audio_data *frame)
struct ffmpeg_output *output = param;
struct ffmpeg_data *data = &output->ff_data;
size_t frame_size_bytes;
struct audio_data in;
struct audio_data in = *frame;
int track_order;
// codec doesn't support audio or none configured
@ -963,8 +935,6 @@ static void receive_audio(void *param, size_t mix_idx, struct audio_data *frame)
if (!data->start_timestamp)
return;
if (!prepare_audio(data, frame, &in))
return;
if (!output->audio_start_ts)
output->audio_start_ts = in.timestamp;