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

DVDOverlayCodecFFmpeg: Fix for distorted subtitles in 3D modes #26

Open
wants to merge 10 commits into
base: gbm
Choose a base branch
from
Open

DVDOverlayCodecFFmpeg: Fix for distorted subtitles in 3D modes #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6238240
ffmpeg: Add v4l2 support
popcornmix Jan 20, 2020
4a85a8d
test: define V4L2_PIX_FMT_NV12_10_COL128/V4L2_PIX_FMT_NV12_COL128 if …
popcornmix Sep 28, 2020
3579d9c
VideoPlayer: Add setting to disable non-hevc accel
popcornmix Mar 27, 2020
4a52365
pi4: hack: Try to hide pixel wrap issue
popcornmix Apr 8, 2020
29bf4c0
appliance: add default gbm settings in appliance.xml
popcornmix Nov 4, 2020
0f51628
hack: avoid assert
popcornmix Nov 9, 2020
1830fd7
CVideoLayerBridgeDRMPRIME add colourspace connector property
lrusak Apr 30, 2019
bf1a82f
appliance: default videoplayer.disablenonhevc to false
popcornmix Dec 18, 2020
aebafae
ffmpeg: update from jc to attach corrupt flag to correct frame
popcornmix Jan 3, 2021
52d5328
DVDOverlayCodecFFmpeg: Fix for distorted subtitles in 3D modes
popcornmix Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions addons/resource.language.en_gb/resources/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7284,6 +7284,16 @@ msgctxt "#13467"
msgid "Unlimited / 1080 (>30Hz)"
msgstr ""

#: system/settings/settings.xml
msgctxt "#13500"
msgid "Only allow acceleration for HEVC"
msgstr ""

#: system/settings/settings.xml
msgctxt "#13501"
msgid "This option disables acceleration for other codecs as they don't currently support seeking with V4L2"
msgstr ""

#empty strings from id 13468 to 13504

#: system/settings/settings.xml
Expand Down
5 changes: 4 additions & 1 deletion cmake/modules/FindFFMPEG.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,10 @@ if(NOT FFMPEG_FOUND)
<SOURCE_DIR> &&
${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake
<SOURCE_DIR>)
<SOURCE_DIR> &&
patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/0001-rpi-Add-hevc-acceleration.patch &&
echo "########################################## patched ffmpeg ##############################"
)

if (ENABLE_INTERNAL_DAV1D)
add_dependencies(ffmpeg dav1d)
Expand Down
29 changes: 29 additions & 0 deletions system/settings/appliance.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings version="1">
<section id="player">
<category id="videoplayer">
<group id="3">
<setting id="videoplayer.useprimedecoder">
<default>true</default>
</setting>
<setting id="videoplayer.useprimedecoderforhw">
<visible>true</visible>
</setting>
<setting id="videoplayer.disablenonhevc">
<default>false</default>
</setting>
<setting id="videoplayer.useprimerenderer">
<default>0</default>
</setting>
</group>
</category>
<category id="input">
<group id="4">
<setting id="input.libinputkeyboardlayout">
<visible>true</visible>
</setting>
</group>
</category>
</section>
</settings>

12 changes: 12 additions & 0 deletions system/settings/linux.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,18 @@
<default>true</default>
<control type="toggle" />
</setting>
<setting id="videoplayer.disablenonhevc" type="boolean" parent="videoplayer.useprimedecoderforhw" label="13500" help="13501">
<requirement>HAS_GLES</requirement>
<visible>false</visible>
<dependencies>
<dependency type="enable">
<condition setting="videoplayer.useprimedecoderforhw" operator="is">true</condition>
</dependency>
</dependencies>
<level>3</level>
<default>true</default>
<control type="toggle" />
</setting>
<setting id="videoplayer.useprimerenderer" type="integer" label="13462" help="13463">
<requirement>HAS_GLES</requirement>
<visible>false</visible>
Expand Down
Loading