[FFmpeg-devel,2/3] Add muxer/demuxer for raw codec2 and .c2 files

Submitted by Tomas Härdin on Feb. 14, 2018, 9:20 a.m.

Details

Message ID 1518600032.29427.2.camel@acc.umu.se
State New
Headers show

Commit Message

Tomas Härdin Feb. 14, 2018, 9:20 a.m.
tis 2018-02-13 klockan 11:48 +0100 skrev Tomas Härdin:
> fre 2018-02-09 klockan 11:29 +0100 skrev Carl Eugen Hoyos:
> > 2018-01-15 22:36 GMT+01:00 Tomas Härdin <tjoppen@acc.umu.se>:
> > 
> > > > +    if (p->buf[4] >  EXPECTED_CODEC2_MINOR_VERSION) score -=
> > > > AVPROBE_SCORE_MAX/5;
> > > > +    if (p->buf[5] >  AVPRIV_CODEC2_MODE_MAX)        score -=
> > > > AVPROBE_SCORE_MAX/5;
> > > > +    if (p->buf[6] != 0)                             score -=
> > > > AVPROBE_SCORE_MAX/5;
> > > > +    return score;
> > > > 
> > > > Imo, this is too complicated:
> > > > If the first 32bit are correct, return MAX/2, for 24bit, return
> > > > less
> > 
> > This should have been AVPROBE_SCORE_EXTENSION + 1,
> > sorry about my mistake.
> 
> Done.
> 
> > Please threaten to push this and push after a few days.
> 
> Alright, rebased. I'll push on Sunday if there's no objections
> 
> /Tomas

Aaaand a set that actually passes FATE this time :)

/Tomas

Comments

Tomas Härdin Feb. 24, 2018, 5:29 p.m.
ons 2018-02-14 klockan 10:20 +0100 skrev Tomas Härdin:
> tis 2018-02-13 klockan 11:48 +0100 skrev Tomas Härdin:
> > fre 2018-02-09 klockan 11:29 +0100 skrev Carl Eugen Hoyos:
> > > 2018-01-15 22:36 GMT+01:00 Tomas Härdin <tjoppen@acc.umu.se>:
> > > 
> > > > > +    if (p->buf[4] >  EXPECTED_CODEC2_MINOR_VERSION) score -=
> > > > > AVPROBE_SCORE_MAX/5;
> > > > > +    if (p->buf[5] >  AVPRIV_CODEC2_MODE_MAX)        score -=
> > > > > AVPROBE_SCORE_MAX/5;
> > > > > +    if (p->buf[6] != 0)                             score -=
> > > > > AVPROBE_SCORE_MAX/5;
> > > > > +    return score;
> > > > > 
> > > > > Imo, this is too complicated:
> > > > > If the first 32bit are correct, return MAX/2, for 24bit,
> > > > > return
> > > > > less
> > > 
> > > This should have been AVPROBE_SCORE_EXTENSION + 1,
> > > sorry about my mistake.
> > 
> > Done.
> > 
> > > Please threaten to push this and push after a few days.
> > 
> > Alright, rebased. I'll push on Sunday if there's no objections
> > 
> > /Tomas
> 
> Aaaand a set that actually passes FATE this time :)

Pushed

/Tomas

Patch hide | download patch | download mbox

From 3058b050d4a716ab77c5feef7820579ea9949dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <tjoppen@acc.umu.se>
Date: Tue, 13 Feb 2018 11:46:44 +0100
Subject: [PATCH 4/4] Add myself as codec2 maintainer

---
 MAINTAINERS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index b691bd56ec..ded464172a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -188,6 +188,7 @@  Codecs:
   jvdec.c                               Peter Ross
   lcl*.c                                Roberto Togni, Reimar Doeffinger
   libcelt_dec.c                         Nicolas George
+  libcodec2.c                           Tomas Härdin
   libdirac*                             David Conrad
   libgsm.c                              Michel Bardiaux
   libkvazaar.c                          Arttu Ylä-Outinen
@@ -394,6 +395,7 @@  Muxers/Demuxers:
   brstm.c                               Paul B Mahol
   caf*                                  Peter Ross
   cdxl.c                                Paul B Mahol
+  codec2.c                              Tomas Härdin
   crc.c                                 Michael Niedermayer
   dashdec.c                             Steven Liu
   dashenc.c                             Karthick Jeyapal
-- 
2.11.0