Skip to content

Prevent double notification for frame done in external frame usage #1180

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Prevent double notification for frame done in external frame usage #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0680689
Fix: Prevent double notification for frame done in external frame usage
tszumski Jun 17, 2025
14ec9b6
Cleanup GStreamer ST20 TX plugin, workaround no longer needed
tszumski Jun 17, 2025
fd0a79b
Fix: Prevent double notification for frame done in ST20P TX v2
tszumski Jun 17, 2025
4507fdc
Add notification to tx_st20p_convert_put_frame()
tszumski Jun 18, 2025
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
11 changes: 0 additions & 11 deletions ecosystem/gstreamer_plugin/gst_mtl_st20p_tx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,21 +536,10 @@ GST_PLUGIN_DEFINE(GST_VERSION_MAJOR, GST_VERSION_MINOR, mtl_st20p_tx,
GST_PACKAGE_ORIGIN)

static int gst_mtl_st20p_tx_frame_done(void* priv, struct st_frame* frame) {
/* In case of format conversion (transmit vs input), MTL may call
* gst_mtl_st20p_tx_frame_done twice.
* To avoid double free, we set (frame->opaque = NULL) in first call so that the second
* call can exit gracefully.
*/
if (frame == NULL || frame->opaque == NULL) {
return 0;
}

GstSt20pTxExternalDataChild* child = frame->opaque;
GstSt20pTxExternalDataParent* parent = child->parent;

gst_memory_unmap(child->gst_buffer_memory, &child->map_info);

frame->opaque = NULL;
free(child);

pthread_mutex_lock(&parent->parent_mutex);
Expand Down
14 changes: 12 additions & 2 deletions lib/src/st2110/pipeline/st20_pipeline_tx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,10 @@ static int tx_st20p_frame_done(void* priv, uint16_t frame_idx,
frame->epoch = meta->epoch;
frame->rtp_timestamp = meta->rtp_timestamp;

if (ctx->ops.notify_frame_done) { /* notify app which frame done */
if (ctx->ops.notify_frame_done &&
!framebuff->frame_done_cb_called) { /* notify app which frame done */
ctx->ops.notify_frame_done(ctx->ops.priv, frame);
framebuff->frame_done_cb_called = true;
}

/* notify app can get frame */
Expand Down Expand Up @@ -212,6 +214,11 @@ static int tx_st20p_convert_put_frame(void* priv, struct st20_convert_frame_meta
framebuff->stat = ST20P_TX_FRAME_CONVERTED;
}

if (ctx->ops.notify_frame_done && !framebuff->frame_done_cb_called) {
ctx->ops.notify_frame_done(ctx->ops.priv, &framebuff->src);
framebuff->frame_done_cb_called = true;
}

return 0;
}

Expand Down Expand Up @@ -602,6 +609,7 @@ struct st_frame* st20p_tx_get_frame(st20p_tx_handle handle) {
}

framebuff->stat = ST20P_TX_FRAME_IN_USER;
framebuff->frame_done_cb_called = false;
/* point to next */
ctx->framebuff_producer_idx = tx_st20p_next_idx(ctx, framebuff->idx);
mt_pthread_mutex_unlock(&ctx->lock);
Expand Down Expand Up @@ -748,8 +756,10 @@ int st20p_tx_put_ext_frame(st20p_tx_handle handle, struct st_frame* frame,
if (ctx->internal_converter) { /* convert internal */
ctx->internal_converter->convert_func(&framebuff->src, &framebuff->dst);
framebuff->stat = ST20P_TX_FRAME_CONVERTED;
if (ctx->ops.notify_frame_done)
if (ctx->ops.notify_frame_done && !framebuff->frame_done_cb_called) {
ctx->ops.notify_frame_done(ctx->ops.priv, &framebuff->src);
framebuff->frame_done_cb_called = true;
}
} else {
framebuff->stat = ST20P_TX_FRAME_READY;
st20_convert_notify_frame_ready(ctx->convert_impl);
Expand Down
1 change: 1 addition & 0 deletions lib/src/st2110/pipeline/st20_pipeline_tx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ struct st20p_tx_frame {
void* user_meta; /* the meta data from user */
size_t user_meta_buffer_size;
size_t user_meta_data_size;
bool frame_done_cb_called; /* frame done callback called */
};

struct st20p_tx_ctx {
Expand Down
Loading