@@ -103,7 +103,7 @@ HRESULT ff_decklink_get_display_name(IDeckLink *This, const char **displayName) | |||
static int decklink_select_input(AVFormatContext *avctx, BMDDeckLinkConfigurationID cfg_id) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
BMDDeckLinkAttributeID attr_id = (cfg_id == bmdDeckLinkConfigAudioInputConnection) ? BMDDeckLinkAudioInputConnections : BMDDeckLinkVideoInputConnections; | |||
int64_t bmd_input = (cfg_id == bmdDeckLinkConfigAudioInputConnection) ? (int64_t)ctx->audio_input : (int64_t)ctx->video_input; | |||
@@ -135,7 +135,7 @@ int ff_decklink_set_format(AVFormatContext *avctx, | |||
int tb_num, int tb_den, | |||
decklink_direction_t direction, int num) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
BMDDisplayModeSupport support; | |||
IDeckLinkDisplayModeIterator *itermode; | |||
@@ -255,7 +255,7 @@ int ff_decklink_list_devices(AVFormatContext *avctx) | |||
int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direction) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
IDeckLinkDisplayModeIterator *itermode; | |||
IDeckLinkDisplayMode *mode; | |||
@@ -305,8 +305,8 @@ int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direct | |||
void ff_decklink_cleanup(AVFormatContext *avctx) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
if (ctx->dli) | |||
ctx->dli->Release(); | |||
@@ -206,8 +206,8 @@ private: | |||
decklink_input_callback::decklink_input_callback(AVFormatContext *_avctx) : m_refCount(0) | |||
{ | |||
avctx = _avctx; | |||
decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
ctx = (struct decklink_ctx *) cctx->ctx; | |||
decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
ctx = (struct decklink_ctx *)cctx->ctx; | |||
initial_audio_pts = initial_video_pts = AV_NOPTS_VALUE; | |||
pthread_mutex_init(&m_mutex, NULL); | |||
} | |||
@@ -431,8 +431,8 @@ HRESULT decklink_input_callback::VideoInputFormatChanged( | |||
static HRESULT decklink_start_input(AVFormatContext *avctx) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
ctx->input_callback = new decklink_input_callback(avctx); | |||
ctx->dli->SetCallback(ctx->input_callback); | |||
@@ -443,8 +443,8 @@ extern "C" { | |||
av_cold int ff_decklink_read_close(AVFormatContext *avctx) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
if (ctx->capture_started) { | |||
ctx->dli->StopStreams(); | |||
@@ -462,7 +462,7 @@ av_cold int ff_decklink_read_close(AVFormatContext *avctx) | |||
av_cold int ff_decklink_read_header(AVFormatContext *avctx) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx; | |||
AVStream *st; | |||
HRESULT result; | |||
@@ -638,8 +638,8 @@ error: | |||
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; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
AVFrame *frame = ctx->video_st->codec->coded_frame; | |||
avpacket_queue_get(&ctx->queue, pkt, 1); | |||
@@ -90,8 +90,8 @@ public: | |||
static int decklink_setup_video(AVFormatContext *avctx, AVStream *st) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
AVCodecContext *c = st->codec; | |||
if (ctx->video) { | |||
@@ -140,8 +140,8 @@ static int decklink_setup_video(AVFormatContext *avctx, AVStream *st) | |||
static int decklink_setup_audio(AVFormatContext *avctx, AVStream *st) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
AVCodecContext *c = st->codec; | |||
if (ctx->audio) { | |||
@@ -181,8 +181,8 @@ static int decklink_setup_audio(AVFormatContext *avctx, AVStream *st) | |||
av_cold int ff_decklink_write_trailer(AVFormatContext *avctx) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
if (ctx->playback_started) { | |||
BMDTimeValue actual; | |||
@@ -207,8 +207,8 @@ av_cold int ff_decklink_write_trailer(AVFormatContext *avctx) | |||
static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
AVPicture *avpicture = (AVPicture *) pkt->data; | |||
AVFrame *avframe, *tmp; | |||
decklink_frame *frame; | |||
@@ -287,8 +287,8 @@ static int decklink_write_video_packet(AVFormatContext *avctx, AVPacket *pkt) | |||
static int decklink_write_audio_packet(AVFormatContext *avctx, AVPacket *pkt) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
int sample_count = pkt->size / (ctx->channels << 1); | |||
buffercount_type buffered; | |||
@@ -310,7 +310,7 @@ extern "C" { | |||
av_cold int ff_decklink_write_header(AVFormatContext *avctx) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx; | |||
unsigned int n; | |||
int ret; | |||
@@ -374,8 +374,8 @@ error: | |||
int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt) | |||
{ | |||
struct decklink_cctx *cctx = (struct decklink_cctx *) avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *) cctx->ctx; | |||
struct decklink_cctx *cctx = (struct decklink_cctx *)avctx->priv_data; | |||
struct decklink_ctx *ctx = (struct decklink_ctx *)cctx->ctx; | |||
AVStream *st = avctx->streams[pkt->stream_index]; | |||
ctx->last_pts = FFMAX(ctx->last_pts, pkt->pts); | |||