[FFmpeg-devel] lavf/h264: Add support for raw h264 stream from Arecont camera, fixes ticket #5154

Submitted by Shivam Goyal on May 4, 2019, 8:10 a.m.

Details

Message ID 03f3b74d9c1a61b3280972860d3851ba@iitk.ac.in
State New
Headers show

Commit Message

Shivam Goyal May 4, 2019, 8:10 a.m.
The patch is for ticket #5154. https://trac.ffmpeg.org/ticket/5154 

Suggest any changes required. 

Shivam Goyal

Patch hide | download patch | download mbox

From 8416b130d461da117ca2d0b64e805c8e9cbe675c Mon Sep 17 00:00:00 2001
From: Shivam Goyal <shivamgoyal1506@outlook.com>
Date: Sat, 4 May 2019 12:46:39 +0530
Subject: [PATCH] lavf/h264: Add support for raw h264 stream from Arecont
 camera, fixes ticket #5154

---
 Changelog                |  1 +
 libavformat/Makefile     |  1 +
 libavformat/allformats.c |  1 +
 libavformat/h264dec.c    | 17 ++++++++
 libavformat/rawdec.c     | 88 ++++++++++++++++++++++++++++++++++++++++
 libavformat/rawdec.h     |  2 +
 6 files changed, 110 insertions(+)

diff --git a/Changelog b/Changelog
index a3fa0c14a2..0733e360fc 100644
--- a/Changelog
+++ b/Changelog
@@ -26,6 +26,7 @@  version <next>:
 - lscr decoder
 - lagfun filter
 - asoftclip filter
+- Support for raw h264 video from Arecont camera
 
 
 version 4.1:
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 99be60d184..be0f286870 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -99,6 +99,7 @@  OBJS-$(CONFIG_APTX_MUXER)                += rawenc.o
 OBJS-$(CONFIG_APTX_HD_DEMUXER)           += aptxdec.o rawdec.o
 OBJS-$(CONFIG_APTX_HD_MUXER)             += rawenc.o
 OBJS-$(CONFIG_AQTITLE_DEMUXER)           += aqtitledec.o subtitles.o
+OBJS-$(CONFIG_ARECONT_H264_DEMUXER)      += h264dec.o rawdec.o
 OBJS-$(CONFIG_ASF_DEMUXER)               += asfdec_f.o asf.o asfcrypt.o \
                                             avlanguage.o
 OBJS-$(CONFIG_ASF_O_DEMUXER)             += asfdec_o.o asf.o asfcrypt.o \
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index d316a0529a..fff8083172 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -60,6 +60,7 @@  extern AVOutputFormat ff_aptx_muxer;
 extern AVInputFormat  ff_aptx_hd_demuxer;
 extern AVOutputFormat ff_aptx_hd_muxer;
 extern AVInputFormat  ff_aqtitle_demuxer;
+extern AVInputFormat  ff_arecont_h264_demuxer;
 extern AVInputFormat  ff_asf_demuxer;
 extern AVOutputFormat ff_asf_muxer;
 extern AVInputFormat  ff_asf_o_demuxer;
diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c
index 199e87fbfa..53a3ed732b 100644
--- a/libavformat/h264dec.c
+++ b/libavformat/h264dec.c
@@ -117,4 +117,21 @@  static int h264_probe(const AVProbeData *p)
     return 0;
 }
 
+static int arecont_h264_probe(const AVProbeData *p) {
+    int i, j, k, o = 0;
+    int ret = h264_probe(p);
+    const uint8_t id[] = {0x2D, 0x2D, 0x66, 0x62, 0x64, 0x72, 0x0D, 0x0A};
+
+    if (ret == 0)
+        return 0;
+    for (i = 0; i + 7 < p->buf_size; i++){
+        if (p->buf[i] == id[0] && !memcmp(id, p->buf + i, 8))
+            o++;
+    }
+    if (o >= 1) return ret + 1;
+    else return 0;
+}
+
 FF_DEF_RAWVIDEO_DEMUXER(h264, "raw H.264 video", h264_probe, "h26l,h264,264,avc", AV_CODEC_ID_H264)
+
+FF_DEF_RAWVIDEO_DEMUXER(arecont_h264, "raw H.264 video from Arecont camera", arecont_h264_probe, "", AV_CODEC_ID_H264)
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index c602e539f5..34e5bbf280 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -32,10 +32,98 @@ 
 
 #define RAW_PACKET_SIZE 1024
 
+#define ARECONT_H264_MIME_SIZE 100
+
+int read_raw_arecont_h264_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    int ret, size, start, end, new_size = 0, i, j, k, w = 0;
+    const uint8_t id[] = {0x2D, 0x2D, 0x66, 0x62, 0x64, 0x72};
+    uint8_t *data;
+    int64_t pos;
+
+    //Extra to find the http header
+    size = 2 * ARECONT_H264_MIME_SIZE + RAW_PACKET_SIZE;
+    data = (uint8_t *)av_malloc(size);
+
+    if (av_new_packet(pkt, size) < 0)
+        return AVERROR(ENOMEM);
+
+    pkt->pos = avio_tell(s->pb);
+    pkt->stream_index = 0;
+    pos = avio_tell(s->pb);
+    ret = avio_read_partial(s->pb, data, size);
+    if (ret < 0) {
+        av_packet_unref(pkt);
+        return ret;
+    }
+    if (pos <= ARECONT_H264_MIME_SIZE) {
+        avio_seek(s->pb, 0, SEEK_SET);
+        start = pos;
+    }
+    else {
+        avio_seek(s->pb, pos - ARECONT_H264_MIME_SIZE, SEEK_SET);
+        start = ARECONT_H264_MIME_SIZE;
+    }
+    ret = avio_read_partial(s->pb, data, size);
+    if (ret < 0 || start >= ret) {
+        av_packet_unref(pkt);
+        return ret;
+    }
+    if (start + RAW_PACKET_SIZE > ret) {
+        end = ret - 1;
+    }
+    else end = start + RAW_PACKET_SIZE - 1;
+
+    //Find and remove http header.
+    for (i = 0; i < ret; i++) {
+        if (id[0] == data[i] && !memcmp(id, data + i, 6)) {
+            k = 0;
+            for (j = i; j + 1 < ret; j++) {
+                if (data[j] == 0x0D && data[j + 1] == 0x0A) {
+                    k++;
+                    if (k == 4) {
+                        if (i >= start && j + 1 > start && j + 1 <= end) {
+                            memcpy(pkt->data + new_size, data + start, i - start);
+                            new_size += i - start;
+                            memcpy(pkt->data + new_size, data + j + 2, end - j - 1);
+                            new_size += end - j - 1;
+                            w = 1;
+                            break;
+                        }
+                        else if (i < start && j + 1 >= start && j + 1 < end) {
+                            memcpy(pkt->data + new_size, data + j + 2, end - j -1);
+                            new_size += end - j - 1;
+                            w = 1;
+                            break;
+                        }
+                        else if (j + 1 > end && i > start && i <= end) {
+                            memcpy(pkt->data + new_size, data + start, i - start);
+                            new_size += i - start;
+                            w = 1;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (w == 1) break;
+        }
+    }
+    if (w == 0) {
+        memcpy(pkt->data + new_size, data + start, end - start + 1);
+        new_size = end - start + 1;
+    }
+    avio_seek(s->pb, pos + end - start + 1, SEEK_SET);
+    av_shrink_packet(pkt, new_size);
+    return new_size;
+}
+
 int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int ret, size;
 
+    if (!strcmp(s->iformat->name, "arecont_h264"))
+        return read_raw_arecont_h264_packet(s, pkt);
+
     size = RAW_PACKET_SIZE;
 
     if (av_new_packet(pkt, size) < 0)
diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h
index 3eb416b8ee..0b0c809052 100644
--- a/libavformat/rawdec.h
+++ b/libavformat/rawdec.h
@@ -35,6 +35,8 @@  typedef struct FFRawVideoDemuxerContext {
 
 extern const AVOption ff_rawvideo_options[];
 
+int read_raw_arecont_h264_packet(AVFormatContext *s, AVPacket *pkt);
+
 int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt);
 
 int ff_raw_audio_read_header(AVFormatContext *s);
-- 
2.21.0