Fix compilation without HAVE_AVX, HAVE_YASM etc.

[ffmpeg] / libavcodec / timecode.c

diff --git a/libavcodec/timecode.c b/libavcodec/timecode.c
index 8cd1bec94170851406fbee8c24afa70a6061f2c0..2e0f4a489b88b7edeb5cebddf70b4eda5f0563c0 100644 (file)
--- a/libavcodec/timecode.c
+++ b/libavcodec/timecode.c
@@ -28,7 +28,7 @@
 #include "timecode.h"
 #include "libavutil/log.h"
 
-int ff_framenum_to_drop_timecode(int frame_num)
+int avpriv_framenum_to_drop_timecode(int frame_num)
 {
     /* only works for NTSC 29.97 */
     int d = frame_num / 17982;
@@ -37,7 +37,7 @@ int ff_framenum_to_drop_timecode(int frame_num)
     return frame_num + 18 * d + 2 * ((m - 2) / 1798);
 }
 
-uint32_t ff_framenum_to_smtpe_timecode(unsigned frame, int fps, int drop)
+uint32_t avpriv_framenum_to_smpte_timecode(unsigned frame, int fps, int drop)
 {
     return (0                                    << 31) | // color frame flag
            (drop                                 << 30) | // drop  frame flag
@@ -55,7 +55,7 @@ uint32_t ff_framenum_to_smtpe_timecode(unsigned frame, int fps, int drop)
            (  (frame / (fps * 3600) % 24)) % 10;          // units of hours
 }
 
-static int check_timecode_rate(void *avcl, AVRational rate, int drop)
+int avpriv_check_timecode_rate(void *avcl, AVRational rate, int drop)
 {
     int fps;
 
@@ -64,7 +64,7 @@ static int check_timecode_rate(void *avcl, AVRational rate, int drop)
         return -1;
     }
     fps = (rate.num + rate.den/2) / rate.den;
-    if (drop && (rate.den != 1001 || fps != 30)) {
+    if (drop && fps != 30) {
         av_log(avcl, AV_LOG_ERROR, "Drop frame is only allowed with 30000/1001 FPS\n");
         return -2;
     }
@@ -79,7 +79,29 @@ static int check_timecode_rate(void *avcl, AVRational rate, int drop)
     }
 }
 
-int ff_init_smtpe_timecode(void *avcl, struct ff_timecode *tc)
+char *avpriv_timecode_to_string(char *buf, const struct ff_timecode *tc, unsigned frame)
+{
+    int frame_num = tc->start + frame;
+    int fps = (tc->rate.num + tc->rate.den/2) / tc->rate.den;
+    int hh, mm, ss, ff, neg = 0;
+
+    if (tc->drop)
+        frame_num = avpriv_framenum_to_drop_timecode(frame_num);
+    if (frame_num < 0) {
+        frame_num = -frame_num;
+        neg = 1;
+    }
+    ff = frame_num % fps;
+    ss = frame_num / fps        % 60;
+    mm = frame_num / (fps*60)   % 60;
+    hh = frame_num / (fps*3600);
+    snprintf(buf, 16, "%s%02d:%02d:%02d%c%02d",
+             neg ? "-" : "",
+             hh, mm, ss, tc->drop ? ';' : ':', ff);
+    return buf;
+}
+
+int avpriv_init_smpte_timecode(void *avcl, struct ff_timecode *tc)
 {
     int hh, mm, ss, ff, fps, ret;
     char c;
@@ -92,7 +114,7 @@ int ff_init_smtpe_timecode(void *avcl, struct ff_timecode *tc)
 
     tc->drop  = c != ':'; // drop if ';', '.', ...
 
-    ret = check_timecode_rate(avcl, tc->rate, tc->drop);
+    ret = avpriv_check_timecode_rate(avcl, tc->rate, tc->drop);
     if (ret < 0)
         return ret;
 
@@ -105,3 +127,20 @@ int ff_init_smtpe_timecode(void *avcl, struct ff_timecode *tc)
     }
     return 0;
 }
+
+#if FF_API_OLD_TIMECODE
+int ff_framenum_to_drop_timecode(int frame_num)
+{
+    return avpriv_framenum_to_drop_timecode(frame_num);
+}
+
+uint32_t ff_framenum_to_smtpe_timecode(unsigned frame, int fps, int drop)
+{
+    return avpriv_framenum_to_smpte_timecode(frame, fps, drop);
+}
+
+int ff_init_smtpe_timecode(void *avcl, struct ff_timecode *tc)
+{
+    return avpriv_init_smpte_timecode(avcl, tc);
+}
+#endif