-
-
Notifications
You must be signed in to change notification settings - Fork 446
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
m3u uri handling + radiobrowser + store webstream info in db #4733
base: main
Are you sure you want to change the base?
Conversation
# Conflicts: # pom.xml # react-client/package.json # react-client/yarn.lock
# Conflicts: # pom.xml # react-client/package.json # react-client/yarn.lock
# Conflicts: # CHANGELOG.md
# Conflicts: # pom.xml # react-client/package.json # react-client/src/App.tsx # react-client/yarn.lock
# Conflicts: # CHANGELOG.md
…ed the same (UniversalMediaServer#4521) * Fix TV series with the same title but different startYear being treated the same * Removed null part * Typo
more agressive way to add/delete files/folders on the store
remove old httpservlet impl
fix player sse client callback
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md # pom.xml # react-client/package.json # react-client/yarn.lock
# Conflicts: # CHANGELOG.md
added MediaTableContainerFiles correct WebStreamParser implement FFmpeg stream parser separate RadioBrowser4j api now WebStreams are stored on the MediaTableFiles
@ik666 I was not yet their when this was implemented.
According to http://trac.ffmpeg.org/wiki/audio%20types The default for muxing into WAV files is pcm_s16le
so, I presume : |
In my point of view, Edit : it is the case :
|
@SurfaceS I think this is working so far, but needs a tweak. From what I see, the transcoding section is "optimized" for video transcoding only. I think we have 2 use cases :
You can check this even in the web ui. If you navigate to this entry in the web-ui
having the But I believe if LPCM is disabled the video files (having DTS, ATMOS, etc.) won't play any audio any more since the AV receiver usually requires LPCM audio streams. The user would need to switch between the two option, in regard of the file type ... Maybe we should have a "video files transcoding" configuration section and a "audio files" configuration section to separate the config between those two container types. Quick fix would be default transcoding to PCM if we have no video streams in the container (maybe ignoring if LPCM is checked) or moving this option to a renderer configuration section. |
container having audio and video streams -> FFMpegVideo engine
you should set this on the renderer configuration.
I think this PR is huge and have a lot of changes. |
Maybe you can help: Which renderer configuration uses the web-gui (player)? |
@SurfaceS Probably another issue, not directly related to this PR. For the above example "Ibiza Global Radio" delivers a MP3 stream. The renderer has a supports line for that
However, a transcoding engine is set. Looks like the class
without matching against the supported line of the renderer? Probably at the start of the Edit: Actually FFMPEG does a good job in reading the radio station info's. Transcoding to PCM is actually not such a bad idea. |
I believe the problem is, that both engines (audio & video) use the global |
Yeah. I tried a few thing, but let's first merge this and see, how to proceed ... |
I added the file suggested at #4572 (comment) and I get an error:
|
…_handling Bugfix/m3u uri handling
lock mediaInfo parsing. don't try to add BitRate/SampleRate to null AudioTrack. let ffmpeg do it after if needed (more accurate btw).
fix for SubJunk
* main_UMS: Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.5 to 3.3.0 (UniversalMediaServer#4761) Bump vite from 5.2.11 to 5.3.1 in /react-client (UniversalMediaServer#4766) Updated changelog Updated FFmpeg to 7.0.1 (UniversalMediaServer#4759) # Conflicts: # CHANGELOG.md
@SubJunk Now it's merged |
Thanks, I will test it. Can you resolve the conflicts? |
* main_UMS: Bump typescript-eslint from 7.12.0 to 7.13.1 in /react-client (UniversalMediaServer#4774) JAudioTagger parser should update disc_num (UniversalMediaServer#4769) Bump eslint-plugin-react from 7.34.1 to 7.34.2 in /react-client (UniversalMediaServer#4764) fix 4771 (UniversalMediaServer#4772) Bump the mantine group in /react-client with 6 updates (UniversalMediaServer#4763) # Conflicts: # CHANGELOG.md # src/main/java/net/pms/store/container/PlaylistFolder.java
@SubJunk fixed |
PR #4572 follow up
Implements RadioBrowser Metadata lookup.
Added MediaTableContainerFiles to track files included in a container.
Store WebStream media info into the database.
Use of FFmpegParser to parse media info.
Implements WebStreamParser to parse headers of an http streams.
Added possibility to add playlist in playlist.