virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/bsf: replace ctx->internal-> with bsfi-> for better readability

Browse Source 
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Limin Wang
2019-12-16 13:01:49 +08:00
committed by Michael Niedermayer
parent f7c945abc0
commit ebbc976ae6
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libavcodec/bsf.c
View File

@@ -82,6 +82,7 @@ const AVClass *av_bsf_get_class(void)
int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx) int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx)
{ {
AVBSFContext *ctx; AVBSFContext *ctx;
AVBSFInternal *bsfi;
int ret; int ret;
ctx = av_mallocz(sizeof(*ctx)); ctx = av_mallocz(sizeof(*ctx));
@@ -98,14 +99,15 @@ int av_bsf_alloc(const AVBitStreamFilter *filter, AVBSFContext **pctx)
goto fail; goto fail;
} }
ctx->internal = av_mallocz(sizeof(*ctx->internal)); bsfi = av_mallocz(sizeof(*bsfi));
if (!ctx->internal) { if (!bsfi) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
ctx->internal = bsfi;
ctx->internal->buffer_pkt = av_packet_alloc(); bsfi->buffer_pkt = av_packet_alloc();
if (!ctx->internal->buffer_pkt) { if (!bsfi->buffer_pkt) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
@@ -175,9 +177,11 @@ int av_bsf_init(AVBSFContext *ctx)
void av_bsf_flush(AVBSFContext *ctx) void av_bsf_flush(AVBSFContext *ctx)
{ {
ctx->internal->eof = 0; AVBSFInternal *bsfi = ctx->internal;
av_packet_unref(ctx->internal->buffer_pkt); bsfi->eof = 0;
av_packet_unref(bsfi->buffer_pkt);
if (ctx->filter->flush) if (ctx->filter->flush)
ctx->filter->flush(ctx); ctx->filter->flush(ctx);
@@ -185,26 +189,27 @@ void av_bsf_flush(AVBSFContext *ctx)
int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt) int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt)
{ {
AVBSFInternal *bsfi = ctx->internal;
int ret; int ret;
if (!pkt || (!pkt->data && !pkt->side_data_elems)) { if (!pkt || (!pkt->data && !pkt->side_data_elems)) {
ctx->internal->eof = 1; bsfi->eof = 1;
return 0; return 0;
} }
if (ctx->internal->eof) { if (bsfi->eof) {
av_log(ctx, AV_LOG_ERROR, "A non-NULL packet sent after an EOF.\n"); av_log(ctx, AV_LOG_ERROR, "A non-NULL packet sent after an EOF.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (ctx->internal->buffer_pkt->data || if (bsfi->buffer_pkt->data ||
ctx->internal->buffer_pkt->side_data_elems) bsfi->buffer_pkt->side_data_elems)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
ret = av_packet_make_refcounted(pkt); ret = av_packet_make_refcounted(pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
av_packet_move_ref(ctx->internal->buffer_pkt, pkt); av_packet_move_ref(bsfi->buffer_pkt, pkt);
return 0; return 0;
} }
@@ -216,38 +221,38 @@ int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt)
int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt) int ff_bsf_get_packet(AVBSFContext *ctx, AVPacket **pkt)
{ {
AVBSFInternal *in = ctx->internal; AVBSFInternal *bsfi = ctx->internal;
AVPacket *tmp_pkt; AVPacket *tmp_pkt;
if (in->eof) if (bsfi->eof)
return AVERROR_EOF; return AVERROR_EOF;
if (!ctx->internal->buffer_pkt->data && if (!bsfi->buffer_pkt->data &&
!ctx->internal->buffer_pkt->side_data_elems) !bsfi->buffer_pkt->side_data_elems)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
tmp_pkt = av_packet_alloc(); tmp_pkt = av_packet_alloc();
if (!tmp_pkt) if (!tmp_pkt)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
*pkt = ctx->internal->buffer_pkt; *pkt = bsfi->buffer_pkt;
ctx->internal->buffer_pkt = tmp_pkt; bsfi->buffer_pkt = tmp_pkt;
return 0; return 0;
} }
int ff_bsf_get_packet_ref(AVBSFContext *ctx, AVPacket *pkt) int ff_bsf_get_packet_ref(AVBSFContext *ctx, AVPacket *pkt)
{ {
AVBSFInternal *in = ctx->internal; AVBSFInternal *bsfi = ctx->internal;
if (in->eof) if (bsfi->eof)
return AVERROR_EOF; return AVERROR_EOF;
if (!ctx->internal->buffer_pkt->data && if (!bsfi->buffer_pkt->data &&
!ctx->internal->buffer_pkt->side_data_elems) !bsfi->buffer_pkt->side_data_elems)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
av_packet_move_ref(pkt, ctx->internal->buffer_pkt); av_packet_move_ref(pkt, bsfi->buffer_pkt);
return 0; return 0;
} }