Skip to content

Commit ef6a9e5

Browse files
mkverjamrial
mkver
authored and
jamrial
committed
avutil/buffer: Switch AVBuffer API to size_t
Announced in 14040a1. Signed-off-by: Andreas Rheinhardt <[email protected]> Signed-off-by: James Almer <[email protected]>
1 parent 985c0da commit ef6a9e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+110
-206
lines changed

‎fftools/ffprobe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2158,7 +2158,7 @@ static void show_packet(WriterContext *w, InputFile *ifile, AVPacket *pkt, int p
21582158
pkt->flags & AV_PKT_FLAG_DISCARD ? 'D' : '_');
21592159

21602160
if (pkt->side_data_elems) {
2161-
int size;
2161+
size_t size;
21622162
const uint8_t *side_metadata;
21632163

21642164
side_metadata = av_packet_get_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, &size);

‎libavcodec/aacdec_template.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3437,11 +3437,11 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
34373437
int buf_consumed;
34383438
int buf_offset;
34393439
int err;
3440-
buffer_size_t new_extradata_size;
3440+
size_t new_extradata_size;
34413441
const uint8_t *new_extradata = av_packet_get_side_data(avpkt,
34423442
AV_PKT_DATA_NEW_EXTRADATA,
34433443
&new_extradata_size);
3444-
buffer_size_t jp_dualmono_size;
3444+
size_t jp_dualmono_size;
34453445
const uint8_t *jp_dualmono = av_packet_get_side_data(avpkt,
34463446
AV_PKT_DATA_JP_DUALMONO,
34473447
&jp_dualmono_size);

‎libavcodec/adxdec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data,
103103
const uint8_t *buf = avpkt->data;
104104
const uint8_t *buf_end = buf + avpkt->size;
105105
int num_blocks, ch, ret;
106-
buffer_size_t new_extradata_size;
106+
size_t new_extradata_size;
107107
uint8_t *new_extradata;
108108

109109
new_extradata = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA,

‎libavcodec/audiotoolboxdec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ static int ffat_decode(AVCodecContext *avctx, void *data,
484484
if (avctx->codec_id == AV_CODEC_ID_AAC) {
485485
if (!at->extradata_size) {
486486
uint8_t *side_data;
487-
buffer_size_t side_data_size;
487+
size_t side_data_size;
488488

489489
side_data = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA,
490490
&side_data_size);

‎libavcodec/avpacket.c

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -218,16 +218,12 @@ int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
218218

219219

220220
uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
221-
buffer_size_t size)
221+
size_t size)
222222
{
223223
int ret;
224224
uint8_t *data;
225225

226-
#if FF_API_BUFFER_SIZE_T
227-
if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
228-
#else
229226
if (size > SIZE_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
230-
#endif
231227
return NULL;
232228
data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
233229
if (!data)
@@ -243,7 +239,7 @@ uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
243239
}
244240

245241
uint8_t *av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
246-
buffer_size_t *size)
242+
size_t *size)
247243
{
248244
int i;
249245

@@ -297,11 +293,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type)
297293
return NULL;
298294
}
299295

300-
#if FF_API_BUFFER_SIZE_T
301-
uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size)
302-
#else
303296
uint8_t *av_packet_pack_dictionary(AVDictionary *dict, size_t *size)
304-
#endif
305297
{
306298
uint8_t *data = NULL;
307299
*size = 0;
@@ -320,11 +312,7 @@ uint8_t *av_packet_pack_dictionary(AVDictionary *dict, size_t *size)
320312

321313
if (pass)
322314
memcpy(data + total_length, str, len);
323-
#if FF_API_BUFFER_SIZE_T
324-
else if (len > INT_MAX - total_length)
325-
#else
326315
else if (len > SIZE_MAX - total_length)
327-
#endif
328316
return NULL;
329317
total_length += len;
330318
}
@@ -340,12 +328,8 @@ uint8_t *av_packet_pack_dictionary(AVDictionary *dict, size_t *size)
340328
return data;
341329
}
342330

343-
#if FF_API_BUFFER_SIZE_T
344-
int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict)
345-
#else
346331
int av_packet_unpack_dictionary(const uint8_t *data, size_t size,
347332
AVDictionary **dict)
348-
#endif
349333
{
350334
const uint8_t *end;
351335
int ret;
@@ -372,7 +356,7 @@ int av_packet_unpack_dictionary(const uint8_t *data, size_t size,
372356
}
373357

374358
int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
375-
buffer_size_t size)
359+
size_t size)
376360
{
377361
int i;
378362

@@ -402,7 +386,7 @@ int av_packet_copy_props(AVPacket *dst, const AVPacket *src)
402386
dst->side_data_elems = 0;
403387
for (i = 0; i < src->side_data_elems; i++) {
404388
enum AVPacketSideDataType type = src->side_data[i].type;
405-
buffer_size_t size = src->side_data[i].size;
389+
size_t size = src->side_data[i].size;
406390
uint8_t *src_data = src->side_data[i].data;
407391
uint8_t *dst_data = av_packet_new_side_data(dst, type, size);
408392

@@ -599,7 +583,7 @@ void avpriv_packet_list_free(PacketList **pkt_buf, PacketList **pkt_buf_end)
599583
int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type)
600584
{
601585
uint8_t *side_data;
602-
buffer_size_t side_data_size;
586+
size_t side_data_size;
603587
int i;
604588

605589
side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_QUALITY_STATS, &side_data_size);
@@ -625,7 +609,7 @@ int ff_side_data_set_prft(AVPacket *pkt, int64_t timestamp)
625609
{
626610
AVProducerReferenceTime *prft;
627611
uint8_t *side_data;
628-
buffer_size_t side_data_size;
612+
size_t side_data_size;
629613

630614
side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_PRFT, &side_data_size);
631615
if (!side_data) {

‎libavcodec/cbs_bsf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static int cbs_bsf_update_side_data(AVBSFContext *bsf, AVPacket *pkt)
2424
CBSBSFContext *ctx = bsf->priv_data;
2525
CodedBitstreamFragment *frag = &ctx->fragment;
2626
uint8_t *side_data;
27-
buffer_size_t side_data_size;
27+
size_t side_data_size;
2828
int err;
2929

3030
side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA,

‎libavcodec/decode.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ typedef struct FramePool {
6767
static int apply_param_change(AVCodecContext *avctx, const AVPacket *avpkt)
6868
{
6969
int ret;
70-
buffer_size_t size;
70+
size_t size;
7171
const uint8_t *data;
7272
uint32_t flags;
7373
int64_t val;
@@ -344,7 +344,7 @@ static inline int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame,
344344
got_frame = 0;
345345
} else if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) {
346346
uint8_t *side;
347-
buffer_size_t side_size;
347+
size_t side_size;
348348
uint32_t discard_padding = 0;
349349
uint8_t skip_reason = 0;
350350
uint8_t discard_reason = 0;
@@ -1463,7 +1463,7 @@ int avcodec_default_get_buffer2(AVCodecContext *avctx, AVFrame *frame, int flags
14631463

14641464
static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame)
14651465
{
1466-
buffer_size_t size;
1466+
size_t size;
14671467
const uint8_t *side_metadata;
14681468

14691469
AVDictionary **frame_md = &frame->metadata;
@@ -1502,7 +1502,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
15021502
frame->pkt_size = pkt->size;
15031503

15041504
for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) {
1505-
buffer_size_t size;
1505+
size_t size;
15061506
uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size);
15071507
if (packet_sd) {
15081508
AVFrameSideData *frame_sd = av_frame_new_side_data(frame,
@@ -1841,14 +1841,15 @@ FF_ENABLE_DEPRECATION_WARNINGS
18411841

18421842
int ff_copy_palette(void *dst, const AVPacket *src, void *logctx)
18431843
{
1844-
buffer_size_t size;
1844+
size_t size;
18451845
const void *pal = av_packet_get_side_data(src, AV_PKT_DATA_PALETTE, &size);
18461846

18471847
if (pal && size == AVPALETTE_SIZE) {
18481848
memcpy(dst, pal, AVPALETTE_SIZE);
18491849
return 1;
18501850
} else if (pal) {
1851-
av_log(logctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
1851+
av_log(logctx, AV_LOG_ERROR,
1852+
"Palette size %"SIZE_SPECIFIER" is wrong\n", size);
18521853
}
18531854
return 0;
18541855
}

‎libavcodec/h264_metadata_bsf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ static int h264_metadata_handle_display_orientation(AVBSFContext *bsf,
371371
H264RawSEIDisplayOrientation *disp =
372372
&ctx->display_orientation_payload;
373373
uint8_t *data;
374-
buffer_size_t size;
374+
size_t size;
375375
int write = 0;
376376

377377
data = av_packet_get_side_data(pkt, AV_PKT_DATA_DISPLAYMATRIX, &size);

‎libavcodec/h264dec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data,
975975
return send_next_delayed_frame(h, pict, got_frame, 0);
976976

977977
if (av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, NULL)) {
978-
buffer_size_t side_size;
978+
size_t side_size;
979979
uint8_t *side = av_packet_get_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size);
980980
ff_h264_decode_extradata(side, side_size,
981981
&h->ps, &h->is_avc, &h->nal_length_size,

‎libavcodec/hevcdec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3303,7 +3303,7 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
33033303
AVPacket *avpkt)
33043304
{
33053305
int ret;
3306-
buffer_size_t new_extradata_size;
3306+
size_t new_extradata_size;
33073307
uint8_t *new_extradata;
33083308
HEVCContext *s = avctx->priv_data;
33093309

‎libavcodec/libvpxdec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ static int vpx_decode(AVCodecContext *avctx,
221221
struct vpx_image *img, *img_alpha;
222222
int ret;
223223
uint8_t *side_data = NULL;
224-
buffer_size_t side_data_size;
224+
size_t side_data_size;
225225

226226
ret = decode_frame(avctx, &ctx->decoder, avpkt->data, avpkt->size);
227227
if (ret)

‎libavcodec/mpeg12enc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,8 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number)
575575
put_bits(&s->pb, 8, 0xff); // marker_bits
576576
} else {
577577
av_log(s->avctx, AV_LOG_WARNING,
578-
"Warning Closed Caption size (%d) can not exceed 93 bytes "
579-
"and must be a multiple of 3\n", side_data->size);
578+
"Closed Caption size (%"SIZE_SPECIFIER") can not exceed "
579+
"93 bytes and must be a multiple of 3\n", side_data->size);
580580
}
581581
}
582582
}

‎libavcodec/mscc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,16 @@ static int decode_frame(AVCodecContext *avctx,
152152
}
153153

154154
if (avctx->pix_fmt == AV_PIX_FMT_PAL8) {
155-
buffer_size_t size;
155+
size_t size;
156156
const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, &size);
157157

158158
if (pal && size == AVPALETTE_SIZE) {
159159
frame->palette_has_changed = 1;
160160
for (j = 0; j < 256; j++)
161161
s->pal[j] = 0xFF000000 | AV_RL32(pal + j * 4);
162162
} else if (pal) {
163-
av_log(avctx, AV_LOG_ERROR, "Palette size %d is wrong\n", size);
163+
av_log(avctx, AV_LOG_ERROR,
164+
"Palette size %"SIZE_SPECIFIER" is wrong\n", size);
164165
}
165166
memcpy(frame->data[1], s->pal, AVPALETTE_SIZE);
166167
}

‎libavcodec/nvdec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ static int nvdec_decoder_create(AVBufferRef **out, AVBufferRef *hw_device_ref,
242242
return ret;
243243
}
244244

245-
static AVBufferRef *nvdec_decoder_frame_alloc(void *opaque, buffer_size_t size)
245+
static AVBufferRef *nvdec_decoder_frame_alloc(void *opaque, size_t size)
246246
{
247247
NVDECFramePool *pool = opaque;
248248
AVBufferRef *ret;
@@ -283,7 +283,7 @@ static void nvdec_free_dummy(struct AVHWFramesContext *ctx)
283283
av_buffer_pool_uninit(&ctx->pool);
284284
}
285285

286-
static AVBufferRef *nvdec_alloc_dummy(buffer_size_t size)
286+
static AVBufferRef *nvdec_alloc_dummy(size_t size)
287287
{
288288
return av_buffer_create(NULL, 0, NULL, NULL, 0);
289289
}

‎libavcodec/packet.h

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,7 @@ enum AVPacketSideDataType {
305305

306306
typedef struct AVPacketSideData {
307307
uint8_t *data;
308-
#if FF_API_BUFFER_SIZE_T
309-
int size;
310-
#else
311308
size_t size;
312-
#endif
313309
enum AVPacketSideDataType type;
314310
} AVPacketSideData;
315311

@@ -528,11 +524,7 @@ int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
528524
* @return pointer to fresh allocated data or NULL otherwise
529525
*/
530526
uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
531-
#if FF_API_BUFFER_SIZE_T
532-
int size);
533-
#else
534527
size_t size);
535-
#endif
536528

537529
/**
538530
* Wrap an existing array as a packet side data.
@@ -559,11 +551,7 @@ int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
559551
* @return 0 on success, < 0 on failure
560552
*/
561553
int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
562-
#if FF_API_BUFFER_SIZE_T
563-
int size);
564-
#else
565554
size_t size);
566-
#endif
567555

568556
/**
569557
* Get side information from packet.
@@ -575,11 +563,7 @@ int av_packet_shrink_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
575563
* @return pointer to data if present or NULL otherwise
576564
*/
577565
uint8_t* av_packet_get_side_data(const AVPacket *pkt, enum AVPacketSideDataType type,
578-
#if FF_API_BUFFER_SIZE_T
579-
int *size);
580-
#else
581566
size_t *size);
582-
#endif
583567

584568
const char *av_packet_side_data_name(enum AVPacketSideDataType type);
585569

@@ -590,11 +574,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type);
590574
* @param size pointer to store the size of the returned data
591575
* @return pointer to data if successful, NULL otherwise
592576
*/
593-
#if FF_API_BUFFER_SIZE_T
594-
uint8_t *av_packet_pack_dictionary(AVDictionary *dict, int *size);
595-
#else
596577
uint8_t *av_packet_pack_dictionary(AVDictionary *dict, size_t *size);
597-
#endif
598578
/**
599579
* Unpack a dictionary from side_data.
600580
*
@@ -603,12 +583,8 @@ uint8_t *av_packet_pack_dictionary(AVDictionary *dict, size_t *size);
603583
* @param dict the metadata storage dictionary
604584
* @return 0 on success, < 0 on failure
605585
*/
606-
#if FF_API_BUFFER_SIZE_T
607-
int av_packet_unpack_dictionary(const uint8_t *data, int size, AVDictionary **dict);
608-
#else
609586
int av_packet_unpack_dictionary(const uint8_t *data, size_t size,
610587
AVDictionary **dict);
611-
#endif
612588

613589
/**
614590
* Convenience function to free all the side data stored.

‎libavcodec/srtdec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static int srt_decode_frame(AVCodecContext *avctx,
5959
AVBPrint buffer;
6060
int x1 = -1, y1 = -1, x2 = -1, y2 = -1;
6161
int ret;
62-
buffer_size_t size;
62+
size_t size;
6363
const uint8_t *p = av_packet_get_side_data(avpkt, AV_PKT_DATA_SUBTITLE_POSITION, &size);
6464
FFASSDecoderContext *s = avctx->priv_data;
6565

‎libavcodec/vaapi_encode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2235,7 +2235,7 @@ static void vaapi_encode_free_output_buffer(void *opaque,
22352235
}
22362236

22372237
static AVBufferRef *vaapi_encode_alloc_output_buffer(void *opaque,
2238-
buffer_size_t size)
2238+
size_t size)
22392239
{
22402240
AVCodecContext *avctx = opaque;
22412241
VAAPIEncodeContext *ctx = avctx->priv_data;

‎libavdevice/decklink_dec.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ HRESULT decklink_input_callback::VideoInputFrameArrived(
936936
}
937937

938938
if (av_dict_set(&metadata_dict, "timecode", tc, 0) >= 0) {
939-
buffer_size_t metadata_len;
939+
size_t metadata_len;
940940
packed_metadata = av_packet_pack_dictionary(metadata_dict, &metadata_len);
941941
av_dict_free(&metadata_dict);
942942
if (packed_metadata) {
@@ -1435,7 +1435,7 @@ int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt)
14351435
avpacket_queue_get(&ctx->queue, pkt, 1);
14361436

14371437
if (ctx->tc_format && !(av_dict_get(ctx->video_st->metadata, "timecode", NULL, 0))) {
1438-
buffer_size_t size;
1438+
size_t size;
14391439
const uint8_t *side_metadata = av_packet_get_side_data(pkt, AV_PKT_DATA_STRINGS_METADATA, &size);
14401440
if (side_metadata) {
14411441
if (av_packet_unpack_dictionary(side_metadata, size, &ctx->video_st->metadata) < 0)

0 commit comments

Comments
 (0)