Skip to content

Commit

Permalink
GPAC 2.4 Release
Browse files Browse the repository at this point in the history
  • Loading branch information
jeanlf committed Apr 17, 2024
1 parent 8cec856 commit 5d70253
Show file tree
Hide file tree
Showing 14 changed files with 28 additions and 27 deletions.
6 changes: 4 additions & 2 deletions Changelog
@@ -1,4 +1,4 @@
# On-going: GPAC 2.3-DEV
#04/2024: GPAC 2.4

## Emscripten|WebAssembly(WASM) support
- Session can run in worker or in main browser loop
Expand Down Expand Up @@ -32,6 +32,7 @@
- Fixed GF_FileIO for async read and write modes
- Added seeking in mp4dmx in mem mode
- vout updated to use VBO (required for gles2)
- libcaca video output support
- Allow ffdmx to work as demux filter on gpac input file pids
- GHI format for pre-indexing DASH/HLS session for JIT packaging/encryption/transcode
- Zero-copy for mp4dmx and fragmented mp4mx
Expand All @@ -48,11 +49,12 @@

## Misc
- Migrated doc from github's wiki to wiki.gpac.io
- FFMPEG 6 support
- FFMPEG 7 support
- Added features for configure (vout, aout, fonts, doc, evg)
- Allow specifying network interface by name or IP (instead of IP only)
- UDP/TCP filtering and recording to / playback from pcap, pcapng and GPAC gpc files
- Added Nix and Docker build files
- many bug fixes, improvements and security patches


# 19/12/2022: GPAC 2.2
Expand Down
11 changes: 6 additions & 5 deletions README.md
Expand Up @@ -25,9 +25,9 @@

# GPAC Introduction

Current version: 2.3-DEV
Current version: 2.4

Latest Release: 2.2
Latest Release: 2.4

GPAC is an open-source multimedia framework focused on modularity and standards compliance.
GPAC provides tools to process, inspect, package, stream, playback and interact with media content. Such content can be any combination of audio, video, subtitles, metadata, scalable graphics, encrypted media, 2D/3D graphics and ECMAScript.
Expand Down Expand Up @@ -116,8 +116,9 @@ Users are encouraged to use the latest tag or the master branch.

## V2.X
Targets:
- [ ] Web integration (emscripten, Remotery UI)
- [ ] DASH event support
- [ ] Better TTML2 / SMPTE ST 2052-1 support
- [ ] GUI cleanup ?
- [ ] Web GUI
- [ ] QUIC support
- [ ] ROUTE file repair support
- [ ] FLUTE file repair support

4 changes: 2 additions & 2 deletions applications/gpac/ios-Info.plist
Expand Up @@ -37,11 +37,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.3-DEV</string>
<string>2.4</string>
<key>CFBundleSignature</key>
<string>gpac</string>
<key>CFBundleVersion</key>
<string>12.10.0</string>
<string>12.14.0</string>
<key>NSCameraUsageDescription</key>
<string>GPAC needs camera access to handle this URL</string>
<key>NSMicrophoneUsageDescription</key>
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
@@ -1,4 +1,4 @@
gpac (2.3-DEV) stable; urgency=low
gpac (2.4) stable; urgency=low

* Initial release - see https://github.com/gpac/gpac/releases for more details

Expand Down
6 changes: 3 additions & 3 deletions gpac.spec
@@ -1,11 +1,11 @@
# $Id: gpac.spec,v 1.5 2008-12-02 18:04:42 jeanlf Exp $
Summary: Framework for production, encoding, delivery and interactive playback of multimedia content
Name: gpac
Version: 2.3-DEV
Release: 2.3-DEV
Version: 2.4
Release: 2.4
License: LGPL
Group: Applications/Multimedia
Source0: gpac-2.3-DEV.tar.gz
Source0: gpac-2.4.tar.gz
URL: https://gpac.io/
BuildRoot: %{_tmppath}/%{name}-root
Requires: SDL
Expand Down
4 changes: 2 additions & 2 deletions include/gpac/version.h
Expand Up @@ -42,13 +42,13 @@
* SONAME versions must be digits (not strings)
*/
/*! Macro giving GPAC version name expressed as a printable string*/
#define GPAC_VERSION "2.3-DEV"
#define GPAC_VERSION "2.4"

// WARNING: when bumping, reflect the changes in share/python/libgpac.py !!
/*! ABI Major number of libgpac */
#define GPAC_VERSION_MAJOR 12
/*! ABI Minor number of libgpac */
#define GPAC_VERSION_MINOR 12
#define GPAC_VERSION_MINOR 14
/*! ABI Micro number of libgpac */
#define GPAC_VERSION_MICRO 0

Expand Down
4 changes: 2 additions & 2 deletions packagers/osx/GPAC.app/Contents/Info.plist
Expand Up @@ -516,7 +516,7 @@
<string>yes</string>
</dict>
<key>CFBundleShortVersionString</key>
<string>2.3-DEV</string>
<string>2.4</string>
<key>CFBundleSignature</key>
<string>gpac</string>
<key>CFBundleURLTypes</key>
Expand Down Expand Up @@ -567,7 +567,7 @@
<key>NSMicrophoneUsageDescription</key>
<string>GPAC needs microphone access to handle this URL</string>
<key>CFBundleVersion</key>
<string>12.10.0</string>
<string>12.14.0</string>
<key>LSMinimumSystemVersion</key>
<string>10.5.0</string>
<key>NSMainNibFile</key>
Expand Down
2 changes: 1 addition & 1 deletion packagers/win32_64/nsis/gpac_installer.nsi
@@ -1,6 +1,6 @@
;--------------------------------
;General
!define GPAC_VERSION 2.3-DEV
!define GPAC_VERSION 2.4
!include default.out

!define GPAC_ROOT ..\..\..
Expand Down
2 changes: 1 addition & 1 deletion share/doc/man/gpac-filters.1
Expand Up @@ -11942,7 +11942,7 @@ Authors: GPAC developers, see git repo history (-log)
.br
For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
.br
build: 2.3-DEV
build: 2.4
.br
Copyright: (c) 2000-2023 Telecom Paris distributed under LGPL v2.1+ - https://gpac.io
.br
Expand Down
2 changes: 1 addition & 1 deletion share/doc/man/gpac.1
Expand Up @@ -5160,7 +5160,7 @@ Authors: GPAC developers, see git repo history (-log)
.br
For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
.br
build: 2.3-DEV
build: 2.4
.br
Copyright: (c) 2000-2023 Telecom Paris distributed under LGPL v2.1+ - https://gpac.io
.br
Expand Down
2 changes: 1 addition & 1 deletion share/doc/man/mp4box.1
Expand Up @@ -2941,7 +2941,7 @@ Authors: GPAC developers, see git repo history (-log)
.br
For bug reports, feature requests, more information and source code, visit https://github.com/gpac/gpac
.br
build: 2.3-DEV
build: 2.4
.br
Copyright: (c) 2000-2023 Telecom Paris distributed under LGPL v2.1+ - https://gpac.io
.br
Expand Down
2 changes: 1 addition & 1 deletion share/python/libgpac/libgpac.py
Expand Up @@ -242,7 +242,7 @@

#change this to reflect API we encapsulate. An incomatibility in either of these will throw a warning
GF_ABI_MAJOR=12
GF_ABI_MINOR=12
GF_ABI_MINOR=14

gpac_abi_major=_libgpac.gf_gpac_abi_major()
gpac_abi_minor=_libgpac.gf_gpac_abi_minor()
Expand Down
6 changes: 2 additions & 4 deletions src/filters/decrypt_cenc_isma.c
Expand Up @@ -613,10 +613,8 @@ static GF_Err cenc_dec_load_keys(GF_CENCDecCtx *ctx, GF_CENCDecStream *cstr)
Bool match = GF_FALSE;
if (cstr->is_hls) {
match = GF_TRUE;
} else if (cstr->KIDs[j]) {
if (!memcmp(KID, cstr->KIDs[j], 16) || !memcmp(blank_KID, cstr->KIDs[j], 16) ) {
match = GF_TRUE;
}
} else if (!memcmp(KID, cstr->KIDs[j], 16) || !memcmp(blank_KID, cstr->KIDs[j], 16) ) {
match = GF_TRUE;
}
if (match) {
memcpy(cstr->crypts[i].key, cstr->keys[j], 16);
Expand Down
2 changes: 1 addition & 1 deletion src/utils/os_divers.c
Expand Up @@ -80,7 +80,7 @@ static u64 sys_start_time_hr = 0;
#include <gpac/revision.h>
#define GPAC_FULL_VERSION GPAC_VERSION "-rev" GPAC_GIT_REVISION

#define GPAC_COPYRIGHT "(c) 2000-2023 Telecom Paris distributed under LGPL v2.1+ - https://gpac.io"
#define GPAC_COPYRIGHT "(c) 2000-2024 Telecom Paris distributed under LGPL v2.1+ - https://gpac.io"

GF_EXPORT
const char *gf_gpac_version()
Expand Down

0 comments on commit 5d70253

Please sign in to comment.