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/cbs: Make ff_cbs_alloc_unit_data() static

Browse Source 
Forgotten in 7c92eaace2.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-09-06 12:37:26 +02:00
parent 97bc4695fb
commit fd43b868e1
2 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
libavcodec/cbs.c
View File

@@ -315,6 +315,28 @@ int ff_cbs_read(CodedBitstreamContext *ctx,
data, size, 0); data, size, 0);
} }
/**
* Allocate a new internal data buffer of the given size in the unit.
*
* The data buffer will have input padding.
*/
static int cbs_alloc_unit_data(CodedBitstreamUnit *unit,
size_t size)
{
av_assert0(!unit->data && !unit->data_ref);
unit->data_ref = av_buffer_alloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!unit->data_ref)
return AVERROR(ENOMEM);
unit->data = unit->data_ref->data;
unit->data_size = size;
memset(unit->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
return 0;
}
static int cbs_write_unit_data(CodedBitstreamContext *ctx, static int cbs_write_unit_data(CodedBitstreamContext *ctx,
CodedBitstreamUnit *unit) CodedBitstreamUnit *unit)
{ {
@@ -360,7 +382,7 @@ static int cbs_write_unit_data(CodedBitstreamContext *ctx,
flush_put_bits(&pbc); flush_put_bits(&pbc);
ret = ff_cbs_alloc_unit_data(unit, put_bytes_output(&pbc)); ret = cbs_alloc_unit_data(unit, put_bytes_output(&pbc));
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -693,23 +715,6 @@ int ff_cbs_alloc_unit_content(CodedBitstreamUnit *unit,
return 0; return 0;
} }
int ff_cbs_alloc_unit_data(CodedBitstreamUnit *unit,
size_t size)
{
av_assert0(!unit->data && !unit->data_ref);
unit->data_ref = av_buffer_alloc(size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!unit->data_ref)
return AVERROR(ENOMEM);
unit->data = unit->data_ref->data;
unit->data_size = size;
memset(unit->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE);
return 0;
}
static int cbs_insert_unit(CodedBitstreamFragment *frag, static int cbs_insert_unit(CodedBitstreamFragment *frag,
int position) int position)
{ {

9
libavcodec/cbs.h
View File

@@ -380,15 +380,6 @@ int ff_cbs_alloc_unit_content(CodedBitstreamUnit *unit,
int ff_cbs_alloc_unit_content2(CodedBitstreamContext *ctx, int ff_cbs_alloc_unit_content2(CodedBitstreamContext *ctx,
CodedBitstreamUnit *unit); CodedBitstreamUnit *unit);
/**
* Allocate a new internal data buffer of the given size in the unit.
*
* The data buffer will have input padding.
*/
int ff_cbs_alloc_unit_data(CodedBitstreamUnit *unit,
size_t size);
/** /**
* Insert a new unit into a fragment with the given content. * Insert a new unit into a fragment with the given content.
* *