hashirama/ajattix
hashirama/ajattix
Watch
2
1
Fork
You've already forked ajattix
 1
Code Issues 1 Pull requests Projects Releases Wiki Activity

avoid patches

Browse source
This commit is contained in:
千住柱間 2026-01-13 12:41:40 -04:00
commit 37e2cf71e5
Signed by: hashirama
GPG key ID: 53E62470A86BC185
2 changed files with 6 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

74
ajatt/packages/patches/readymedia-transcode-ffmpeg7-fix.patch
View file

@ -1,74 +0,0 @@
diff --git a/dlnameta.c b/dlnameta.c
index 4127e9d..cbc329e 100644
--- a/dlnameta.c
+++ b/dlnameta.c
@@ -282,15 +282,15 @@ get_dlna_metadata_audio(int fd)
break;
}
/* AAC @ Level 1/2 */
- if( ac->channels <= 2 && ac->bit_rate <= 320000 )
+ if( ac->ch_layout.nb_channels <= 2 && ac->bit_rate <= 320000 )
xasprintf(&m.dlna_pn, "AAC_ISO_320");
- else if( ac->channels <= 2 && ac->bit_rate <= 576000 )
+ else if( ac->ch_layout.nb_channels <= 2 && ac->bit_rate <= 576000 )
xasprintf(&m.dlna_pn, "AAC_ISO");
- else if( ac->channels <= 6 && ac->bit_rate <= 1440000 )
+ else if( ac->ch_layout.nb_channels <= 6 && ac->bit_rate <= 1440000 )
xasprintf(&m.dlna_pn, "AAC_MULT5_ISO");
else
DPRINTF(E_DEBUG, L_METADATA, "Unhandled AAC: %d channels, %d bitrate\n",
- ac->channels, ac->bit_rate);
+ ac->ch_layout.nb_channels, ac->bit_rate);
break;
default:
DPRINTF(E_DEBUG, L_METADATA, "Unhandled AAC type %d [%s]\n", data >> 3);
@@ -314,7 +314,7 @@ get_dlna_metadata_audio(int fd)
case AV_CODEC_ID_WMALOSSLESS:
xasprintf(&m.mime, "audio/x-ms-wma");
xasprintf(&m.dlna_pn, "WMALSL%s",
- ac->channels > 2 ? "_MULT5" : "");
+ ac->ch_layout.nb_channels > 2 ? "_MULT5" : "");
break;
case AV_CODEC_ID_FLAC:
xasprintf(&m.mime, "audio/x-flac");
@@ -324,7 +324,7 @@ get_dlna_metadata_audio(int fd)
break;
case AV_CODEC_ID_PCM_S16LE:
/* there are many other PCM codecs, but only this one has mime audio/L16 */
- xasprintf(&m.mime, "audio/L16;rate=%d;channels=%d", ac->sample_rate, ac->channels);
+ xasprintf(&m.mime, "audio/L16;rate=%d;channels=%d", ac->sample_rate, ac->ch_layout.nb_channels);
xasprintf(&m.dlna_pn, "LPCM");
break;
/* TODO: AV_CODEC_ID_MP2, AV_CODEC_ID_AMR_NB */
@@ -453,15 +453,15 @@ get_dlna_metadata_video_ctx(struct AVFormatContext *ctx, int audio_stream, int v
break;
}
/* AAC @ Level 1/2 */
- if( ac_params->channels <= 2 &&
+ if( ac_params->ch_layout.nb_channels <= 2 &&
ac_params->bit_rate <= 576000 )
audio_profile = PROFILE_AUDIO_AAC;
- else if( ac_params->channels <= 6 &&
+ else if( ac_params->ch_layout.nb_channels <= 6 &&
ac_params->bit_rate <= 1440000 )
audio_profile = PROFILE_AUDIO_AAC_MULT5;
else
DPRINTF(E_DEBUG, L_METADATA, "Unhandled AAC: %d channels, %d bitrate\n",
- ac_params->channels,
+ ac_params->ch_layout.nb_channels,
ac_params->bit_rate);
break;
default:
diff --git a/metadata.c b/metadata.c
index d769d3c..48f205f 100644
--- a/metadata.c
+++ b/metadata.c
@@ -659,7 +659,7 @@ GetVideoMetadata(const char *path, char *name)
if( ac )
{
m.frequency = ac->sample_rate;
- m.channels = ac->channels;
+ m.channels = ac->ch_layout.nb_channels;
}
int duration, hours, min, sec, ms;

8
ajatt/packages/video.scm
View file

@ -517,8 +517,7 @@ audio/video codec library.")
(url "https://github.com/JuanKman94/readymedia-transcode")
(commit "eb7ab61b36fd0007edad2a5eea69af41556372bf")))
(sha256
(base32 "007wxsy93n16ppfx916jjqxlxvjsm8b7gsfwfrqqgcqfspsylgsb"))
(patches (list (local-file "patches/readymedia-transcode-ffmpeg7-fix.patch")))))
(base32 "007wxsy93n16ppfx916jjqxlxvjsm8b7gsfwfrqqgcqfspsylgsb"))))
(build-system gnu-build-system)
(arguments
(list
@ -527,6 +526,11 @@ audio/video codec library.")
"--with-os-version=")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'ffmpeg7-ch-layout
(lambda _
(substitute* '("dlnameta.c" "metadata.c")
(("ac->channels") "ac->ch_layout.nb_channels")
(("ac_params->channels") "ac_params->ch_layout.nb_channels"))))
(add-before 'bootstrap 'set-aclocal-path
(lambda _
(setenv "ACLOCAL_FLAGS" "-I m4")))