@@ -390,17 +390,17 @@ 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);
}
-void avpacket_queue_init(AVFormatContext *avctx, AVPacketQueue *q)
+void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q)
{
struct decklink_cctx *ctx = (struct decklink_cctx *)avctx->priv_data;
- memset(q, 0, sizeof(AVPacketQueue));
+ memset(q, 0, sizeof(DecklinkPacketQueue));
pthread_mutex_init(&q->mutex, NULL);
pthread_cond_init(&q->cond, NULL);
q->avctx = avctx;
q->max_q_size = ctx->queue_size;
}
-void avpacket_queue_flush(AVPacketQueue *q)
+void ff_decklink_packet_queue_flush(DecklinkPacketQueue *q)
{
PacketListEntry *pkt, *pkt1;
@@ -417,14 +417,14 @@ void avpacket_queue_flush(AVPacketQueue *q)
pthread_mutex_unlock(&q->mutex);
}
-void avpacket_queue_end(AVPacketQueue *q)
+void ff_decklink_packet_queue_end(DecklinkPacketQueue *q)
{
- avpacket_queue_flush(q);
+ ff_decklink_packet_queue_flush(q);
pthread_mutex_destroy(&q->mutex);
pthread_cond_destroy(&q->cond);
}
-unsigned long long avpacket_queue_size(AVPacketQueue *q)
+unsigned long long ff_decklink_packet_queue_size(DecklinkPacketQueue *q)
{
unsigned long long size;
pthread_mutex_lock(&q->mutex);
@@ -433,12 +433,12 @@ unsigned long long avpacket_queue_size(AVPacketQueue *q)
return size;
}
-int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt)
+int ff_decklink_packet_queue_put(DecklinkPacketQueue *q, AVPacket *pkt)
{
PacketListEntry *pkt1;
// Drop Packet if queue size is > maximum queue size
- if (avpacket_queue_size(q) > (uint64_t)q->max_q_size) {
+ if (ff_decklink_packet_queue_size(q) > (uint64_t)q->max_q_size) {
av_packet_unref(pkt);
av_log(q->avctx, AV_LOG_WARNING, "Decklink input buffer overrun!\n");
return -1;
@@ -475,7 +475,7 @@ int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt)
return 0;
}
-int avpacket_queue_get(AVPacketQueue *q, AVPacket *pkt, int block)
+int ff_decklink_packet_queue_get(DecklinkPacketQueue *q, AVPacket *pkt, int block)
{
int ret;
@@ -78,7 +78,7 @@ static char *dup_cfstring_to_utf8(CFStringRef w)
class decklink_output_callback;
class decklink_input_callback;
-typedef struct AVPacketQueue {
+typedef struct DecklinkPacketQueue {
PacketList pkt_list;
int nb_packets;
unsigned long long size;
@@ -87,7 +87,7 @@ typedef struct AVPacketQueue {
pthread_cond_t cond;
AVFormatContext *avctx;
int64_t max_q_size;
-} AVPacketQueue;
+} DecklinkPacketQueue;
struct decklink_ctx {
/* DeckLink SDK interfaces */
@@ -111,7 +111,7 @@ struct decklink_ctx {
int supports_vanc;
/* Capture buffer queue */
- AVPacketQueue queue;
+ DecklinkPacketQueue queue;
AVCCFifo *cc_fifo; ///< closed captions
@@ -235,11 +235,11 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct
void ff_decklink_cleanup(AVFormatContext *avctx);
int ff_decklink_init_device(AVFormatContext *avctx, const char* name);
-void avpacket_queue_init(AVFormatContext *avctx, AVPacketQueue *q);
-void avpacket_queue_flush(AVPacketQueue *q);
-void avpacket_queue_end(AVPacketQueue *q);
-unsigned long long avpacket_queue_size(AVPacketQueue *q);
-int avpacket_queue_put(AVPacketQueue *q, AVPacket *pkt);
-int avpacket_queue_get(AVPacketQueue *q, AVPacket *pkt, int block);
+void ff_decklink_packet_queue_init(AVFormatContext *avctx, DecklinkPacketQueue *q);
+void ff_decklink_packet_queue_flush(DecklinkPacketQueue *q);
+void ff_decklink_packet_queue_end(DecklinkPacketQueue *q);
+unsigned long long ff_decklink_packet_queue_size(DecklinkPacketQueue *q);
+int ff_decklink_packet_queue_put(DecklinkPacketQueue *q, AVPacket *pkt);
+int ff_decklink_packet_queue_get(DecklinkPacketQueue *q, AVPacket *pkt, int block);
#endif /* AVDEVICE_DECKLINK_COMMON_H */
@@ -568,7 +568,7 @@ static void handle_klv(AVFormatContext *avctx, decklink_ctx *ctx, IDeckLinkVideo
klv_packet.data = klv.data();
klv_packet.size = klv.size();
- if (avpacket_queue_put(&ctx->queue, &klv_packet) < 0) {
+ if (ff_decklink_packet_queue_put(&ctx->queue, &klv_packet) < 0) {
++ctx->dropped;
}
}
@@ -760,7 +760,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
if (videoFrame) {
AVPacket pkt = { 0 };
if (ctx->frameCount % 25 == 0) {
- unsigned long long qsize = avpacket_queue_size(&ctx->queue);
+ unsigned long long qsize = ff_decklink_packet_queue_size(&ctx->queue);
av_log(avctx, AV_LOG_DEBUG,
"Frame received (#%lu) - Valid (%liB) - QSize %fMB\n",
ctx->frameCount,
@@ -924,7 +924,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
txt_pkt.stream_index = ctx->teletext_st->index;
txt_pkt.data = txt_buf0;
txt_pkt.size = txt_buf - txt_buf0;
- if (avpacket_queue_put(&ctx->queue, &txt_pkt) < 0) {
+ if (ff_decklink_packet_queue_put(&ctx->queue, &txt_pkt) < 0) {
++ctx->dropped;
}
}
@@ -935,7 +935,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
if (pkt.buf)
videoFrame->AddRef();
- if (avpacket_queue_put(&ctx->queue, &pkt) < 0) {
+ if (ff_decklink_packet_queue_put(&ctx->queue, &pkt) < 0) {
++ctx->dropped;
}
}
@@ -957,7 +957,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
pkt.stream_index = ctx->audio_st->index;
pkt.data = (uint8_t *)audioFrameBytes;
- if (avpacket_queue_put(&ctx->queue, &pkt) < 0) {
+ if (ff_decklink_packet_queue_put(&ctx->queue, &pkt) < 0) {
++ctx->dropped;
}
}
@@ -1039,7 +1039,7 @@ av_cold int ff_decklink_read_close(AVFormatContext *avctx)
}
ff_decklink_cleanup(avctx);
- avpacket_queue_end(&ctx->queue);
+ ff_decklink_packet_queue_end(&ctx->queue);
av_freep(&cctx->ctx);
@@ -1297,7 +1297,7 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx)
goto error;
}
- avpacket_queue_init (avctx, &ctx->queue);
+ ff_decklink_packet_queue_init(avctx, &ctx->queue);
if (ctx->dli->StartStreams() != S_OK) {
av_log(avctx, AV_LOG_ERROR, "Cannot start input stream\n");
@@ -1317,7 +1317,7 @@ int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt)
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data;
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx;
- avpacket_queue_get(&ctx->queue, pkt, 1);
+ ff_decklink_packet_queue_get(&ctx->queue, pkt, 1);
if (ctx->tc_format && !(av_dict_get(ctx->video_st->metadata, "timecode", NULL, 0))) {
size_t size;
The threadsafe queue used within the decklink module was named "AVPacketQueue" which implies that it is part of the public API, which it is not. Rename the functions and the name of the queue struct to make clear it is used exclusively by decklink, per Marton Balint's suggestion. Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com> --- libavdevice/decklink_common.cpp | 18 +++++++++--------- libavdevice/decklink_common.h | 18 +++++++++--------- libavdevice/decklink_dec.cpp | 16 ++++++++-------- 3 files changed, 26 insertions(+), 26 deletions(-)