Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
* [FFmpeg-devel] [PATCH v2 1/7] lavc/codec2utils: Use actual libcodec2 version
@ 2023-12-30 21:22 Tomas Härdin
  2023-12-30 21:23 ` [FFmpeg-devel] [PATCH v2 2/7] lavc/libcodec2: Report actual bitrate used both when decoding and encoding Tomas Härdin
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Tomas Härdin @ 2023-12-30 21:22 UTC (permalink / raw)
  To: ffmpeg-devel

[-- Attachment #1: Type: text/plain, Size: 55 bytes --]

Should compile without libcodec2 installed now

/Tomas

[-- Attachment #2: 0001-lavc-codec2utils-Use-actual-libcodec2-version.patch --]
[-- Type: text/x-patch, Size: 1517 bytes --]

From 098a3b7e78dc0b1bbdfce051de21526f0a886b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <git@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


[-- Attachment #3: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-12-30 21:27 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-30 21:22 [FFmpeg-devel] [PATCH v2 1/7] lavc/codec2utils: Use actual libcodec2 version Tomas Härdin
2023-12-30 21:23 ` [FFmpeg-devel] [PATCH v2 2/7] lavc/libcodec2: Report actual bitrate used both when decoding and encoding Tomas Härdin
2023-12-30 21:25 ` [FFmpeg-devel] [PATCH v2 3/7] lavf/codec2: Compute duration from filesize Tomas Härdin
2023-12-30 21:25 ` [FFmpeg-devel] [PATCH v2 4/7] lavf/codec2: Allow versions between 0.8 and 1.X Tomas Härdin
2023-12-30 21:25 ` [FFmpeg-devel] [PATCH v2 5/7] lavf/codec2: Multiple of block_align -> not corrupt Tomas Härdin
2023-12-30 21:26 ` [FFmpeg-devel] [PATCH v2 6/7] lavf/codec2: Silence warnings when either muxer/demuxer is disabled Tomas Härdin
2023-12-30 21:27 ` [FFmpeg-devel] [PATCH v2 7/7] Add FATE tests for codec2, codec2raw and libcodec2 wrapper Tomas Härdin

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git