---
libavcodec/utils.c | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index dd846b4ae9..1e1ad9a833 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -33,6 +33,7 @@
#include "libavutil/pixdesc.h"
#include "libavutil/imgutils.h"
#include "libavutil/pixfmt.h"
+#include "libavutil/timecode.h"
#include "avcodec.h"
#include "codec.h"
#include "codec_desc.h"
@@ -1006,23 +1007,8 @@ int ff_alloc_timecode_sei(const AVFrame *frame,
AVRational rate, size_t prefix_l
put_bits(&pb, 2, m); // num_clock_ts
for (int j = 1; j <= m; j++) {
- uint32_t tcsmpte = tc[j];
- unsigned hh = bcd2uint(tcsmpte & 0x3f); // 6-bit hours
- unsigned mm = bcd2uint(tcsmpte>>8 & 0x7f); // 7-bit minutes
- unsigned ss = bcd2uint(tcsmpte>>16 & 0x7f); // 7-bit seconds
- unsigned ff = bcd2uint(tcsmpte>>24 & 0x3f); // 6-bit frames
- unsigned drop = tcsmpte & 1<<30 && !0; // 1-bit drop if not arbitrary
bit
-
- /* Calculate frame number of HEVC by SMPTE ST 12-1:2014 Sec 12.2 if
rate > 30FPS */
- if (av_cmp_q(rate, (AVRational) {30, 1}) == 1) {
- unsigned pc;
- ff *= 2;
- if (av_cmp_q(rate, (AVRational) {50, 1}) == 0)
- pc = !!(tcsmpte & 1 << 7);
- else
- pc = !!(tcsmpte & 1 << 23);
- ff = (ff + pc) & 0x7f;
- }
+ int hh, mm, ss, ff, drop;
+ av_timecode_set_smpte(&drop, &hh, &mm, &ss, &ff, rate, tc[j], 0, 0);
put_bits(&pb, 1, 1); // clock_timestamp_flag
put_bits(&pb, 1, 1); // units_field_based_flag
--
2.45.3
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
