Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Extract subs for ffmpeg 2 #3990

Draft
wants to merge 56 commits into
base: main
Choose a base branch
from
Draft

Extract subs for ffmpeg 2 #3990

wants to merge 56 commits into from

Conversation

SubJunk
Copy link
Member

@SubJunk SubJunk commented Jul 11, 2023

No description provided.

SubJunk and others added 26 commits June 25, 2021 19:37
@SubJunk
Extract subs for FFmpeg
5674078
@valib
Update SubtitleUtils.java
4e1b298
@SubJunk
Merge branch 'master' of https://github.com/UniversalMediaServer/Univ…
b6a986b 
…ersalMediaServer into extract-subs-for-ffmpeg
@SubJunk
Fixed some minor bugs and warnings
6ab2bb8
@SubJunk
Cleanup stale extracted subtitles
68bf180
@SubJunk
Merge branch 'master' of https://github.com/UniversalMediaServer/Univ…
f59d1ca 
…ersalMediaServer into extract-subs-for-ffmpeg
@SubJunk
Subtitles extractor and API lookup threads wait until browsing and ne…
6139484 
…twork responses are done before starting
@SubJunk
Merge branch 'master' of https://github.com/UniversalMediaServer/Univ…
5bdb2ee 
…ersalMediaServer into extract-subs-for-ffmpeg

# Conflicts:
#	src/main/java/net/pms/network/Request.java
#	src/main/java/net/pms/remote/RemoteBrowseHandler.java
@SubJunk
Still defer to MEncoder if we have not extracted the subtitles
03c02be
@SubJunk
Fix error
a501174
@SubJunk
Lint
b4c91b1
@SubJunk
Merge branch 'master' of https://github.com/UniversalMediaServer/Univ…
15bea8a 
…ersalMediaServer into extract-subs-for-ffmpeg
@SubJunk
Improved statusbar message
e032312
@SubJunk
Don't make a big deal when file moved
18a3542
@SubJunk
Prevent extraction from keeping the program open on shutdown
cf72059
@SubJunk
Formatting
ac1d43c
@SubJunk
Fix
d0e4665
@SubJunk
Merge branch 'master' of https://github.com/UniversalMediaServer/Univ…
3e4f38e 
…ersalMediaServer into extract-subs-for-ffmpeg
@SubJunk
Lint
0e43b27
@valib
Merge remote-tracking branch 'origin/master' into
3113a2c 
extract-subs-for-ffmpeg

Conflicts:
	src/main/java/net/pms/network/Request.java
	src/main/java/net/pms/network/RequestV2.java
	src/main/java/net/pms/remote/RemoteBrowseHandler.java
@SubJunk
Merge branch 'main' of https://github.com/UniversalMediaServer/Univer…
749ef9e 
…salMediaServer into extract-subs-for-ffmpeg

# Conflicts:
#	src/main/java/net/pms/PMS.java
#	src/main/java/net/pms/dlna/DLNAMediaDatabase.java
#	src/main/java/net/pms/encoders/FFMpegVideo.java
#	src/main/java/net/pms/network/Request.java
#	src/main/java/net/pms/network/RequestV2.java
#	src/main/java/net/pms/network/UPNPHelper.java
#	src/main/java/net/pms/newgui/RendererPanel.java
#	src/main/java/net/pms/newgui/RestrictedFileSystemView.java
#	src/main/java/net/pms/remote/RemoteBrowseHandler.java
#	src/main/java/net/pms/util/OpenSubtitle.java
#	src/main/java/net/pms/util/SubtitleUtils.java
#	src/main/resources/i18n/messages.properties
@SubJunk
Merge branch 'main' of https://github.com/UniversalMediaServer/Univer…
bd28c73 
…salMediaServer into extract-subs-for-ffmpeg-2

# Conflicts:
#	src/main/java/net/pms/PMS.java
#	src/main/java/net/pms/dlna/DLNAMediaDatabase.java
#	src/main/java/net/pms/encoders/FFMpegVideo.java
#	src/main/java/net/pms/network/Request.java
#	src/main/java/net/pms/network/RequestV2.java
#	src/main/java/net/pms/network/UPNPHelper.java
#	src/main/java/net/pms/remote/RemoteBrowseHandler.java
#	src/main/java/net/pms/util/OpenSubtitle.java
#	src/main/java/net/pms/util/SubtitleUtils.java
#	src/main/resources/i18n/messages.properties
@SubJunk
Resolve conflicts
2b33792
@SubJunk
Fix after refactor
943662f
@valib
Fix lint
ad3f4f7
@valib
Fix
13695aa
@SubJunk
Copy link
Member Author

SubJunk commented Jul 11, 2023

thanks @valib for the help
I am resurrecting this because I need it for HDR functionality, because we can't hardcode subtitles to some HDR streams

@SubJunk SubJunk mentioned this pull request Jul 11, 2023
Closed
@SubJunk
Formatting
6f774a0
@SubJunk
Formatting
1bbf066
@SubJunk
Formatting
d8e55ff
@SubJunk
Formatting
48c7dcd
@SubJunk
Fallback to embedded subs if extraction is pending or failed
c476324
@SubJunk
Lint
e583c95
@SubJunk
Prefer muxing with FFmpeg over tsMuxeR
a3cf791
@SubJunk
Merge branch 'main' of https://github.com/UniversalMediaServer/Univer…
10c7e84 
…salMediaServer into extract-subs-for-ffmpeg-2
@SubJunk
Start cleaning up tsMuxeRVideo
63874cd
@SubJunk
Formatting
448f6f3
@SubJunk
Deduplicate tsMuxeRVideo engine code
08d148f
@SubJunk
Started to add support for muxing SRT subtitles as PGS via tsMuxeR
2ccb806
@SubJunk
Fix check for external/internal subtitles
1f792b5
@SubJunk
Allow muxing of AAC audio if that is the renderer transcoding target
ae875f6
@SubJunk
Remove H.264-specific instructions from HEVC and MPEG-2 muxing
4915273
@SubJunk
Log default and forced subtitles flags
6b37745
@SubJunk
Merge branch 'main' of https://github.com/UniversalMediaServer/Univer…
8c3e1e6 
…salMediaServer into extract-subs-for-ffmpeg-2

# Conflicts:
#	src/main/java/net/pms/encoders/TsMuxeRVideo.java
@SubJunk
Remove duplicate block
e3462cb
@SubJunk
Fix stuck locks with lockInterruptibly
27d2759 
(cherry picked from commit a06511d)
@SubJunk
Fixed native XviD support on some renderers
909f209 
(cherry picked from commit b2afc66)
@SubJunk
Made subtitles extraction work for non-ASS subtitleType
03a8154
@SubJunk
Allow existing logic to search for subtitles within the extracted sub…
0244c45 
…titles folder
@SubJunk
Fix isExternalSubtitlesFormatSupported
3919a2c
@SubJunk
Fix range error
e96e8e3
@SubJunk
Only add one subtitles track with tsMuxeR
7aa088c
@SubJunk
Removed incorrect colorDepth logic
7d7c6d5
@SubJunk
Fix muxing logic in helper methods
35315aa
@SubJunk
Lint
25e2376
@UniversalMediaServer UniversalMediaServer deleted a comment from github-actions bot Jan 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicting
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@SubJunk @valib