mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

decklinkaudiosink: Start audio pre-rolling if the output is not started yet in render()

Browse source 
This seems to allow to schedule audio samples correctly at their right
times already.

https://bugzilla.gnome.org/show_bug.cgi?id=790114
This commit is contained in:
Sebastian Dröge 2017-11-22 14:29:51 +02:00
parent 011649790d
commit 2b8f82f929
1 changed files with 33 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
sys/decklink/gstdecklinkaudiosink.cpp
View file

@ -497,6 +497,10 @@ gst_decklink_audio_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
if (GST_BASE_SINK_CAST (self)->flushing) { if (GST_BASE_SINK_CAST (self)->flushing) {
return GST_FLOW_FLUSHING; return GST_FLOW_FLUSHING;
} }
// If we're called before output is actually started, start pre-rolling
if (!self->output->started) {
self->output->output->BeginAudioPreroll ();
}
video_sink = video_sink =
GST_DECKLINK_VIDEO_SINK (gst_object_ref (self->output->videosink)); GST_DECKLINK_VIDEO_SINK (gst_object_ref (self->output->videosink));
@ -697,65 +701,40 @@ gst_decklink_audio_sink_render (GstBaseSink * bsink, GstBuffer * buffer)
gst_decklink_video_sink_convert_to_internal_clock (video_sink, gst_decklink_video_sink_convert_to_internal_clock (video_sink,
&schedule_time, &schedule_time_duration); &schedule_time, &schedule_time_duration);
if (!self->output->started) { GST_LOG_OBJECT (self, "Scheduling audio samples at %" GST_TIME_FORMAT
GST_LOG_OBJECT (self, "Writing audio frame synchronously because PAUSED"); " with duration %" GST_TIME_FORMAT, GST_TIME_ARGS (schedule_time),
GST_TIME_ARGS (schedule_time_duration));
ret = ret = self->output->output->ScheduleAudioSamples ((void *) data, len,
self->output->output->WriteAudioSamplesSync ((void *) data, len, schedule_time, GST_SECOND, &written);
&written); if (ret != S_OK) {
if (ret != S_OK) { bool is_running = true;
bool is_running = true; self->output->output->IsScheduledPlaybackRunning (&is_running);
self->output->output->IsScheduledPlaybackRunning (&is_running);
if (is_running && !GST_BASE_SINK_CAST (self)->flushing && self->output->started) { if (is_running && !GST_BASE_SINK_CAST (self)->flushing
GST_ELEMENT_WARNING (self, STREAM, FAILED, && self->output->started) {
(NULL), ("Failed to write audio frame synchronously: 0x%08lx", GST_ELEMENT_ERROR (self, STREAM, FAILED, (NULL),
(unsigned long) ret)); ("Failed to schedule frame: 0x%08lx", (unsigned long) ret));
flow_ret = GST_FLOW_ERROR; flow_ret = GST_FLOW_ERROR;
break; break;
} else { } else {
flow_ret = GST_FLOW_FLUSHING; // Ignore the error and go out of the loop here, we're shutting down
break; // or are not started yet and there's nothing we can do at this point
} GST_INFO_OBJECT (self,
"Ignoring scheduling error 0x%08x because we're not started yet"
" or not anymore", ret);
flow_ret = GST_FLOW_OK;
break;
} }
len -= written;
data += written * self->info.bpf;
if (self->resampler)
written_all += written * ABS (GST_BASE_SINK_CAST (self)->segment.rate);
else
written_all += written;
} else {
GST_LOG_OBJECT (self, "Scheduling audio samples at %" GST_TIME_FORMAT
" with duration %" GST_TIME_FORMAT, GST_TIME_ARGS (schedule_time),
GST_TIME_ARGS (schedule_time_duration));
ret = self->output->output->ScheduleAudioSamples ((void *) data, len,
schedule_time, GST_SECOND, &written);
if (ret != S_OK) {
bool is_running = true;
self->output->output->IsScheduledPlaybackRunning (&is_running);
if (is_running && !GST_BASE_SINK_CAST (self)->flushing && self->output->started) {
GST_ELEMENT_ERROR (self, STREAM, FAILED,
(NULL), ("Failed to schedule frame: 0x%08lx",
(unsigned long) ret));
flow_ret = GST_FLOW_ERROR;
break;
} else {
flow_ret = GST_FLOW_FLUSHING;
break;
}
}
len -= written;
data += written * self->info.bpf;
if (self->resampler)
written_all += written * ABS (GST_BASE_SINK_CAST (self)->segment.rate);
else
written_all += written;
} }
len -= written;
data += written * self->info.bpf;
if (self->resampler)
written_all += written * ABS (GST_BASE_SINK_CAST (self)->segment.rate);
else
written_all += written;
flow_ret = GST_FLOW_OK; flow_ret = GST_FLOW_OK;
} while (len > 0); } while (len > 0);