virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/cbs: add an AVBufferRef input argument to ff_cbs_read()

Browse Source 
To allow taking a reference from an existing buffer outside of AVPackets.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-04-29 16:54:21 -03:00
parent fab691edaf
commit 4bfe9c5663
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/apv_parser.c
View File

@ -48,7 +48,7 @@ static int parse(AVCodecParserContext *s,
p->cbc->log_ctx = avctx; p->cbc->log_ctx = avctx;
ret = ff_cbs_read(p->cbc, au, buf, buf_size); ret = ff_cbs_read(p->cbc, au, NULL, buf, buf_size);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to parse access unit.\n"); av_log(avctx, AV_LOG_ERROR, "Failed to parse access unit.\n");
goto end; goto end;

2
libavcodec/av1_parser.c
View File

@ -82,7 +82,7 @@ static int av1_parser_parse(AVCodecParserContext *ctx,
ff_cbs_fragment_reset(td); ff_cbs_fragment_reset(td);
} }
ret = ff_cbs_read(s->cbc, td, data, size); ret = ff_cbs_read(s->cbc, td, NULL, data, size);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to parse temporal unit.\n"); av_log(avctx, AV_LOG_ERROR, "Failed to parse temporal unit.\n");
goto end; goto end;

5
libavcodec/cbs.c
View File

@ -261,7 +261,7 @@ static int cbs_fill_fragment_data(CodedBitstreamFragment *frag,
static int cbs_read_data(CodedBitstreamContext *ctx, static int cbs_read_data(CodedBitstreamContext *ctx,
CodedBitstreamFragment *frag, CodedBitstreamFragment *frag,
AVBufferRef *buf, const AVBufferRef *buf,
const uint8_t *data, size_t size, const uint8_t *data, size_t size,
int header) int header)
{ {
@ -329,9 +329,10 @@ int CBS_FUNC(read_packet_side_data)(CodedBitstreamContext *ctx,
int CBS_FUNC(read)(CodedBitstreamContext *ctx, int CBS_FUNC(read)(CodedBitstreamContext *ctx,
CodedBitstreamFragment *frag, CodedBitstreamFragment *frag,
const AVBufferRef *buf,
const uint8_t *data, size_t size) const uint8_t *data, size_t size)
{ {
return cbs_read_data(ctx, frag, NULL, return cbs_read_data(ctx, frag, buf,
data, size, 0); data, size, 0);
} }
#endif #endif

1
libavcodec/cbs.h
View File

@ -379,6 +379,7 @@ int CBS_FUNC(read_packet)(CodedBitstreamContext *ctx,
*/ */
int CBS_FUNC(read)(CodedBitstreamContext *ctx, int CBS_FUNC(read)(CodedBitstreamContext *ctx,
CodedBitstreamFragment *frag, CodedBitstreamFragment *frag,
const AVBufferRef *buf,
const uint8_t *data, size_t size); const uint8_t *data, size_t size);

2
libavcodec/vulkan_encode_h264.c
View File

@ -1061,7 +1061,7 @@ static int parse_feedback_units(AVCodecContext *avctx,
if (err < 0) if (err < 0)
return err; return err;
err = ff_cbs_read(cbs, &au, data, size); err = ff_cbs_read(cbs, &au, NULL, data, size);
if (err < 0) { if (err < 0) {
av_log(avctx, AV_LOG_ERROR, "Unable to parse feedback units, bad drivers: %s\n", av_log(avctx, AV_LOG_ERROR, "Unable to parse feedback units, bad drivers: %s\n",
av_err2str(err)); av_err2str(err));

2
libavcodec/vulkan_encode_h265.c
View File

@ -1214,7 +1214,7 @@ static int parse_feedback_units(AVCodecContext *avctx,
if (err < 0) if (err < 0)
return err; return err;
err = ff_cbs_read(cbs, &au, data, size); err = ff_cbs_read(cbs, &au, NULL, data, size);
if (err < 0) { if (err < 0) {
av_log(avctx, AV_LOG_ERROR, "Unable to parse feedback units, bad drivers: %s\n", av_log(avctx, AV_LOG_ERROR, "Unable to parse feedback units, bad drivers: %s\n",
av_err2str(err)); av_err2str(err));

2
libavcodec/vvc_parser.c
View File

@ -357,7 +357,7 @@ static int parse_nal_units(AVCodecParserContext *s, const uint8_t *buf,
return 1; return 1;
} }
if ((ret = ff_cbs_read(ctx->cbc, pu, buf, buf_size)) < 0) { if ((ret = ff_cbs_read(ctx->cbc, pu, NULL, buf, buf_size)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to parse picture unit.\n"); av_log(avctx, AV_LOG_ERROR, "Failed to parse picture unit.\n");
goto end; goto end;
} }