fre 2023-12-29 klockan 00:30 +0100 skrev Michael Niedermayer:
> On Thu, Dec 28, 2023 at 10:21:23PM +0100, Tomas Härdin wrote:
> > tor 2023-12-28 klockan 21:29 +0100 skrev Michael Niedermayer:
> > > On Thu, Dec 28, 2023 at 07:43:09PM +0100, Tomas Härdin wrote:
> > > > libcodec2 has reached 1.X so it's about time the bindings
> > > > receive
> > > > some
> > > > attention. This patchset also includes some much-needed tests.
> > > > Where do
> > > > I submit files for inclusion in FATE again? They are very small
> > > > as
> > > > is
> > > > to be expected from a codec that runs at 700-3200 bit/s
> > > >
> > > > /Tomas
> > >
> > > > codec2utils.h | 6 +++---
> > > > 1 file changed, 3 insertions(+), 3 deletions(-)
> > > > a79a98f8ffc27ca6d79c9d373957fa0bdc985ef2 0001-lavc-
> > > > codec2utils-
> > > > Use-actual-libcodec2-version.patch
> > > > From 7205e741aaadc354b403010c97f9cd803eec612d Mon Sep 17
> > > > 00:00:00
> > > > 2001
> > > > From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <g...@haerdin.se>
> > > > Date: Wed, 27 Dec 2023 17:32:21 +0100
> > > > Subject: [PATCH 1/6] lavc/codec2utils: Use actual libcodec2
> > > > version
> > >
> > > This breaks build here
> > >
> > > CC libavformat/codec2.o
> > > In file included from libavformat/codec2.c:24:0:
> > > ./libavcodec/codec2utils.h:26:10: fatal error: codec2/version.h:
> > > No
> > > such file or directory
> > > #include <codec2/version.h>
> > > ^~~~~~~~~~~~~~~~~~
> >
> > What version of libcodec2 are you using? I don't think we can rely
> > on
> > versions that don't expose version information, which only comes
> > about
> > because I explicitly told them to please expose it in a header. I
> > don't
> > think we can even probe version at configure time otherwise.
> >
> > libcodec2-dev on Debian bookworm works for me
>
> i think theres no libcodec2* on the box and this header is used
> outside
> checks for libcodec2* ...
Updated patch attached
/Tomas
From 098a3b7e78dc0b1bbdfce051de21526f0a886b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <g...@haerdin.se>
Date: Wed, 27 Dec 2023 17:32:21 +0100
Subject: [PATCH 1/7] lavc/codec2utils: Use actual libcodec2 version
---
libavcodec/codec2utils.h | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/libavcodec/codec2utils.h b/libavcodec/codec2utils.h
index 6812ae895c..e1314b05b6 100644
--- a/libavcodec/codec2utils.h
+++ b/libavcodec/codec2utils.h
@@ -23,6 +23,10 @@
#define AVCODEC_CODEC2UTILS_H
#include <stdint.h>
+#include "config.h"
+#if CONFIG_LIBCODEC2
+#include <codec2/version.h>
+#endif
//Highest mode we're willing to use.
//Don't want to let users accidentally produce files that can't be decoded in the future.
@@ -49,9 +53,16 @@
//Used in codec2raw demuxer and libcodec2 encoder
static inline void codec2_make_extradata(uint8_t *ptr, int mode) {
- //version 0.8 as of 2017-12-23 (r3386)
- ptr[0] = 0; //major
- ptr[1] = 8; //minor
+#if CONFIG_LIBCODEC2
+ ptr[0] = CODEC2_VERSION_MAJOR;
+ ptr[1] = CODEC2_VERSION_MINOR;
+#else
+ // this codepath is only hit when demuxing raw codec2 with libcodec2 disabled,
+ // and only relevant when remuxing from raw codec2 to .c2,
+ // because version information is ignored except when writing the .c2 header
+ ptr[0] = 1; // version 1.2.0 is the latest we know of
+ ptr[1] = 2;
+#endif
ptr[2] = mode; //mode
ptr[3] = 0; //flags
}
--
2.39.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
