Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gstinterpipesrc.c: free buffers, don't attempt to retimestamp unless playing. #125

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

gstinterpipesrc.c: free buffers, don't attempt to retimestamp unless playing. #125

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
814982e
Merge branch 'hotfix/add-new-event-callback'
jafet-chaves Jan 18, 2022
446e681
Also wait for PLAYING state with restart-ts
Feb 7, 2022
22e4f77
free listen_to string on finalize
Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions gst/interpipe/gstinterpipesrc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,11 @@ gst_inter_pipe_src_finalize (GObject * object)

src = GST_INTER_PIPE_SRC (object);

if (src->listen_to) {
g_free (src->listen_to);
src->listen_to = NULL;
}

/* Free pending serial events queue */
g_queue_free_full (src->pending_serial_events,
(GDestroyNotify) gst_event_unref);
Expand Down Expand Up @@ -679,9 +684,19 @@ gst_inter_pipe_src_push_buffer (GstInterPipeIListener * iface,
"Calculated Buffer Timestamp (PTS): %" GST_TIME_FORMAT,
GST_TIME_ARGS (GST_BUFFER_PTS (buffer)));
} else if (GST_INTER_PIPE_SRC_RESTART_TIMESTAMP == src->stream_sync) {
/* Remove the incoming timestamp to be generated according this basetime */
GST_BUFFER_PTS (buffer) = GST_CLOCK_TIME_NONE;
GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
if (GST_STATE (src) == GST_STATE_PLAYING) {
/* Remove the incoming timestamp to be generated according this basetime */
GST_BUFFER_PTS (buffer) = GST_CLOCK_TIME_NONE;
GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE;
} else {
/*
* appsrc requires srcbasetime to re-timestamp buffers, and srcbasetime
* is only valid when PLAYING.
*/
GST_LOG_OBJECT (src, "Not PLAYING state yet");
gst_buffer_unref (buffer);
goto nosync;
}
}

ret = gst_app_src_push_buffer (appsrc, buffer);
Expand Down