| Age | Commit message (Collapse) | Author |
|
Workaround ffmpeg keyframe seeking for external subtitles
Original-merge: 02937873b1f4e132a50d21fd2eca4c72160dd286
Merged-by: nielsvanvelzen <nielsvanvelzen@users.noreply.github.com>
Backported-by: Joshua M. Boniface <joshua@boniface.me>
|
|
* Use more accurate rounding in GetFixedOutputSize
Signed-off-by: gnattu <gnattuoc@me.com>
* Force trickplay thumbnails to have even width
Signed-off-by: gnattu <gnattuoc@me.com>
* Use Convert.ToInt32
Signed-off-by: gnattu <gnattuoc@me.com>
* Force video size as thumbnail size if the trickplay width setting is larger
This will fix an issue when the trickplay setting contains a very huge width, but the video has a lower resolution than that setting. Our scaling filter logic will not do any upscale, and we have to force to use the video width
Signed-off-by: gnattu <gnattuoc@me.com>
---------
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
|
|
|
|
|
|
|
|
Co-authored-by: Nyanmisaka <nst799610810@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
|
|
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
|
|
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Co-authored-by: nyanmisaka <nst799610810@gmail.com>
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
Signed-off-by: gnattu <gnattuoc@me.com>
|
|
|
|
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
|
|
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
|
|
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
|
|
`-auto{scale,rotate} 0` has been dropped in upstream FFmpeg.
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
|
|
The previous behavior using `eof_action=endall` and `shortest=1` would
end the video stream if one of the input stream (video, subtitle) ends.
In some cases the duration of the overlayed subtitles is shorter than the
video stream, causing the output to end when the subtitles end and dropping
the remaining video stream.
This commit changes this behavior so `eof_action=pass` is used instead,
which continues passing the video stream through even if the subtitles end
earlier [1]. `shortest=1` is also removed, as this option implies
`eof_action=endall`.
If the subtitle stream has a higher duration than the video stream, the output
will also end with the video stream without `shortest=1`, as the video stream
is the primary input to the `overlay` filter.
Fix #10698
[1] https://ffmpeg.org/ffmpeg-filters.html#Options-for-filters-with-several-inputs-_0028framesync_0029
|
|
|
|
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
|
|
|
|
# Conflicts:
# Emby.Server.Implementations/Net/SocketFactory.cs
# RSSDP/SsdpCommunicationsServer.cs
# RSSDP/SsdpDeviceLocator.cs
# RSSDP/SsdpDevicePublisher.cs
|
|
|
|
|
|
|
|
|
|
Fixed probesize argument passing to FFmpeg
|
|
|
|
Some simple changes to reduce the number of allocated strings
|