[FFmpeg-devel] *** GMX Spamverdacht *** [PATCH] RoQ encoder: support different integer framerates

[u-owvm at aetey.se]

Oh my bad, missed to remove the line

> +//    .supported_framerates = (const AVRational[]){ {30,1}, {0,0} },

Reposting.

Regards,
Rl
-------------- next part --------------
>From ea11cdc42a466eb5c228d976d7475223c7d691bb Mon Sep 17 00:00:00 2001
From: Rl <addr-see-the-website at aetey.se>
Date: Sun, 2 Feb 2014 16:57:36 +0100
Subject: [PATCH] RoQ encoder: support different integer framerates

Even though the most common framerate for RoQ is 30fps,
the format supports other framerates too.
---
 libavcodec/roqvideoenc.c |    4 ++--
 libavformat/idroqenc.c   |   30 ++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index 07a4767..34ef765 100644
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -963,7 +963,7 @@ static av_cold int roq_encode_init(AVCodecContext *avctx)
     enc->framesSinceKeyframe = 0;
     if ((avctx->width & 0xf) || (avctx->height & 0xf)) {
         av_log(avctx, AV_LOG_ERROR, "Dimensions must be divisible by 16\n");
-        return -1;
+        return AVERROR(EINVAL);
     }
 
     if (((avctx->width)&(avctx->width-1))||((avctx->height)&(avctx->height-1)))
@@ -1097,7 +1097,6 @@ AVCodec ff_roq_encoder = {
     .init                 = roq_encode_init,
     .encode2              = roq_encode_frame,
     .close                = roq_encode_end,
-    .supported_framerates = (const AVRational[]){ {30,1}, {0,0} },
     .pix_fmts             = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P,
                                                         AV_PIX_FMT_NONE },
     .priv_class     = &roq_class,
diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c
index 50c4280..afac781 100644
--- a/libavformat/idroqenc.c
+++ b/libavformat/idroqenc.c
@@ -25,9 +25,35 @@
 
 static int roq_write_header(struct AVFormatContext *s)
 {
-    static const uint8_t header[] = {
-        0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00
+    static uint8_t header[] = {
+        0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, /* fps: */ 0x1E, 0x00
     };
+    int n;
+    AVCodecContext *avctx;
+
+// set the actual fps
+    for(n=0;n<s->nb_streams;n++) {
+        if ((avctx=s->streams[n]->codec)->codec_type == AVMEDIA_TYPE_VIDEO) {
+            unsigned int fps;
+
+            if (avctx->time_base.num != 1) {
+                av_log(avctx, AV_LOG_ERROR, "Frame rate must be integer\n");
+                return AVERROR(EINVAL);
+            }
+
+            if ((fps=avctx->time_base.den) > 255) {
+                av_log(avctx, AV_LOG_ERROR, "Frame rate may not exceed 255fps\n");
+                return AVERROR(EINVAL);
+            }
+
+            if (fps != 30) {
+                av_log(avctx, AV_LOG_WARNING, "For vintage compatibility fps must be 30\n");
+            }
+
+            header[6] = fps;
+            break;
+        }
+    }
 
     avio_write(s->pb, header, 8);
     avio_flush(s->pb);
-- 
1.6.1