avcodec/evc_frame_merge: copy input packet props to output
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
daf61a706a
commit
9834660601
@ -34,7 +34,7 @@ typedef struct AccessUnitBuffer {
|
|||||||
} AccessUnitBuffer;
|
} AccessUnitBuffer;
|
||||||
|
|
||||||
typedef struct EVCFMergeContext {
|
typedef struct EVCFMergeContext {
|
||||||
AVPacket *in;
|
AVPacket *in, *buffer_pkt;
|
||||||
EVCParamSets ps;
|
EVCParamSets ps;
|
||||||
EVCParserPoc poc;
|
EVCParserPoc poc;
|
||||||
AccessUnitBuffer au_buffer;
|
AccessUnitBuffer au_buffer;
|
||||||
@ -67,6 +67,7 @@ static void evc_frame_merge_flush(AVBSFContext *bsf)
|
|||||||
|
|
||||||
ff_evc_ps_free(&ctx->ps);
|
ff_evc_ps_free(&ctx->ps);
|
||||||
av_packet_unref(ctx->in);
|
av_packet_unref(ctx->in);
|
||||||
|
av_packet_unref(ctx->buffer_pkt);
|
||||||
ctx->au_buffer.data_size = 0;
|
ctx->au_buffer.data_size = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -146,7 +147,7 @@ static int parse_nal_unit(AVBSFContext *bsf, const uint8_t *buf, int buf_size)
|
|||||||
static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
|
static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
|
||||||
{
|
{
|
||||||
EVCFMergeContext *ctx = bsf->priv_data;
|
EVCFMergeContext *ctx = bsf->priv_data;
|
||||||
AVPacket *in = ctx->in;
|
AVPacket *in = ctx->in, *buffer_pkt = ctx->buffer_pkt;
|
||||||
size_t data_size;
|
size_t data_size;
|
||||||
int au_end_found = 0, err;
|
int au_end_found = 0, err;
|
||||||
|
|
||||||
@ -162,6 +163,16 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
|
|||||||
break;
|
break;
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
/* Buffer packets with timestamps (there should be at most one per AU)
|
||||||
|
* or any packet if buffer_pkt is empty. The latter is needed to
|
||||||
|
* passthrough positions in case there are no timestamps like with
|
||||||
|
* the raw EVC demuxer. */
|
||||||
|
if (!buffer_pkt->data ||
|
||||||
|
in->pts != AV_NOPTS_VALUE && buffer_pkt->pts == AV_NOPTS_VALUE) {
|
||||||
|
err = av_packet_ref(buffer_pkt, in);
|
||||||
|
if (err < 0)
|
||||||
|
goto end;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Buffer size is not enough for buffer to store NAL unit 4-bytes prefix (length)
|
// Buffer size is not enough for buffer to store NAL unit 4-bytes prefix (length)
|
||||||
@ -210,15 +221,20 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out)
|
|||||||
|
|
||||||
ctx->au_buffer.data_size = 0;
|
ctx->au_buffer.data_size = 0;
|
||||||
err = av_new_packet(out, data_size);
|
err = av_new_packet(out, data_size);
|
||||||
|
if (err < 0)
|
||||||
|
goto end;
|
||||||
|
err = av_packet_copy_props(out, buffer_pkt);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto end;
|
goto end;
|
||||||
|
|
||||||
|
av_packet_unref(buffer_pkt);
|
||||||
memcpy(out->data, ctx->au_buffer.data, data_size);
|
memcpy(out->data, ctx->au_buffer.data, data_size);
|
||||||
|
|
||||||
err = 0;
|
err = 0;
|
||||||
end:
|
end:
|
||||||
if (err < 0) {
|
if (err < 0) {
|
||||||
av_packet_unref(in);
|
av_packet_unref(in);
|
||||||
|
av_packet_unref(buffer_pkt);
|
||||||
ctx->au_buffer.data_size = 0;
|
ctx->au_buffer.data_size = 0;
|
||||||
}
|
}
|
||||||
return err;
|
return err;
|
||||||
@ -229,7 +245,8 @@ static int evc_frame_merge_init(AVBSFContext *bsf)
|
|||||||
EVCFMergeContext *ctx = bsf->priv_data;
|
EVCFMergeContext *ctx = bsf->priv_data;
|
||||||
|
|
||||||
ctx->in = av_packet_alloc();
|
ctx->in = av_packet_alloc();
|
||||||
if (!ctx->in)
|
ctx->buffer_pkt = av_packet_alloc();
|
||||||
|
if (!ctx->in || !ctx->buffer_pkt)
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@ -240,6 +257,7 @@ static void evc_frame_merge_close(AVBSFContext *bsf)
|
|||||||
EVCFMergeContext *ctx = bsf->priv_data;
|
EVCFMergeContext *ctx = bsf->priv_data;
|
||||||
|
|
||||||
av_packet_free(&ctx->in);
|
av_packet_free(&ctx->in);
|
||||||
|
av_packet_free(&ctx->buffer_pkt);
|
||||||
ff_evc_ps_free(&ctx->ps);
|
ff_evc_ps_free(&ctx->ps);
|
||||||
|
|
||||||
ctx->au_buffer.capacity = 0;
|
ctx->au_buffer.capacity = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user