[FFmpeg-devel] avformat: add SER demuxer

Submitted by Paul B Mahol on Oct. 12, 2018, 10:41 a.m.

Details

Message ID 20181012104102.21941-1-onemda@gmail.com
State New
Headers show

Commit Message

Paul B Mahol Oct. 12, 2018, 10:41 a.m.
Fixes #6821.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
 libavformat/Makefile     |   1 +
 libavformat/allformats.c |   1 +
 libavformat/serdec.c     | 138 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 libavformat/serdec.c

Comments

Paul B Mahol Oct. 13, 2018, 12:35 p.m.
On 10/12/18, Paul B Mahol <onemda@gmail.com> wrote:
> Fixes #6821.
>

Will comitt with this above sentence removed.
Carl Eugen Hoyos Oct. 13, 2018, 5:08 p.m.
2018-10-13 14:35 GMT+02:00, Paul B Mahol <onemda@gmail.com>:
> On 10/12/18, Paul B Mahol <onemda@gmail.com> wrote:
>> Fixes #6821.
>>
>
> Will comitt with this above sentence removed.

Why did you remove it?

Carl Eugen
Paul B Mahol Oct. 13, 2018, 5:16 p.m.
On 10/13/18, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> 2018-10-13 14:35 GMT+02:00, Paul B Mahol <onemda@gmail.com>:
>> On 10/12/18, Paul B Mahol <onemda@gmail.com> wrote:
>>> Fixes #6821.
>>>
>>
>> Will comitt with this above sentence removed.
>
> Why did you remove it?

Because I have not got any reply regarding mplayer.
Carl Eugen Hoyos Oct. 13, 2018, 5:24 p.m.
2018-10-13 19:16 GMT+02:00, Paul B Mahol <onemda@gmail.com>:
> On 10/13/18, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
>> 2018-10-13 14:35 GMT+02:00, Paul B Mahol <onemda@gmail.com>:
>>> On 10/12/18, Paul B Mahol <onemda@gmail.com> wrote:
>>>> Fixes #6821.
>>>>
>>>
>>> Will comitt with this above sentence removed.
>>
>> Why did you remove it?
>
> Because I have not got any reply regarding mplayer.

Would you like to elaborate?

Carl Eugen
Paul B Mahol Oct. 13, 2018, 5:27 p.m.
On 10/13/18, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
> 2018-10-13 19:16 GMT+02:00, Paul B Mahol <onemda@gmail.com>:
>> On 10/13/18, Carl Eugen Hoyos <ceffmpeg@gmail.com> wrote:
>>> 2018-10-13 14:35 GMT+02:00, Paul B Mahol <onemda@gmail.com>:
>>>> On 10/12/18, Paul B Mahol <onemda@gmail.com> wrote:
>>>>> Fixes #6821.
>>>>>
>>>>
>>>> Will comitt with this above sentence removed.
>>>
>>> Why did you remove it?
>>
>> Because I have not got any reply regarding mplayer.
>
> Would you like to elaborate?

I asked you some questions in different mails and never
got any reply.

Patch hide | download patch | download mbox

diff --git a/libavformat/Makefile b/libavformat/Makefile
index e0222535c1..e99e9150d5 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -467,6 +467,7 @@  OBJS-$(CONFIG_SDX_DEMUXER)               += sdxdec.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
 OBJS-$(CONFIG_SEGAFILM_MUXER)            += segafilmenc.o
 OBJS-$(CONFIG_SEGMENT_MUXER)             += segment.o
+OBJS-$(CONFIG_SER_DEMUXER)               += serdec.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += shortendec.o rawdec.o
 OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o
 OBJS-$(CONFIG_SINGLEJPEG_MUXER)          += rawenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 5c32ee6dff..9e41718685 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -367,6 +367,7 @@  extern AVInputFormat  ff_segafilm_demuxer;
 extern AVOutputFormat ff_segafilm_muxer;
 extern AVOutputFormat ff_segment_muxer;
 extern AVOutputFormat ff_stream_segment_muxer;
+extern AVInputFormat  ff_ser_demuxer;
 extern AVInputFormat  ff_shorten_demuxer;
 extern AVInputFormat  ff_siff_demuxer;
 extern AVOutputFormat ff_singlejpeg_muxer;
diff --git a/libavformat/serdec.c b/libavformat/serdec.c
new file mode 100644
index 0000000000..b14bb42d28
--- /dev/null
+++ b/libavformat/serdec.c
@@ -0,0 +1,138 @@ 
+/*
+ * SER video demuxer
+ * Copyright (c) 2018 Paul B Mahol
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/imgutils.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/opt.h"
+#include "internal.h"
+#include "avformat.h"
+
+#define SER_MAGIC "LUCAM-RECORDER"
+
+typedef struct SERDemuxerContext {
+    const AVClass *class;
+    int width, height;
+    AVRational framerate;
+} SERDemuxerContext;
+
+static int ser_probe(AVProbeData *pd)
+{
+    if (memcmp(pd->buf, SER_MAGIC, 14) == 0)
+        return AVPROBE_SCORE_MAX;
+    else
+        return 0;
+}
+
+static int ser_read_header(AVFormatContext *s)
+{
+    SERDemuxerContext *ser = s->priv_data;
+    enum AVPixelFormat pix_fmt;
+    int depth, color_id, endian;
+    int packet_size;
+    AVStream *st;
+
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+    avio_skip(s->pb, 14);
+    avio_skip(s->pb, 4);
+    color_id = avio_rl32(s->pb);
+    endian = avio_rl32(s->pb);
+    ser->width = avio_rl32(s->pb);
+    ser->height = avio_rl32(s->pb);
+    depth = avio_rl32(s->pb);
+    st->nb_frames = st->duration = avio_rl32(s->pb);
+    avio_skip(s->pb, 120);
+    avio_skip(s->pb, 8);
+    avio_skip(s->pb, 8);
+
+    switch (color_id) {
+    case   0: pix_fmt = depth <= 8 ? AV_PIX_FMT_GRAY8       : endian ? AV_PIX_FMT_GRAY16LE       : AV_PIX_FMT_GRAY16BE;       break;
+    case   8: pix_fmt = depth <= 8 ? AV_PIX_FMT_BAYER_RGGB8 : endian ? AV_PIX_FMT_BAYER_RGGB16LE : AV_PIX_FMT_BAYER_RGGB16BE; break;
+    case   9: pix_fmt = depth <= 8 ? AV_PIX_FMT_BAYER_GRBG8 : endian ? AV_PIX_FMT_BAYER_GRBG16LE : AV_PIX_FMT_BAYER_GRBG16BE; break;
+    case  10: pix_fmt = depth <= 8 ? AV_PIX_FMT_BAYER_GBRG8 : endian ? AV_PIX_FMT_BAYER_GBRG16LE : AV_PIX_FMT_BAYER_GBRG16BE; break;
+    case  11: pix_fmt = depth <= 8 ? AV_PIX_FMT_BAYER_BGGR8 : endian ? AV_PIX_FMT_BAYER_BGGR16LE : AV_PIX_FMT_BAYER_BGGR16BE; break;
+    case 100: pix_fmt = depth <= 8 ? AV_PIX_FMT_RGB24       : endian ? AV_PIX_FMT_RGB48LE        : AV_PIX_FMT_RGB48BE;        break;
+    case 101: pix_fmt = depth <= 8 ? AV_PIX_FMT_BGR24       : endian ? AV_PIX_FMT_BGR48LE        : AV_PIX_FMT_BGR48BE;        break;
+    default:
+        return AVERROR_PATCHWELCOME;
+    }
+
+    st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+    st->codecpar->codec_id = s->iformat->raw_codec_id;
+
+    avpriv_set_pts_info(st, 64, ser->framerate.den, ser->framerate.num);
+
+    st->codecpar->width  = ser->width;
+    st->codecpar->height = ser->height;
+    st->codecpar->format = pix_fmt;
+    packet_size = av_image_get_buffer_size(st->codecpar->format, ser->width, ser->height, 1);
+    if (packet_size < 0)
+        return packet_size;
+    s->packet_size = packet_size;
+    st->codecpar->bit_rate = av_rescale_q(s->packet_size,
+                                       (AVRational){8,1}, st->time_base);
+
+    return 0;
+}
+
+
+static int ser_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    int ret;
+
+    ret = av_get_packet(s->pb, pkt, s->packet_size);
+    pkt->pts = pkt->dts = (pkt->pos - s->internal->data_offset) / s->packet_size;
+
+    pkt->stream_index = 0;
+    if (ret < 0)
+        return ret;
+    return 0;
+}
+
+#define OFFSET(x) offsetof(SERDemuxerContext, x)
+#define DEC AV_OPT_FLAG_DECODING_PARAM
+static const AVOption ser_options[] = {
+    { "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC },
+    { NULL },
+};
+
+static const AVClass ser_demuxer_class = {
+    .class_name = "ser demuxer",
+    .item_name  = av_default_item_name,
+    .option     = ser_options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+AVInputFormat ff_ser_demuxer = {
+    .name           = "ser",
+    .long_name      = NULL_IF_CONFIG_SMALL("SER (Simple uncompressed video format for astronomical capturing)"),
+    .priv_data_size = sizeof(SERDemuxerContext),
+    .read_probe     = ser_probe,
+    .read_header    = ser_read_header,
+    .read_packet    = ser_read_packet,
+    .flags          = AVFMT_GENERIC_INDEX,
+    .extensions     = "ser",
+    .raw_codec_id   = AV_CODEC_ID_RAWVIDEO,
+    .priv_class     = &ser_demuxer_class,
+};