obs: update to 23.0.1

This commit is contained in:
Colin Gillespie 2019-03-06 15:50:29 +10:00 committed by maxice8
parent 89bf7cdad3
commit e9bc3fc6cf
2 changed files with 14 additions and 61 deletions

View file

@ -1,53 +0,0 @@
From 5cf2b5fbf925412620e2a40552d6348203851cb3 Mon Sep 17 00:00:00 2001
From: pkviet <pkv.stream@gmail.com>
Date: Thu, 29 Nov 2018 21:10:45 +0100
Subject: [PATCH] obs-libfdk: Compatibility fix for new API
fdk-aac v2.0.0 (aacenc 4.0.0) changes the AACENC_InfoStruct:
the encoderDelay parameter is replaced by two, nDelay and
nDelayCore. This patch checks the lib version and adjust the parameter
accordingly.
---
plugins/obs-libfdk/obs-libfdk.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/plugins/obs-libfdk/obs-libfdk.c b/plugins/obs-libfdk/obs-libfdk.c
index d6eb496184..94b139de57 100644
--- plugins/obs-libfdk/obs-libfdk.c
+++ plugins/obs-libfdk/obs-libfdk.c
@@ -9,7 +9,6 @@
#include <fdk-aac/aacenc_lib.h>
-
static const char *libfdk_get_error(AACENC_ERROR err)
{
switch(err) {
@@ -224,7 +223,7 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
void *in_ptr;
void *out_ptr;
AACENC_ERROR err;
-
+ int64_t encoderDelay;
in_ptr = frame->data[0];
in_size = enc->frame_size_bytes;
@@ -261,10 +260,13 @@ static bool libfdk_encode(void *data, struct encoder_frame *frame,
}
*received_packet = true;
-
- packet->pts = enc->total_samples -
- enc->info.encoderDelay; // TODO: Just a guess, find out if that's actualy right
- packet->dts = enc->total_samples - enc->info.encoderDelay;
+#if (AACENCODER_LIB_VL0 >= 4)
+ encoderDelay= enc->info.nDelay;
+#else
+ encoderDelay= enc->info.encoderDelay;
+#endif
+ packet->pts = enc->total_samples - encoderDelay;
+ packet->dts = enc->total_samples - encoderDelay;
packet->data = enc->packet_buffer;
packet->size = out_args.numOutBytes;
packet->type = OBS_ENCODER_AUDIO;

View file

@ -1,12 +1,12 @@
# Template file for 'obs'
pkgname=obs
version=22.0.3
revision=3
_commit_hash_obs_browser="a321928756ae8ed4315d6d7b35a113e76493297c"
_commit_hash_obs_vst="b0f046f0ac0c8181d018f7148c7617b577a1e085"
version=23.0.1
revision=1
_commit_hash_obs_browser="693498b518cf893876f454ef581e13106e8370ec"
_commit_hash_obs_vst="fde438f7a8afdf41a7ab386a0aa1a61175fc8427"
_commit_hash_ftl_sdk="98289f7c2ed754c647d451899b3356850c0c1fa3"
wrksrc="obs-studio-${version}"
archs="i686* x86_64*"
wrksrc="obs-studio-${version}"
build_style=cmake
configure_args="-DOBS_VERSION_OVERRIDE=${version}"
hostmakedepends="pkg-config swig"
@ -22,9 +22,9 @@ distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz
https://github.com/obsproject/obs-browser/archive/${_commit_hash_obs_browser}.tar.gz>obs_browser.tgz
https://github.com/obsproject/obs-vst/archive/${_commit_hash_obs_vst}.tar.gz>obs_vst.tgz
https://github.com/Mixer/ftl-sdk/archive/${_commit_hash_ftl_sdk}.tar.gz>ftl_sdk.tgz"
checksum="86a3dbfbec5eee8305ece08d4ce6e7993d20f15ea206b4ab1bdf424f2af74c12
f780f811f3477e196602dbe405c0c680e9a2e12ede415489339ffaee73e2c729
3e5ad62918a7324fe5ab6c16a5d58e67ba511c387f9d96cf71718cf530af26e3
checksum="3230e17b6ac4be18bc6d17beaf0b8bab34a296054cbfb642c4e11df44ebfff88
354c5775bba5f43c2d94ed3ca1777dbb7b686f7f7a943683996dbb3aac1037ac
0e450202e6a90f56132de0415a3d4615e9807b799a3d1955e45b33df68535cec
00bb0d9dfe9cccd865eea4ebbe77e3a1f4a138b4a18ab4efb25ec3cddb6d1fd1"
post_extract() {
@ -36,12 +36,18 @@ post_extract() {
mv -T "../ftl-sdk-${_commit_hash_ftl_sdk}" ./plugins/obs-outputs/ftl-sdk;
}
post_install() {
mv "${DESTDIR}/usr/share/obs/obs-plugins/obs-ffmpeg/ffmpeg-mux" "${DESTDIR}/usr/bin"
ln -s "/usr/bin/ffmpeg-mux" "${DESTDIR}/usr/share/obs/obs-plugins/obs-ffmpeg"
}
obs-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
vmove usr/lib/pkgconfig
}
}