History

avutil: remove deprecated FF_API_REORDERED_OPAQUE

James Almer committed 2 years ago

Commit 67e7f0b1 parent b8fef7e16 files · +1 −173Browse files

Showing the changes to libavcodec (13 of 16 files). Show all

Unified · Split

13 files
  1. libavcodec/avcodec.h +0 −16
  2. libavcodec/decode.c +0 −5
  3. libavcodec/encode.c +0 −6
  4. libavcodec/libdav1d.c +1 −21
  5. libavcodec/librav1e.c +0 −13
  6. libavcodec/libvpxenc.c +0 −14
  7. libavcodec/libwebpenc_animencoder.c +0 −13
  8. libavcodec/libx264.c +0 −18
  9. libavcodec/libx265.c +0 −20
  10. libavcodec/nvenc.c +0 −12
  11. libavcodec/nvenc.h +0 −4
  12. libavcodec/options.c +0 −5
  13. libavcodec/pthread_frame.c +0 −5
libavcodec/avcodec.h+0−16
@@ -1353,22 +1353,6 @@ typedef struct AVCodecContext { · 1352 unmodified lines
13531353 */
13541354 int err_recognition;
13551355
1356−#if FF_API_REORDERED_OPAQUE
1357− /**
1358− * opaque 64-bit number (generally a PTS) that will be reordered and
1359− * output in AVFrame.reordered_opaque
1360− * - encoding: Set by libavcodec to the reordered_opaque of the input
1361− * frame corresponding to the last returned packet. Only
1362− * supported by encoders with the
1363− * AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE capability.
1364− * - decoding: Set by user.
1365− *
1366− * @deprecated Use AV_CODEC_FLAG_COPY_OPAQUE instead
1367− */
1368− attribute_deprecated
1369− int64_t reordered_opaque;
1370−#endif
1371−
13721356 /**
13731357 * Hardware accelerator in use
13741358 * - encoding: unused.
libavcodec/decode.c+0−5
@@ -1474,11 +1474,6 @@ FF_DISABLE_DEPRECATION_WARNINGS · 1473 unmodified lines
14741474 FF_ENABLE_DEPRECATION_WARNINGS
14751475 #endif
14761476 }
1477−#if FF_API_REORDERED_OPAQUE
1478−FF_DISABLE_DEPRECATION_WARNINGS
1479− frame->reordered_opaque = avctx->reordered_opaque;
1480−FF_ENABLE_DEPRECATION_WARNINGS
1481−#endif
14821477
14831478 ret = fill_frame_props(avctx, frame);
14841479 if (ret < 0)
libavcodec/encode.c+0−6
@@ -234,12 +234,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 233 unmodified lines
234234 int ff_encode_reordered_opaque(AVCodecContext *avctx,
235235 AVPacket *pkt, const AVFrame *frame)
236236 {
237−#if FF_API_REORDERED_OPAQUE
238−FF_DISABLE_DEPRECATION_WARNINGS
239− avctx->reordered_opaque = frame->reordered_opaque;
240−FF_ENABLE_DEPRECATION_WARNINGS
241−#endif
242−
243237 if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
244238 int ret = av_buffer_replace(&pkt->opaque_ref, frame->opaque_ref);
245239 if (ret < 0)
libavcodec/libdav1d.c+1−21
@@ -298,9 +298,6 @@ static void libdav1d_flush(AVCodecContext *c) · 297 unmodified lines
298298
299299 typedef struct OpaqueData {
300300 void *pkt_orig_opaque;
301−#if FF_API_REORDERED_OPAQUE
302− int64_t reordered_opaque;
303−#endif
304301 } OpaqueData;
305302
306303 static void libdav1d_data_free(const uint8_t *data, void *opaque) {
@@ -346,12 +343,7 @@ static int libdav1d_receive_frame_internal(AVCodecContext *c, Dav1dPicture *p) · 39 unmodified lines
346343
347344 pkt->buf = NULL;
348345
349−FF_DISABLE_DEPRECATION_WARNINGS
350− if (
351−#if FF_API_REORDERED_OPAQUE
352− c->reordered_opaque != AV_NOPTS_VALUE ||
353−#endif
354− (pkt->opaque && (c->flags & AV_CODEC_FLAG_COPY_OPAQUE))) {
346+ if (pkt->opaque && (c->flags & AV_CODEC_FLAG_COPY_OPAQUE)) {
355347 od = av_mallocz(sizeof(*od));
356348 if (!od) {
357349 av_packet_free(&pkt);
@@ -359,10 +351,6 @@ FF_DISABLE_DEPRECATION_WARNINGS · 1 unmodified line
359351 return AVERROR(ENOMEM);
360352 }
361353 od->pkt_orig_opaque = pkt->opaque;
362−#if FF_API_REORDERED_OPAQUE
363− od->reordered_opaque = c->reordered_opaque;
364−#endif
365−FF_ENABLE_DEPRECATION_WARNINGS
366354 }
367355 pkt->opaque = od;
368356
@@ -464,14 +452,6 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) · 95 unmodified lines
464452
465453 pkt = (AVPacket *)p->m.user_data.data;
466454 od = pkt->opaque;
467−#if FF_API_REORDERED_OPAQUE
468−FF_DISABLE_DEPRECATION_WARNINGS
469− if (od && od->reordered_opaque != AV_NOPTS_VALUE)
470− frame->reordered_opaque = od->reordered_opaque;
471− else
472− frame->reordered_opaque = AV_NOPTS_VALUE;
473−FF_ENABLE_DEPRECATION_WARNINGS
474−#endif
475455
476456 // restore the original user opaque value for
477457 // ff_decode_frame_props_from_pkt()
libavcodec/librav1e.c+0−13
@@ -57,9 +57,6 @@ typedef struct librav1eContext { · 56 unmodified lines
5757 typedef struct FrameData {
5858 int64_t pts;
5959 int64_t duration;
60−#if FF_API_REORDERED_OPAQUE
61− int64_t reordered_opaque;
62−#endif
6360
6461 void *frame_opaque;
6562 AVBufferRef *frame_opaque_ref;
@@ -472,11 +469,6 @@ static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt) · 406 unmodified lines
472469 }
473470 fd->pts = frame->pts;
474471 fd->duration = frame->duration;
475−#if FF_API_REORDERED_OPAQUE
476−FF_DISABLE_DEPRECATION_WARNINGS
477− fd->reordered_opaque = frame->reordered_opaque;
478−FF_ENABLE_DEPRECATION_WARNINGS
479−#endif
480472
481473 if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
482474 fd->frame_opaque = frame->opaque;
@@ -583,11 +575,6 @@ retry: · 100 unmodified lines
583575 fd = rpkt->opaque;
584576 pkt->pts = pkt->dts = fd->pts;
585577 pkt->duration = fd->duration;
586−#if FF_API_REORDERED_OPAQUE
587−FF_DISABLE_DEPRECATION_WARNINGS
588− avctx->reordered_opaque = fd->reordered_opaque;
589−FF_ENABLE_DEPRECATION_WARNINGS
590−#endif
591578
592579 if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
593580 pkt->opaque = fd->frame_opaque;
libavcodec/libvpxenc.c+0−14
@@ -68,9 +68,6 @@ typedef struct FrameData { · 67 unmodified lines
6868 int64_t pts;
6969 int64_t duration;
7070
71−#if FF_API_REORDERED_OPAQUE
72− int64_t reordered_opaque;
73−#endif
7471 void *frame_opaque;
7572 AVBufferRef *frame_opaque_ref;
7673
@@ -383,11 +380,6 @@ static int frame_data_submit(AVCodecContext *avctx, AVFifo *fifo, · 306 unmodified lines
383380 if (ret < 0)
384381 goto fail;
385382 }
386−#if FF_API_REORDERED_OPAQUE
387−FF_DISABLE_DEPRECATION_WARNINGS
388− fd.reordered_opaque = frame->reordered_opaque;
389−FF_ENABLE_DEPRECATION_WARNINGS
390−#endif
391383
392384 ret = av_fifo_write(fifo, &fd, 1);
393385 if (ret < 0)
@@ -414,12 +406,6 @@ static int frame_data_apply(AVCodecContext *avctx, AVFifo *fifo, AVPacket *pkt) · 20 unmodified lines
414406 goto skip;
415407 }
416408
417−#if FF_API_REORDERED_OPAQUE
418−FF_DISABLE_DEPRECATION_WARNINGS
419− avctx->reordered_opaque = fd.reordered_opaque;
420−FF_ENABLE_DEPRECATION_WARNINGS
421−#endif
422−
423409 pkt->duration = fd.duration;
424410 if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
425411 pkt->opaque = fd.frame_opaque;
libavcodec/libwebpenc_animencoder.c+0−13
@@ -39,9 +39,6 @@ typedef struct LibWebPAnimContext { · 38 unmodified lines
3939 int64_t first_frame_pts; // pts of the first encoded frame.
4040 int64_t end_pts; // pts + duration of the last frame
4141
42−#if FF_API_REORDERED_OPAQUE
43− int64_t reordered_opaque;
44−#endif
4542 void *first_frame_opaque;
4643 AVBufferRef *first_frame_opaque_ref;
4744
@@ -92,11 +89,6 @@ static int libwebp_anim_encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 44 unmodified lines
9289 if (pkt->pts != AV_NOPTS_VALUE && s->end_pts > pkt->pts)
9390 pkt->duration = s->end_pts - pkt->pts;
9491
95−#if FF_API_REORDERED_OPAQUE
96−FF_DISABLE_DEPRECATION_WARNINGS
97− avctx->reordered_opaque = s->reordered_opaque;
98−FF_ENABLE_DEPRECATION_WARNINGS
99−#endif
10092 if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
10193 pkt->opaque = s->first_frame_opaque;
10294 pkt->opaque_ref = s->first_frame_opaque_ref;
@@ -134,11 +126,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 31 unmodified lines
134126
135127 if (!avctx->frame_num) {
136128 s->first_frame_pts = frame->pts;
137−#if FF_API_REORDERED_OPAQUE
138−FF_DISABLE_DEPRECATION_WARNINGS
139− s->reordered_opaque = frame->reordered_opaque;
140−FF_ENABLE_DEPRECATION_WARNINGS
141−#endif
142129
143130 if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
144131 s->first_frame_opaque = frame->opaque;
libavcodec/libx264.c+0−18
@@ -54,9 +54,6 @@ · 53 unmodified lines
5454 #define MB_CEIL(x) MB_FLOOR((x) + (MB_SIZE - 1))
5555
5656 typedef struct X264Opaque {
57−#if FF_API_REORDERED_OPAQUE
58− int64_t reordered_opaque;
59−#endif
6057 int64_t wallclock;
6158 int64_t duration;
6259
@@ -512,11 +509,6 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, · 449 unmodified lines
512509 goto fail;
513510 }
514511
515−#if FF_API_REORDERED_OPAQUE
516−FF_DISABLE_DEPRECATION_WARNINGS
517− opaque->reordered_opaque = frame->reordered_opaque;
518−FF_ENABLE_DEPRECATION_WARNINGS
519−#endif
520512 opaque->duration = frame->duration;
521513 opaque->wallclock = wallclock;
522514 if (ctx->export_side_data & AV_CODEC_EXPORT_DATA_PRFT)
@@ -681,11 +673,6 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame, · 158 unmodified lines
681673 out_opaque = pic_out.opaque;
682674 if (out_opaque >= x4->reordered_opaque &&
683675 out_opaque < &x4->reordered_opaque[x4->nb_reordered_opaque]) {
684−#if FF_API_REORDERED_OPAQUE
685−FF_DISABLE_DEPRECATION_WARNINGS
686− ctx->reordered_opaque = out_opaque->reordered_opaque;
687−FF_ENABLE_DEPRECATION_WARNINGS
688−#endif
689676 wallclock = out_opaque->wallclock;
690677 pkt->duration = out_opaque->duration;
691678
@@ -700,11 +687,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 8 unmodified lines
700687 // Unexpected opaque pointer on picture output
701688 av_log(ctx, AV_LOG_ERROR, "Unexpected opaque pointer; "
702689 "this is a bug, please report it.\n");
703−#if FF_API_REORDERED_OPAQUE
704−FF_DISABLE_DEPRECATION_WARNINGS
705− ctx->reordered_opaque = 0;
706−FF_ENABLE_DEPRECATION_WARNINGS
707−#endif
708690 }
709691
710692 switch (pic_out.i_type) {
libavcodec/libx265.c+0−20
@@ -42,9 +42,6 @@ · 41 unmodified lines
4242 #include "sei.h"
4343
4444 typedef struct ReorderedData {
45−#if FF_API_REORDERED_OPAQUE
46− int64_t reordered_opaque;
47−#endif
4845 int64_t duration;
4946
5047 void *frame_opaque;
@@ -626,11 +623,6 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 575 unmodified lines
626623 rd = &ctx->rd[rd_idx];
627624
628625 rd->duration = pic->duration;
629−#if FF_API_REORDERED_OPAQUE
630−FF_DISABLE_DEPRECATION_WARNINGS
631− rd->reordered_opaque = pic->reordered_opaque;
632−FF_ENABLE_DEPRECATION_WARNINGS
633−#endif
634626 if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
635627 rd->frame_opaque = pic->opaque;
636628 ret = av_buffer_replace(&rd->frame_opaque_ref, pic->opaque_ref);
@@ -768,11 +760,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 131 unmodified lines
768760 int idx = (int)(intptr_t)x265pic_out.userData - 1;
769761 ReorderedData *rd = &ctx->rd[idx];
770762
771−#if FF_API_REORDERED_OPAQUE
772−FF_DISABLE_DEPRECATION_WARNINGS
773− avctx->reordered_opaque = rd->reordered_opaque;
774−FF_ENABLE_DEPRECATION_WARNINGS
775−#endif
776763 pkt->duration = rd->duration;
777764
778765 if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
@@ -783,13 +770,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 4 unmodified lines
783770
784771 rd_release(ctx, idx);
785772 }
786−#if FF_API_REORDERED_OPAQUE
787− else {
788−FF_DISABLE_DEPRECATION_WARNINGS
789− avctx->reordered_opaque = 0;
790−FF_ENABLE_DEPRECATION_WARNINGS
791− }
792−#endif
793773
794774 *got_packet = 1;
795775 return 0;
libavcodec/nvenc.c+0−12
@@ -2282,12 +2282,6 @@ static int nvenc_store_frame_data(AVCodecContext *avctx, NV_ENC_PIC_PARAMS *pic_ · 2281 unmodified lines
22822282 frame_data->duration = frame->duration;
22832283 frame_data->frame_opaque = frame->opaque;
22842284
2285−#if FF_API_REORDERED_OPAQUE
2286−FF_DISABLE_DEPRECATION_WARNINGS
2287− frame_data->reordered_opaque = frame->reordered_opaque;
2288−FF_ENABLE_DEPRECATION_WARNINGS
2289−#endif
2290−
22912285 ctx->frame_data_array_pos = (ctx->frame_data_array_pos + 1) % ctx->frame_data_array_nb;
22922286 pic_params->inputDuration = idx;
22932287
@@ -2304,12 +2298,6 @@ static int nvenc_retrieve_frame_data(AVCodecContext *avctx, NV_ENC_LOCK_BITSTREA · 10 unmodified lines
23042298
23052299 pkt->duration = frame_data->duration;
23062300
2307−#if FF_API_REORDERED_OPAQUE
2308−FF_DISABLE_DEPRECATION_WARNINGS
2309− avctx->reordered_opaque = frame_data->reordered_opaque;
2310−FF_ENABLE_DEPRECATION_WARNINGS
2311−#endif
2312−
23132301 if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
23142302 pkt->opaque = frame_data->frame_opaque;
23152303 pkt->opaque_ref = frame_data->frame_opaque_ref;
libavcodec/nvenc.h+0−4
@@ -100,10 +100,6 @@ typedef struct NvencFrameData · 99 unmodified lines
100100 {
101101 int64_t duration;
102102
103−#if FF_API_REORDERED_OPAQUE
104− int64_t reordered_opaque;
105−#endif
106−
107103 void *frame_opaque;
108104 AVBufferRef *frame_opaque_ref;
109105 } NvencFrameData;
libavcodec/options.c+0−5
@@ -125,11 +125,6 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec) · 124 unmodified lines
125125 s->sw_pix_fmt = AV_PIX_FMT_NONE;
126126 s->sample_fmt = AV_SAMPLE_FMT_NONE;
127127
128−#if FF_API_REORDERED_OPAQUE
129−FF_DISABLE_DEPRECATION_WARNINGS
130− s->reordered_opaque = AV_NOPTS_VALUE;
131−FF_ENABLE_DEPRECATION_WARNINGS
132−#endif
133128 if(codec && codec2->priv_data_size){
134129 s->priv_data = av_mallocz(codec2->priv_data_size);
135130 if (!s->priv_data)
libavcodec/pthread_frame.c+0−5
@@ -412,11 +412,6 @@ static int update_context_from_user(AVCodecContext *dst, const AVCodecContext *s · 411 unmodified lines
412412 dst->skip_frame = src->skip_frame;
413413
414414 dst->frame_num = src->frame_num;
415−#if FF_API_REORDERED_OPAQUE
416−FF_DISABLE_DEPRECATION_WARNINGS
417− dst->reordered_opaque = src->reordered_opaque;
418−FF_ENABLE_DEPRECATION_WARNINGS
419−#endif
420415
421416 av_packet_unref(dst->internal->last_pkt_props);
422417 err = av_packet_copy_props(dst->internal->last_pkt_props, src->internal->last_pkt_props);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t