diff mbox

[FFmpeg-devel,3/8] sbc: add raw demuxer for SBC

Message ID 20171218010223.ueboxlo66e2bo7uv@gnuage.org
State Superseded
Headers show

Commit Message

Aurelien Jacobs Dec. 18, 2017, 1:02 a.m. UTC 
On Mon, Dec 18, 2017 at 12:19:06AM +0100, Carl Eugen Hoyos wrote:
> 2017-12-17 22:47 GMT+01:00 Aurelien Jacobs <aurel@gnuage.org>:
> 
> > +#if CONFIG_SBC_DEMUXER
> > +AVInputFormat ff_sbc_demuxer = {
> > +    .name           = "sbc",
> > +    .long_name      = NULL_IF_CONFIG_SMALL("raw SBC (low-complexity subband codec)"),
> > +    .extensions     = "sbc",
> > +    .raw_codec_id   = AV_CODEC_ID_SBC,
> > +    .read_header    = ff_raw_audio_read_header,
> > +    .read_packet    = ff_raw_read_partial_packet,
> > +    .flags          = AVFMT_GENERIC_INDEX,
> > +};
> > +#endif
> > +
> > +#if CONFIG_MSBC_DEMUXER
> > +AVInputFormat ff_msbc_demuxer = {
> > +    .name           = "msbc",
> > +    .long_name      = NULL_IF_CONFIG_SMALL("raw mSBC (wideband speech mono SBC)"),
> > +    .extensions     = "msbc",
> > +    .raw_codec_id   = AV_CODEC_ID_MSBC,
> > +    .read_header    = ff_raw_audio_read_header,
> > +    .read_packet    = ff_raw_read_partial_packet,
> > +    .flags          = AVFMT_GENERIC_INDEX,
> > +};
> 
> If auto-detection is impossible, this could be moved into
> libavformat/rawdec.c.

I'm not really fond of this, but OK.

> > +#endif
> > diff --git a/libavformat/utils.c b/libavformat/utils.c
> > index 84e49208b8..860fbc30c9 100644
> > --- a/libavformat/utils.c
> > +++ b/libavformat/utils.c
> > @@ -336,6 +336,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st,
> >          { "mjpeg_2000",AV_CODEC_ID_JPEG2000,   AVMEDIA_TYPE_VIDEO },
> >          { "mp3",       AV_CODEC_ID_MP3,        AVMEDIA_TYPE_AUDIO },
> >          { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO },
> 
> > +        { "sbc",       AV_CODEC_ID_SBC,        AVMEDIA_TYPE_AUDIO },
> 
> I believe this line should not be added.

Indeed, this is not needed anymore.

Here is an updated patch.
diff mbox

Patch

From a0613dfc9df64b8d8c71af48bb5c6fdd8bf8c212 Mon Sep 17 00:00:00 2001
From: Aurelien Jacobs <aurel@gnuage.org>
Date: Sun, 17 Dec 2017 20:23:25 +0100
Subject: [PATCH 3/8] sbc: add raw demuxer for SBC

---
 doc/general.texi         |  1 +
 libavformat/Makefile     |  2 ++
 libavformat/allformats.c |  2 ++
 libavformat/rawdec.c     | 24 ++++++++++++++++++++++++
 4 files changed, 29 insertions(+)

diff --git a/doc/general.texi b/doc/general.texi
index ed137f999f..65aee47f2a 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -466,6 +466,7 @@  library:
 @item raw NULL                  @tab X @tab
 @item raw video                 @tab X @tab X
 @item raw id RoQ                @tab X @tab
+@item raw SBC                   @tab   @tab X
 @item raw Shorten               @tab   @tab X
 @item raw TAK                   @tab   @tab X
 @item raw TrueHD                @tab X @tab X
diff --git a/libavformat/Makefile b/libavformat/Makefile
index cb70eac920..88d2cbd2b3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -447,6 +447,8 @@  OBJS-$(CONFIG_S337M_DEMUXER)             += s337m.o spdif.o
 OBJS-$(CONFIG_SAMI_DEMUXER)              += samidec.o subtitles.o
 OBJS-$(CONFIG_SAP_DEMUXER)               += sapdec.o
 OBJS-$(CONFIG_SAP_MUXER)                 += sapenc.o
+OBJS-$(CONFIG_SBC_DEMUXER)               += rawdec.o
+OBJS-$(CONFIG_MSBC_DEMUXER)              += rawdec.o
 OBJS-$(CONFIG_SBG_DEMUXER)               += sbgdec.o
 OBJS-$(CONFIG_SCC_DEMUXER)               += sccdec.o subtitles.o
 OBJS-$(CONFIG_SCC_MUXER)                 += sccenc.o subtitles.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 6a9b9883c9..a6b72715bd 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -211,6 +211,7 @@  static void register_all(void)
     REGISTER_MUXDEMUX(MPJPEG,           mpjpeg);
     REGISTER_DEMUXER (MPL2,             mpl2);
     REGISTER_DEMUXER (MPSUB,            mpsub);
+    REGISTER_DEMUXER (MSBC,             msbc);
     REGISTER_DEMUXER (MSF,              msf);
     REGISTER_DEMUXER (MSNWC_TCP,        msnwc_tcp);
     REGISTER_DEMUXER (MTAF,             mtaf);
@@ -277,6 +278,7 @@  static void register_all(void)
     REGISTER_DEMUXER (S337M,            s337m);
     REGISTER_DEMUXER (SAMI,             sami);
     REGISTER_MUXDEMUX(SAP,              sap);
+    REGISTER_DEMUXER (SBC,              sbc);
     REGISTER_DEMUXER (SBG,              sbg);
     REGISTER_MUXDEMUX(SCC,              scc);
     REGISTER_DEMUXER (SDP,              sdp);
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index e926549a60..d94f4972cb 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -191,3 +191,27 @@  static int mjpeg_probe(AVProbeData *p)
 
 FF_DEF_RAWVIDEO_DEMUXER2(mjpeg, "raw MJPEG video", mjpeg_probe, "mjpg,mjpeg,mpo", AV_CODEC_ID_MJPEG, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS)
 #endif
+
+#if CONFIG_SBC_DEMUXER
+AVInputFormat ff_sbc_demuxer = {
+    .name           = "sbc",
+    .long_name      = NULL_IF_CONFIG_SMALL("raw SBC (low-complexity subband codec)"),
+    .extensions     = "sbc",
+    .raw_codec_id   = AV_CODEC_ID_SBC,
+    .read_header    = ff_raw_audio_read_header,
+    .read_packet    = ff_raw_read_partial_packet,
+    .flags          = AVFMT_GENERIC_INDEX,
+};
+#endif
+
+#if CONFIG_MSBC_DEMUXER
+AVInputFormat ff_msbc_demuxer = {
+    .name           = "msbc",
+    .long_name      = NULL_IF_CONFIG_SMALL("raw mSBC (wideband speech mono SBC)"),
+    .extensions     = "msbc",
+    .raw_codec_id   = AV_CODEC_ID_MSBC,
+    .read_header    = ff_raw_audio_read_header,
+    .read_packet    = ff_raw_read_partial_packet,
+    .flags          = AVFMT_GENERIC_INDEX,
+};
+#endif
-- 
2.15.1