virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avdevice/decklink: move queue_size to an argument for ff_decklink_packet_queue_init

Browse Source 
The existing queue initialization function would always sets it's
maximum queue size to ctx->queue_size.  But because we are introducing
more queues we may want the sizes to differ between them.

Move the specification of the queue size into an argument, which can
be passed from the caller.

This patch makes no functional change to the behavior.  It is being
made to accommodate Marton Balin's request to split out the queue
size for the new VANC queue being introduced in a later patch.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Devin Heitmueller 2023-06-30 17:14:38 -04:00 committed by Marton Balint
parent 5930d397ef
commit e7d800fe89
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavdevice/decklink_common.cpp
View File

@ -390,14 +390,13 @@ int ff_decklink_set_format(AVFormatContext *avctx, decklink_direction_t directio
return ff_decklink_set_format(avctx, 0, 0, 0, 0, AV_FIELD_UNKNOWN, direction); return ff_decklink_set_format(avctx, 0, 0, 0, 0, AV_FIELD_UNKNOWN, direction);
} }
void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q) void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q, int64_t queue_size)
{ {
struct decklink_cctx *ctx = (struct decklink_cctx *)avctx->priv_data;
memset(q, 0, sizeof(DecklinkPacketQueue)); memset(q, 0, sizeof(DecklinkPacketQueue));
pthread_mutex_init(&q->mutex, NULL); pthread_mutex_init(&q->mutex, NULL);
pthread_cond_init(&q->cond, NULL); pthread_cond_init(&q->cond, NULL);
q->avctx = avctx; q->avctx = avctx;
q->max_q_size = ctx->queue_size; q->max_q_size = queue_size;
} }
void ff_decklink_packet_queue_flush(DecklinkPacketQueue *q) void ff_decklink_packet_queue_flush(DecklinkPacketQueue *q)

2
libavdevice/decklink_common.h
View File

@ -235,7 +235,7 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct
void ff_decklink_cleanup(AVFormatContext *avctx); void ff_decklink_cleanup(AVFormatContext *avctx);
int ff_decklink_init_device(AVFormatContext *avctx, const char* name); int ff_decklink_init_device(AVFormatContext *avctx, const char* name);
void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q); void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q, int64_t queue_size);
void ff_decklink_packet_queue_flush(DecklinkPacketQueue *q); void ff_decklink_packet_queue_flush(DecklinkPacketQueue *q);
void ff_decklink_packet_queue_end(DecklinkPacketQueue *q); void ff_decklink_packet_queue_end(DecklinkPacketQueue *q);
unsigned long long ff_decklink_packet_queue_size(DecklinkPacketQueue *q); unsigned long long ff_decklink_packet_queue_size(DecklinkPacketQueue *q);

2
libavdevice/decklink_dec.cpp
View File

@ -1297,7 +1297,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
goto error; goto error;
} }
ff_decklink_packet_queue_init(avctx, &ctx->queue); ff_decklink_packet_queue_init(avctx, &ctx->queue, cctx->queue_size);
if (ctx->dli->StartStreams() != S_OK) { if (ctx->dli->StartStreams() != S_OK) {
av_log(avctx, AV_LOG_ERROR, "Cannot start input stream\n"); av_log(avctx, AV_LOG_ERROR, "Cannot start input stream\n");