History

avcodec: remove deprecated FF_API_TICKS_PER_FRAME

Deprecated since 2023-05-15.

James Almer committed 1 year ago

Commit 7d077231 parent c29a1cb28 files · +16 −210Browse files

Unified · Split

28 files
  1. libavcodec/amfenc_av1.c +1 −7
  2. libavcodec/amfenc_h264.c +1 −7
  3. libavcodec/amfenc_hevc.c +1 −7
  4. libavcodec/avcodec.h +0 −17
  5. libavcodec/encode.c +0 −14
  6. libavcodec/flashsv2enc.c +2 −3
  7. libavcodec/h264dec.c +0 −6
  8. libavcodec/libaomenc.c +1 −7
  9. libavcodec/libkvazaar.c +1 −7
  10. libavcodec/libopenh264enc.c +1 −7
  11. libavcodec/librav1e.c +1 −7
  12. libavcodec/libsvtav1.c +1 −7
  13. libavcodec/libvpxenc.c +1 −7
  14. libavcodec/libvvenc.c +1 −14
  15. libavcodec/libx264.c +1 −7
  16. libavcodec/libx265.c +1 −6
  17. libavcodec/mfenc.c +0 −5
  18. libavcodec/mpeg12dec.c +0 −11
  19. libavcodec/mpegvideo_parser.c +0 −10
  20. libavcodec/msmpeg4enc.c +1 −7
  21. libavcodec/nvenc.c +1 −7
  22. libavcodec/options_table.h +0 −3
  23. libavcodec/pthread_frame.c +0 −5
  24. libavcodec/ratecontrol.c +0 −6
  25. libavcodec/vc1.c +0 −8
  26. libavcodec/version_major.h +0 −1
  27. libavformat/avformat.c +0 −11
  28. libavformat/demux.c +0 −6
libavcodec/amfenc_av1.c+1−7
@@ -213,13 +213,7 @@ static av_cold int amf_encode_init_av1(AVCodecContext* avctx) · 212 unmodified lines
213 framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den);213 framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den);
214 }214 }
215 else {215 else {
216FF_DISABLE_DEPRECATION_WARNINGS216 framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num);
217 framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num
218#if FF_API_TICKS_PER_FRAME
219 * avctx->ticks_per_frame
220#endif
221 );
222FF_ENABLE_DEPRECATION_WARNINGS
223 }217 }
224 218
225 if ((ret = ff_amf_encode_init(avctx)) < 0)219 if ((ret = ff_amf_encode_init(avctx)) < 0)
libavcodec/amfenc_h264.c+1−7
@@ -210,13 +210,7 @@ static av_cold int amf_encode_init_h264(AVCodecContext *avctx) · 209 unmodified lines
210 if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {210 if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
211 framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den);211 framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den);
212 } else {212 } else {
213FF_DISABLE_DEPRECATION_WARNINGS213 framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num);
214 framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num
215#if FF_API_TICKS_PER_FRAME
216 * avctx->ticks_per_frame
217#endif
218 );
219FF_ENABLE_DEPRECATION_WARNINGS
220 }214 }
221 215
222 if ((ret = ff_amf_encode_init(avctx)) != 0)216 if ((ret = ff_amf_encode_init(avctx)) != 0)
libavcodec/amfenc_hevc.c+1−7
@@ -179,13 +179,7 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx) · 178 unmodified lines
179 if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {179 if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
180 framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den);180 framerate = AMFConstructRate(avctx->framerate.num, avctx->framerate.den);
181 } else {181 } else {
182FF_DISABLE_DEPRECATION_WARNINGS182 framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num);
183 framerate = AMFConstructRate(avctx->time_base.den, avctx->time_base.num
184#if FF_API_TICKS_PER_FRAME
185 * avctx->ticks_per_frame
186#endif
187 );
188FF_ENABLE_DEPRECATION_WARNINGS
189 }183 }
190 184
191 if ((ret = ff_amf_encode_init(avctx)) < 0)185 if ((ret = ff_amf_encode_init(avctx)) < 0)
libavcodec/avcodec.h+0−17
@@ -573,23 +573,6 @@ typedef struct AVCodecContext { · 572 unmodified lines
573 */573 */
574 AVRational framerate;574 AVRational framerate;
575 575
576#if FF_API_TICKS_PER_FRAME
577 /**
578 * For some codecs, the time base is closer to the field rate than the frame rate.
579 * Most notably, H.264 and MPEG-2 specify time_base as half of frame duration
580 * if no telecine is used ...
581 *
582 * Set to time_base ticks per frame. Default 1, e.g., H.264/MPEG-2 set it to 2.
583 *
584 * @deprecated
585 * - decoding: Use AVCodecDescriptor.props & AV_CODEC_PROP_FIELDS
586 * - encoding: Set AVCodecContext.framerate instead
587 *
588 */
589 attribute_deprecated
590 int ticks_per_frame;
591#endif
592
593 /**576 /**
594 * Codec delay.577 * Codec delay.
595 *578 *
libavcodec/encode.c+0−14
@@ -613,20 +613,6 @@ static int encode_preinit_video(AVCodecContext *avctx) · 612 unmodified lines
613 return AVERROR(EINVAL);613 return AVERROR(EINVAL);
614 }614 }
615 615
616#if FF_API_TICKS_PER_FRAME
617FF_DISABLE_DEPRECATION_WARNINGS
618 if (avctx->ticks_per_frame && avctx->time_base.num &&
619 avctx->ticks_per_frame > INT_MAX / avctx->time_base.num) {
620 av_log(avctx, AV_LOG_ERROR,
621 "ticks_per_frame %d too large for the timebase %d/%d.",
622 avctx->ticks_per_frame,
623 avctx->time_base.num,
624 avctx->time_base.den);
625 return AVERROR(EINVAL);
626 }
627FF_ENABLE_DEPRECATION_WARNINGS
628#endif
629
630 if (avctx->hw_frames_ctx) {616 if (avctx->hw_frames_ctx) {
631 AVHWFramesContext *frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;617 AVHWFramesContext *frames_ctx = (AVHWFramesContext*)avctx->hw_frames_ctx->data;
632 if (frames_ctx->format != avctx->pix_fmt) {618 if (frames_ctx->format != avctx->pix_fmt) {
libavcodec/flashsv2enc.c+2−3
@@ -786,7 +786,7 @@ static int optimum_block_height(FlashSV2Context * s) · 785 unmodified lines
786static int optimum_use15_7(FlashSV2Context * s)786static int optimum_use15_7(FlashSV2Context * s)
787{787{
788#ifndef FLASHSV2_DUMB788#ifndef FLASHSV2_DUMB
789 double ideal = ((double)(s->avctx->bit_rate * s->avctx->time_base.den * s->avctx->ticks_per_frame)) /789 double ideal = ((double)(s->avctx->bit_rate * s->avctx->time_base.den)) /
790 ((double) s->avctx->time_base.num) * s->avctx->frame_num;790 ((double) s->avctx->time_base.num) * s->avctx->frame_num;
791 if (ideal + use15_7_threshold < s->total_bits) {791 if (ideal + use15_7_threshold < s->total_bits) {
792 return 1;792 return 1;
@@ -802,8 +802,7 @@ static int optimum_dist(FlashSV2Context * s) · 9 unmodified lines
802{802{
803#ifndef FLASHSV2_DUMB803#ifndef FLASHSV2_DUMB
804 double ideal =804 double ideal =
805 s->avctx->bit_rate * s->avctx->time_base.den *805 s->avctx->bit_rate * s->avctx->time_base.den;
806 s->avctx->ticks_per_frame;
807 int dist = pow((s->total_bits / ideal) * color15_7_factor, 3);806 int dist = pow((s->total_bits / ideal) * color15_7_factor, 3);
808 av_log(s->avctx, AV_LOG_DEBUG, "dist: %d\n", dist);807 av_log(s->avctx, AV_LOG_DEBUG, "dist: %d\n", dist);
809 return dist;808 return dist;
libavcodec/h264dec.c+0−6
@@ -397,12 +397,6 @@ static av_cold int h264_decode_init(AVCodecContext *avctx) · 396 unmodified lines
397 return AVERROR_UNKNOWN;397 return AVERROR_UNKNOWN;
398 }398 }
399 399
400#if FF_API_TICKS_PER_FRAME
401FF_DISABLE_DEPRECATION_WARNINGS
402 avctx->ticks_per_frame = 2;
403FF_ENABLE_DEPRECATION_WARNINGS
404#endif
405
406 if (!avctx->internal->is_copy) {400 if (!avctx->internal->is_copy) {
407 if (avctx->extradata_size > 0 && avctx->extradata) {401 if (avctx->extradata_size > 0 && avctx->extradata) {
408 ret = ff_h264_decode_extradata(avctx->extradata, avctx->extradata_size,402 ret = ff_h264_decode_extradata(avctx->extradata, avctx->extradata_size,
libavcodec/libaomenc.c+1−7
@@ -1270,13 +1270,7 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, · 1269 unmodified lines
1270 else if (avctx->framerate.num > 0 && avctx->framerate.den > 0)1270 else if (avctx->framerate.num > 0 && avctx->framerate.den > 0)
1271 duration = av_rescale_q(1, av_inv_q(avctx->framerate), avctx->time_base);1271 duration = av_rescale_q(1, av_inv_q(avctx->framerate), avctx->time_base);
1272 else {1272 else {
1273FF_DISABLE_DEPRECATION_WARNINGS1273 duration = 1;
1274 duration =
1275#if FF_API_TICKS_PER_FRAME
1276 avctx->ticks_per_frame ? avctx->ticks_per_frame :
1277#endif
1278 1;
1279FF_ENABLE_DEPRECATION_WARNINGS
1280 }1274 }
1281 1275
1282 switch (frame->color_range) {1276 switch (frame->color_range) {
libavcodec/libkvazaar.c+1−7
@@ -86,13 +86,7 @@ static av_cold int libkvazaar_init(AVCodecContext *avctx) · 85 unmodified lines
86 cfg->framerate_denom = avctx->framerate.den;86 cfg->framerate_denom = avctx->framerate.den;
87 } else {87 } else {
88 cfg->framerate_num = avctx->time_base.den;88 cfg->framerate_num = avctx->time_base.den;
89FF_DISABLE_DEPRECATION_WARNINGS89 cfg->framerate_denom = avctx->time_base.num;
90 cfg->framerate_denom = avctx->time_base.num
91#if FF_API_TICKS_PER_FRAME
92 * avctx->ticks_per_frame
93#endif
94 ;
95FF_ENABLE_DEPRECATION_WARNINGS
96 }90 }
97 cfg->target_bitrate = avctx->bit_rate;91 cfg->target_bitrate = avctx->bit_rate;
98 cfg->vui.sar_width = avctx->sample_aspect_ratio.num;92 cfg->vui.sar_width = avctx->sample_aspect_ratio.num;
libavcodec/libopenh264enc.c+1−7
@@ -135,13 +135,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) · 134 unmodified lines
135 if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {135 if (avctx->framerate.num > 0 && avctx->framerate.den > 0) {
136 param.fMaxFrameRate = av_q2d(avctx->framerate);136 param.fMaxFrameRate = av_q2d(avctx->framerate);
137 } else {137 } else {
138FF_DISABLE_DEPRECATION_WARNINGS138 param.fMaxFrameRate = 1.0 / av_q2d(avctx->time_base);
139 param.fMaxFrameRate = 1.0 / av_q2d(avctx->time_base)
140#if FF_API_TICKS_PER_FRAME
141 / FFMAX(avctx->ticks_per_frame, 1)
142#endif
143 ;
144FF_ENABLE_DEPRECATION_WARNINGS
145 }139 }
146 param.iPicWidth = avctx->width;140 param.iPicWidth = avctx->width;
147 param.iPicHeight = avctx->height;141 param.iPicHeight = avctx->height;
libavcodec/librav1e.c+1−7
@@ -217,15 +217,9 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx) · 216 unmodified lines
217 avctx->framerate.den, avctx->framerate.num217 avctx->framerate.den, avctx->framerate.num
218 });218 });
219 } else {219 } else {
220FF_DISABLE_DEPRECATION_WARNINGS
221 rav1e_config_set_time_base(cfg, (RaRational) {220 rav1e_config_set_time_base(cfg, (RaRational) {
222 avctx->time_base.num221 avctx->time_base.num, avctx->time_base.den
223#if FF_API_TICKS_PER_FRAME
224 * avctx->ticks_per_frame
225#endif
226 , avctx->time_base.den
227 });222 });
228FF_ENABLE_DEPRECATION_WARNINGS
229 }223 }
230 224
231 if ((avctx->flags & AV_CODEC_FLAG_PASS1 || avctx->flags & AV_CODEC_FLAG_PASS2) && !avctx->bit_rate) {225 if ((avctx->flags & AV_CODEC_FLAG_PASS1 || avctx->flags & AV_CODEC_FLAG_PASS2) && !avctx->bit_rate) {
libavcodec/libsvtav1.c+1−7
@@ -311,13 +311,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, · 310 unmodified lines
311 param->frame_rate_denominator = avctx->framerate.den;311 param->frame_rate_denominator = avctx->framerate.den;
312 } else {312 } else {
313 param->frame_rate_numerator = avctx->time_base.den;313 param->frame_rate_numerator = avctx->time_base.den;
314FF_DISABLE_DEPRECATION_WARNINGS314 param->frame_rate_denominator = avctx->time_base.num;
315 param->frame_rate_denominator = avctx->time_base.num
316#if FF_API_TICKS_PER_FRAME
317 * avctx->ticks_per_frame
318#endif
319 ;
320FF_ENABLE_DEPRECATION_WARNINGS
321 }315 }
322 316
323 /* 2 = IDR, closed GOP, 1 = CRA, open GOP */317 /* 2 = IDR, closed GOP, 1 = CRA, open GOP */
libavcodec/libvpxenc.c+1−7
@@ -1831,13 +1831,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, · 1830 unmodified lines
1831 else if (avctx->framerate.num > 0 && avctx->framerate.den > 0)1831 else if (avctx->framerate.num > 0 && avctx->framerate.den > 0)
1832 duration = av_rescale_q(1, av_inv_q(avctx->framerate), avctx->time_base);1832 duration = av_rescale_q(1, av_inv_q(avctx->framerate), avctx->time_base);
1833 else {1833 else {
1834FF_DISABLE_DEPRECATION_WARNINGS1834 duration = 1;
1835 duration =
1836#if FF_API_TICKS_PER_FRAME
1837 avctx->ticks_per_frame ? avctx->ticks_per_frame :
1838#endif
1839 1;
1840FF_ENABLE_DEPRECATION_WARNINGS
1841 }1835 }
1842 1836
1843 res = vpx_codec_encode(&ctx->encoder, rawimg, timestamp,1837 res = vpx_codec_encode(&ctx->encoder, rawimg, timestamp,
libavcodec/libvvenc.c+1−14
@@ -128,20 +128,7 @@ static void vvenc_set_framerate(AVCodecContext *avctx, vvenc_config *params) · 127 unmodified lines
128 params->m_FrameScale = avctx->time_base.num;128 params->m_FrameScale = avctx->time_base.num;
129 }129 }
130 130
131FF_DISABLE_DEPRECATION_WARNINGS131 params->m_TicksPerSecond = -1; /* auto mode for ticks per frame = 1 */
132
133#if FF_API_TICKS_PER_FRAME
134 if (avctx->ticks_per_frame == 1) {
135#endif
136 params->m_TicksPerSecond = -1; /* auto mode for ticks per frame = 1 */
137#if FF_API_TICKS_PER_FRAME
138 } else {
139 params->m_TicksPerSecond =
140 ceil((avctx->time_base.den / (double) avctx->time_base.num) *
141 (double) avctx->ticks_per_frame);
142 }
143#endif
144FF_ENABLE_DEPRECATION_WARNINGS
145}132}
146 133
147static int vvenc_parse_vvenc_params(AVCodecContext *avctx, vvenc_config *params)134static int vvenc_parse_vvenc_params(AVCodecContext *avctx, vvenc_config *params)
libavcodec/libx264.c+1−7
@@ -1317,13 +1317,7 @@ static av_cold int X264_init(AVCodecContext *avctx) · 1316 unmodified lines
1317 x4->params.i_fps_den = avctx->framerate.den;1317 x4->params.i_fps_den = avctx->framerate.den;
1318 } else {1318 } else {
1319 x4->params.i_fps_num = avctx->time_base.den;1319 x4->params.i_fps_num = avctx->time_base.den;
1320FF_DISABLE_DEPRECATION_WARNINGS1320 x4->params.i_fps_den = avctx->time_base.num;
1321 x4->params.i_fps_den = avctx->time_base.num
1322#if FF_API_TICKS_PER_FRAME
1323 * avctx->ticks_per_frame
1324#endif
1325 ;
1326FF_ENABLE_DEPRECATION_WARNINGS
1327 }1321 }
1328 1322
1329 x4->params.analyse.b_psnr = avctx->flags & AV_CODEC_FLAG_PSNR;1323 x4->params.analyse.b_psnr = avctx->flags & AV_CODEC_FLAG_PSNR;
libavcodec/libx265.c+1−6
@@ -292,12 +292,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) · 291 unmodified lines
292 ctx->params->fpsDenom = avctx->framerate.den;292 ctx->params->fpsDenom = avctx->framerate.den;
293 } else {293 } else {
294 ctx->params->fpsNum = avctx->time_base.den;294 ctx->params->fpsNum = avctx->time_base.den;
295FF_DISABLE_DEPRECATION_WARNINGS295 ctx->params->fpsDenom = avctx->time_base.num;
296 ctx->params->fpsDenom = avctx->time_base.num
297#if FF_API_TICKS_PER_FRAME
298 * avctx->ticks_per_frame
299#endif
300 ;
301FF_ENABLE_DEPRECATION_WARNINGS296FF_ENABLE_DEPRECATION_WARNINGS
302 }297 }
303 ctx->params->sourceWidth = avctx->width;298 ctx->params->sourceWidth = avctx->width;
libavcodec/mfenc.c+0−5
@@ -660,11 +660,6 @@ static int mf_encv_output_adjust(AVCodecContext *avctx, IMFMediaType *type) · 659 unmodified lines
660 framerate = avctx->framerate;660 framerate = avctx->framerate;
661 } else {661 } else {
662 framerate = av_inv_q(avctx->time_base);662 framerate = av_inv_q(avctx->time_base);
663#if FF_API_TICKS_PER_FRAME
664FF_DISABLE_DEPRECATION_WARNINGS
665 framerate.den *= avctx->ticks_per_frame;
666FF_ENABLE_DEPRECATION_WARNINGS
667#endif
668 }663 }
669 664
670 ff_MFSetAttributeRatio((IMFAttributes *)type, &MF_MT_FRAME_RATE, framerate.num, framerate.den);665 ff_MFSetAttributeRatio((IMFAttributes *)type, &MF_MT_FRAME_RATE, framerate.num, framerate.den);
libavcodec/mpeg12dec.c+0−11
@@ -970,12 +970,6 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) · 969 unmodified lines
970 if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) {970 if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO) {
971 // MPEG-1 fps971 // MPEG-1 fps
972 avctx->framerate = ff_mpeg12_frame_rate_tab[s1->frame_rate_index];972 avctx->framerate = ff_mpeg12_frame_rate_tab[s1->frame_rate_index];
973#if FF_API_TICKS_PER_FRAME
974FF_DISABLE_DEPRECATION_WARNINGS
975 avctx->ticks_per_frame = 1;
976FF_ENABLE_DEPRECATION_WARNINGS
977#endif
978
979 avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;973 avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
980 } else { // MPEG-2974 } else { // MPEG-2
981 // MPEG-2 fps975 // MPEG-2 fps
@@ -984,11 +978,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 2 unmodified lines
984 ff_mpeg12_frame_rate_tab[s1->frame_rate_index].num * s1->frame_rate_ext.num,978 ff_mpeg12_frame_rate_tab[s1->frame_rate_index].num * s1->frame_rate_ext.num,
985 ff_mpeg12_frame_rate_tab[s1->frame_rate_index].den * s1->frame_rate_ext.den,979 ff_mpeg12_frame_rate_tab[s1->frame_rate_index].den * s1->frame_rate_ext.den,
986 1 << 30);980 1 << 30);
987#if FF_API_TICKS_PER_FRAME
988FF_DISABLE_DEPRECATION_WARNINGS
989 avctx->ticks_per_frame = 2;
990FF_ENABLE_DEPRECATION_WARNINGS
991#endif
992 981
993 switch (s->chroma_format) {982 switch (s->chroma_format) {
994 case CHROMA_420: avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; break;983 case CHROMA_420: avctx->chroma_sample_location = AVCHROMA_LOC_LEFT; break;
libavcodec/mpegvideo_parser.c+0−10
@@ -147,11 +147,6 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, · 146 unmodified lines
147 pc->frame_rate = avctx->framerate = ff_mpeg12_frame_rate_tab[frame_rate_index];147 pc->frame_rate = avctx->framerate = ff_mpeg12_frame_rate_tab[frame_rate_index];
148 bit_rate = (buf[4]<<10) | (buf[5]<<2) | (buf[6]>>6);148 bit_rate = (buf[4]<<10) | (buf[5]<<2) | (buf[6]>>6);
149 avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;149 avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO;
150#if FF_API_TICKS_PER_FRAME
151FF_DISABLE_DEPRECATION_WARNINGS
152 avctx->ticks_per_frame = 1;
153FF_ENABLE_DEPRECATION_WARNINGS
154#endif
155 }150 }
156 break;151 break;
157 case EXT_START_CODE:152 case EXT_START_CODE:
@@ -181,11 +176,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 23 unmodified lines
181 avctx->framerate.num = pc->frame_rate.num * (frame_rate_ext_n + 1);176 avctx->framerate.num = pc->frame_rate.num * (frame_rate_ext_n + 1);
182 avctx->framerate.den = pc->frame_rate.den * (frame_rate_ext_d + 1);177 avctx->framerate.den = pc->frame_rate.den * (frame_rate_ext_d + 1);
183 avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;178 avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
184#if FF_API_TICKS_PER_FRAME
185FF_DISABLE_DEPRECATION_WARNINGS
186 avctx->ticks_per_frame = 2;
187FF_ENABLE_DEPRECATION_WARNINGS
188#endif
189 }179 }
190 break;180 break;
191 case 0x8: /* picture coding extension */181 case 0x8: /* picture coding extension */
libavcodec/msmpeg4enc.c+1−7
@@ -289,13 +289,7 @@ void ff_msmpeg4_encode_ext_header(MPVEncContext *const s) · 288 unmodified lines
289 if (s->c.avctx->framerate.num > 0 && s->c.avctx->framerate.den > 0)289 if (s->c.avctx->framerate.num > 0 && s->c.avctx->framerate.den > 0)
290 fps = s->c.avctx->framerate.num / s->c.avctx->framerate.den;290 fps = s->c.avctx->framerate.num / s->c.avctx->framerate.den;
291 else {291 else {
292FF_DISABLE_DEPRECATION_WARNINGS292 fps = s->c.avctx->time_base.den / s->c.avctx->time_base.num;
293 fps = s->c.avctx->time_base.den / s->c.avctx->time_base.num
294#if FF_API_TICKS_PER_FRAME
295 / FFMAX(s->c.avctx->ticks_per_frame, 1)
296#endif
297 ;
298FF_ENABLE_DEPRECATION_WARNINGS
299 }293 }
300 294
301 put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29295 put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29
libavcodec/nvenc.c+1−7
@@ -1800,13 +1800,7 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) · 1799 unmodified lines
1800 ctx->init_encode_params.frameRateDen = avctx->framerate.den;1800 ctx->init_encode_params.frameRateDen = avctx->framerate.den;
1801 } else {1801 } else {
1802 ctx->init_encode_params.frameRateNum = avctx->time_base.den;1802 ctx->init_encode_params.frameRateNum = avctx->time_base.den;
1803FF_DISABLE_DEPRECATION_WARNINGS1803 ctx->init_encode_params.frameRateDen = avctx->time_base.num;
1804 ctx->init_encode_params.frameRateDen = avctx->time_base.num
1805#if FF_API_TICKS_PER_FRAME
1806 * avctx->ticks_per_frame
1807#endif
1808 ;
1809FF_ENABLE_DEPRECATION_WARNINGS
1810 }1804 }
1811 1805
1812#ifdef NVENC_HAVE_UNIDIR_B1806#ifdef NVENC_HAVE_UNIDIR_B
libavcodec/options_table.h+0−3
@@ -272,9 +272,6 @@ static const AVOption avcodec_options[] = { · 271 unmodified lines
272{"ch_layout", NULL, OFFSET(ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL }, 0, 0, A|E|D, .unit = "ch_layout"},272{"ch_layout", NULL, OFFSET(ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL }, 0, 0, A|E|D, .unit = "ch_layout"},
273{"rc_max_vbv_use", NULL, OFFSET(rc_max_available_vbv_use), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0.0, FLT_MAX, V|E},273{"rc_max_vbv_use", NULL, OFFSET(rc_max_available_vbv_use), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, 0.0, FLT_MAX, V|E},
274{"rc_min_vbv_use", NULL, OFFSET(rc_min_vbv_overflow_use), AV_OPT_TYPE_FLOAT, {.dbl = 3 }, 0.0, FLT_MAX, V|E},274{"rc_min_vbv_use", NULL, OFFSET(rc_min_vbv_overflow_use), AV_OPT_TYPE_FLOAT, {.dbl = 3 }, 0.0, FLT_MAX, V|E},
275#if FF_API_TICKS_PER_FRAME
276{"ticks_per_frame", NULL, OFFSET(ticks_per_frame), AV_OPT_TYPE_INT, {.i64 = 1 }, 1, INT_MAX, A|V|E|D},
277#endif
278{"color_primaries", "color primaries", OFFSET(color_primaries), AV_OPT_TYPE_INT, {.i64 = AVCOL_PRI_UNSPECIFIED }, 1, INT_MAX, V|E|D, .unit = "color_primaries_type"},275{"color_primaries", "color primaries", OFFSET(color_primaries), AV_OPT_TYPE_INT, {.i64 = AVCOL_PRI_UNSPECIFIED }, 1, INT_MAX, V|E|D, .unit = "color_primaries_type"},
279{"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT709 }, INT_MIN, INT_MAX, V|E|D, .unit = "color_primaries_type"},276{"bt709", "BT.709", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_BT709 }, INT_MIN, INT_MAX, V|E|D, .unit = "color_primaries_type"},
280{"unknown", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, .unit = "color_primaries_type"},277{"unknown", "Unspecified", 0, AV_OPT_TYPE_CONST, {.i64 = AVCOL_PRI_UNSPECIFIED }, INT_MIN, INT_MAX, V|E|D, .unit = "color_primaries_type"},
libavcodec/pthread_frame.c+0−5
@@ -378,11 +378,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 377 unmodified lines
378 dst->level = src->level;378 dst->level = src->level;
379 379
380 dst->bits_per_raw_sample = src->bits_per_raw_sample;380 dst->bits_per_raw_sample = src->bits_per_raw_sample;
381#if FF_API_TICKS_PER_FRAME
382FF_DISABLE_DEPRECATION_WARNINGS
383 dst->ticks_per_frame = src->ticks_per_frame;
384FF_ENABLE_DEPRECATION_WARNINGS
385#endif
386 dst->color_primaries = src->color_primaries;381 dst->color_primaries = src->color_primaries;
387 382
388 dst->color_trc = src->color_trc;383 dst->color_trc = src->color_trc;
libavcodec/ratecontrol.c+0−6
@@ -62,13 +62,7 @@ static AVRational get_fpsQ(AVCodecContext *avctx) · 61 unmodified lines
62 if (avctx->framerate.num > 0 && avctx->framerate.den > 0)62 if (avctx->framerate.num > 0 && avctx->framerate.den > 0)
63 return avctx->framerate;63 return avctx->framerate;
64 64
65FF_DISABLE_DEPRECATION_WARNINGS
66#if FF_API_TICKS_PER_FRAME
67 return av_div_q((AVRational){1, FFMAX(avctx->ticks_per_frame, 1)}, avctx->time_base);
68#else
69 return av_inv_q(avctx->time_base);65 return av_inv_q(avctx->time_base);
70#endif
71FF_ENABLE_DEPRECATION_WARNINGS
72}66}
73 67
74static double get_fps(AVCodecContext *avctx)68static double get_fps(AVCodecContext *avctx)
libavcodec/vc1.c+0−8
@@ -418,14 +418,6 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) · 417 unmodified lines
418 v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace,418 v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace,
419 v->tfcntrflag, v->finterpflag);419 v->tfcntrflag, v->finterpflag);
420 420
421#if FF_API_TICKS_PER_FRAME
422FF_DISABLE_DEPRECATION_WARNINGS
423 if (v->broadcast) { // Pulldown may be present
424 v->s.avctx->ticks_per_frame = 2;
425 }
426FF_ENABLE_DEPRECATION_WARNINGS
427#endif
428
429 v->psf = get_bits1(gb);421 v->psf = get_bits1(gb);
430 if (v->psf) { //PsF, 6.1.13422 if (v->psf) { //PsF, 6.1.13
431 av_log(v->s.avctx, AV_LOG_ERROR, "Progressive Segmented Frame mode: not supported (yet)\n");423 av_log(v->s.avctx, AV_LOG_ERROR, "Progressive Segmented Frame mode: not supported (yet)\n");
libavcodec/version_major.h+0−1
@@ -38,7 +38,6 @@ · 37 unmodified lines
38 */38 */
39 39
40#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 62)40#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 62)
41#define FF_API_TICKS_PER_FRAME (LIBAVCODEC_VERSION_MAJOR < 62)
42#define FF_API_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 62)41#define FF_API_DROPCHANGED (LIBAVCODEC_VERSION_MAJOR < 62)
43 42
44#define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62)43#define FF_API_AVFFT (LIBAVCODEC_VERSION_MAJOR < 62)
libavformat/avformat.c+0−11
@@ -797,11 +797,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, · 796 unmodified lines
797 : (ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ? (AVRational){0, 1}797 : (ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ? (AVRational){0, 1}
798 : ist->time_base);798 : ist->time_base);
799 AVRational enc_tb = ist->time_base;799 AVRational enc_tb = ist->time_base;
800#if FF_API_TICKS_PER_FRAME
801FF_DISABLE_DEPRECATION_WARNINGS
802 int ticks_per_frame = dec_ctx ? dec_ctx->ticks_per_frame : 1;
803FF_ENABLE_DEPRECATION_WARNINGS
804#endif
805 800
806 /*801 /*
807 * Avi is a special case here because it supports variable fps but802 * Avi is a special case here because it supports variable fps but
@@ -827,9 +822,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 19 unmodified lines
827 (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) {822 (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) {
828 enc_tb = dec_ctx_tb;823 enc_tb = dec_ctx_tb;
829 enc_tb.den *= 2;824 enc_tb.den *= 2;
830#if FF_API_TICKS_PER_FRAME
831 enc_tb.num *= ticks_per_frame;
832#endif
833 }825 }
834 } else if (!(ofmt->flags & AVFMT_VARIABLE_FPS)826 } else if (!(ofmt->flags & AVFMT_VARIABLE_FPS)
835 && !av_match_name(ofmt->name, "mov,mp4,3gp,3g2,psp,ipod,ismv,f4v")) {827 && !av_match_name(ofmt->name, "mov,mp4,3gp,3g2,psp,ipod,ismv,f4v")) {
@@ -839,9 +831,6 @@ FF_ENABLE_DEPRECATION_WARNINGS · 3 unmodified lines
839 || (copy_tb == AVFMT_TBCF_DECODER &&831 || (copy_tb == AVFMT_TBCF_DECODER &&
840 (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) {832 (dec_ctx_framerate.num || ist->codecpar->codec_type == AVMEDIA_TYPE_AUDIO))) {
841 enc_tb = dec_ctx_tb;833 enc_tb = dec_ctx_tb;
842#if FF_API_TICKS_PER_FRAME
843 enc_tb.num *= ticks_per_frame;
844#endif
845 }834 }
846 }835 }
847 836
libavformat/demux.c+0−6
@@ -1317,12 +1317,6 @@ static int codec_close(FFStream *sti) · 1316 unmodified lines
1317 1317
1318 avctx_new->pkt_timebase = sti->avctx->pkt_timebase;1318 avctx_new->pkt_timebase = sti->avctx->pkt_timebase;
1319 1319
1320#if FF_API_TICKS_PER_FRAME
1321FF_DISABLE_DEPRECATION_WARNINGS
1322 avctx_new->ticks_per_frame = sti->avctx->ticks_per_frame;
1323FF_ENABLE_DEPRECATION_WARNINGS
1324#endif
1325
1326 avcodec_free_context(&sti->avctx);1320 avcodec_free_context(&sti->avctx);
1327 sti->avctx = avctx_new;1321 sti->avctx = avctx_new;
1328 1322

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