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

Videoplayer / InputStream cleaning #312

Open
wants to merge 129 commits into
base: master
Choose a base branch
from
Open

Videoplayer / InputStream cleaning #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
9806f34
vdpau: advanced settings for auto deinterlacing
FernetMenta Oct 11, 2012
74c1df1
pthreads: use mutex protocol PTHREAD_PRIO_INHERIT
FernetMenta Sep 28, 2014
333aecb
vaapi: lock gfx context on pre-cleanup
FernetMenta Oct 4, 2014
5403279
ffmpeg: bump version
FernetMenta May 27, 2015
3b941a1
[pvr] Add progress bar with timeshift progress when timeshift is active
BigNoid May 27, 2015
5a860e4
renderer: promote interface up to BaseRenderer
FernetMenta May 31, 2015
9198027
renderer: refactor RenderManager and LinuxRendererGL
FernetMenta Jun 1, 2015
e8114eb
X11 EGL wip
FernetMenta Jun 4, 2015
bc62bbe
PlatformDefs: Fix compilation issue on i386 (revisit me later)
fritsch Jul 9, 2015
76c1ce7
renderer: fix forced deinterlacing for non-render methods
FernetMenta Jul 17, 2015
d8b8a11
dvdplayer: fix dropped frame counter - it counted not all drops
FernetMenta Jul 22, 2015
2d888cf
renderer: fix HasFrame
FernetMenta Jul 26, 2015
c5aa445
make video renderer non-global
FernetMenta Aug 19, 2015
12bf58c
ffmpeg: bump to 2.8-pre
FernetMenta Aug 26, 2015
6024aff
move VideoRenderers
FernetMenta Aug 28, 2015
e645ff9
gl: split output stage from yuv2rgb shader
laurimyllari May 5, 2015
82b32d3
gl: split output stage from convolution shaders
laurimyllari May 5, 2015
67e1208
gl: GLSLOutput helper with dithering
laurimyllari May 11, 2015
72c9041
gl: disable dither texture after rendering only when dithering is used
laurimyllari Jun 27, 2015
efb7983
settings: add video dither
laurimyllari May 18, 2015
606b799
rename dvdplayer to VideoPlayer
FernetMenta Sep 3, 2015
d57937b
videoplayer: drop SETTING_AUDIOOUTPUT_SUPPORTSDTSHDCPUDECODING
FernetMenta Sep 5, 2015
a7d97b6
AE: refactor IAudioCallback
FernetMenta Sep 5, 2015
041e65d
move audio sync to AE
FernetMenta Sep 6, 2015
74ac26c
x11: use the standard hint for disabling compositing
laurimyllari Jun 2, 2015
bd7bb22
Compositors: Only disable them if actually in use
fritsch Sep 9, 2015
d338b1b
configure: Add raspberry-pi2 platform
popcornmix Mar 7, 2015
f4cc8b0
[gles] Fix build with gles. GL_RED is not defined
popcornmix Sep 7, 2015
a65cf1c
fixup: Fix bug in HasFrame
popcornmix Sep 7, 2015
382ba2a
[GLES] Fix build with VideoPlayer
popcornmix Sep 7, 2015
3720b98
[omxplayer] Update to support VideoPlayer renderer
popcornmix Sep 7, 2015
3ba77a1
[MMAL] Update to support VideoPlayer renderer
popcornmix Sep 7, 2015
98f0cd4
fixed: don't assing std::string to nullptr
notspiff Sep 10, 2015
cd8686d
fixed: macro existence should not rely on config.h usage
notspiff Sep 10, 2015
3703598
fixed: unify include paths with other files
notspiff Sep 10, 2015
3ceed17
cmake buildsystem
akva2 Sep 9, 2015
fe4acfa
[win32] Sync VS project.
ace20022 Apr 21, 2015
78f6c92
[cmake] fix squashed fixes, squash me later
wsnipex Sep 11, 2015
6a55257
VideoPlayer: rework HandlePlayspeed
FernetMenta Sep 11, 2015
e8220c7
dvdplayer: you are dead, dont you come back anymore'
FernetMenta Sep 11, 2015
faf2474
[shader] - fix compilation of glsl shaders for gles
Memphiz Sep 13, 2015
f878e29
[shader] - use GLSLOutput object on gles platforms aswell
Memphiz Sep 13, 2015
e034689
[ios] - add implementation for RendererVTB
Memphiz Sep 13, 2015
d750d11
[VideoRendererGLES] - refactor to support derived hw dec renderer - s…
Memphiz Sep 13, 2015
71c0426
[RenderManager] - hookup hw dec RendererVTB
Memphiz Sep 13, 2015
1d5f1f9
[HwRendererVTB] - add to CMakeLists.txt and Makefile buildsys
Memphiz Sep 14, 2015
619f2e5
sync cmake buildsystem
notspiff Sep 14, 2015
956436a
[RendererVTB] - some more cleanup
Memphiz Sep 14, 2015
dbff387
[HwRendererIMX] - moved IMX video rendering out of LinuxRendererGLES.cpp
Memphiz Sep 14, 2015
c3a3a90
[HwRendererOMX] - moved OpenMax (OMX) video rendering out of
Memphiz Sep 14, 2015
661cf4b
[HwDecRenderers] - get some more platform specific stuff out of
Memphiz Sep 14, 2015
376daa5
[HwDecRendererStagefrighht] - moved OpenMax (OMX) video rendering out…
Memphiz Sep 14, 2015
d654ec5
Add X11 EGL depends build support
AlwinEsch Sep 15, 2015
ceb7692
[VideoPlayer] cleanup DVDVideoCodec.*
AlwinEsch Sep 15, 2015
8983e75
[HwDecRendererMediaCodec] - moved Android MediaCodec (surface) video …
Memphiz Sep 14, 2015
67c7c02
[VideoRenderer/GLES] - drop AddSupportedHwRenderFormats - m_formats will
Memphiz Sep 16, 2015
004dab4
remove stagefright
Memphiz Sep 16, 2015
3d4346c
changed: allow multiple callbacks in AE
notspiff Sep 16, 2015
17246f0
RenderManager - cleanup CreateRenderer
FernetMenta Sep 17, 2015
ff3533f
squash: Fix compile errors on pi
popcornmix Sep 17, 2015
734c654
squash: Fix playback with MMAL
popcornmix Sep 17, 2015
02111c1
refactor resolution switching - WIP
FernetMenta Sep 18, 2015
62973fa
VideoPlayer: flush renderer when skin is changed
FernetMenta Sep 18, 2015
8165c21
dithering: rework
FernetMenta Sep 21, 2015
b6ad152
[vcxproj] Fix XBMC.vcxproj files.
Sep 19, 2015
f16b74f
[win32] Fix compilation errors.
Sep 19, 2015
b89de50
VideoPlayer: keep dvdplayer path for libs on Windows, temp
FernetMenta Sep 20, 2015
8e0e697
VideoPlayer: limit sleep time for render to 500ms
FernetMenta Sep 20, 2015
aac4717
VideoPlayer: squash win
FernetMenta Sep 20, 2015
c4a7775
rename OnLostDevice, OnResetDevice
FernetMenta Sep 20, 2015
ac736d8
fixup: Fix GLES and MMAL builds
popcornmix Sep 21, 2015
13b08c5
[cmake] sync
FernetMenta Sep 21, 2015
62fae8c
VideoPlayer: honor flac metatags for channel layouts
FernetMenta Sep 21, 2015
8244b13
set desired resolution before start of playback
FernetMenta Sep 22, 2015
2dea3c1
[depends] fix target raspberry-pi
wsnipex Sep 12, 2015
0d339e1
[cmake] WIP: RPI
wsnipex Sep 12, 2015
5b78640
[cmake] build guilib with gif - TODO: add gif detection
wsnipex Sep 21, 2015
c9dd6dc
[cmake] squash to resolution
wsnipex Sep 22, 2015
d265508
[depends] add kodi makefile for building with cmake - squash me
wsnipex Sep 17, 2015
2663adc
sync cmake project
wsnipex Sep 21, 2015
ddbd73d
[EGL] don't always include amlogic
wsnipex Sep 19, 2015
affe827
VideoPlayer: clean audio interface
FernetMenta Sep 23, 2015
9664927
disable passthrough when sync playback to display
FernetMenta Sep 23, 2015
eda1988
VideoPlayer: drop useless masterclock
FernetMenta Sep 24, 2015
f814995
X11: delayed OnResetDisplay after change of refresh rate
FernetMenta Sep 24, 2015
0aee734
squash set desired resolution before start of playback
FernetMenta Sep 27, 2015
c765bbe
VideoPlayer: rework player sync to clock
FernetMenta Sep 30, 2015
24b490c
Advancedsettings: Remove blackbarcolour and set it automatically
fritsch Oct 1, 2015
0fe8a08
Fix iMX6 compilation
wolfgar Sep 18, 2015
f1ece74
Fix imx buffer lock/release to have proper ref count
wolfgar Oct 1, 2015
3352748
VideoPlayer: drop annoying asked for new data packet msg
FernetMenta Oct 2, 2015
3a00de8
vaapi: do not disassociate egl context
FernetMenta Oct 2, 2015
883ee73
squash ae sync
FernetMenta Oct 3, 2015
fb869a1
squash flac
FernetMenta Oct 5, 2015
531d6e3
VideoRenderer: fix state after flush
FernetMenta Oct 5, 2015
27bde61
squash resolution
FernetMenta Oct 5, 2015
896be15
squash reso
FernetMenta Oct 5, 2015
37c87a3
another resolution fix
FernetMenta Oct 5, 2015
e1a6090
squash: rename OnLostDevice, OnResetDevice
popcornmix Oct 5, 2015
07b3722
sync cmake project
wsnipex Oct 5, 2015
2bf2895
[omxplayer] Ensure MMAL renderer is used in BYPASS mode
popcornmix Oct 3, 2015
016b20e
[omxplayer] Update to new VideoPlayer sync scheme
popcornmix Oct 1, 2015
dec5218
squash refactor sync
FernetMenta Oct 8, 2015
633d17e
xcode crappy merge
FernetMenta Oct 8, 2015
e4ac4f5
VideoPlayer: allow speed up to 1.5
FernetMenta Oct 9, 2015
eacc9b2
VideoPlayer: flag and handle realtime streams
FernetMenta Oct 9, 2015
3289d01
[videoplayer] Hacky scheme to enable accelerated playback as first ff…
popcornmix Oct 9, 2015
4bb9f3a
VideoPlayer: add debug log for flushing audio
FernetMenta Oct 9, 2015
52deef7
VideoPlayer: do not flush and drain audio on stall
FernetMenta Oct 9, 2015
80ddf9b
yuv2rgb: don't error on non neon devices - squash me
wsnipex Oct 7, 2015
0768506
AE: fix calculation of bytesToSkip to avoid cracking sounds
popcornmix Oct 10, 2015
f9a0e78
[AE] Fix large buffertime check
popcornmix Oct 10, 2015
c3b1a3a
VideoPlayer: fix cachestate after FlushBuffers
FernetMenta Oct 11, 2015
c492106
[renderer] Remove RenderUpdateCallBack and RenderFeaturesCallBack
popcornmix Oct 10, 2015
551e46d
[pvr] reset changed flag for channels after storing them to db
FernetMenta Oct 11, 2015
b47b12b
Fixup mediacodec
koying Oct 9, 2015
d1415b0
Get rid of libstagefright
koying Oct 10, 2015
6c31ae9
baseline amlcodec
koying Oct 11, 2015
774dfaf
fixup aml
koying Oct 12, 2015
52496ef
squash player sync
FernetMenta Oct 13, 2015
0e11a41
squash: fix wrong prototype for RenderUpdateVideoHook
popcornmix Oct 13, 2015
81f3713
vaapi: cope with comtinuous get_buffer errors
FernetMenta Oct 14, 2015
dc81dbf
squash vaapi
FernetMenta Oct 15, 2015
4b91cdc
squash xcode merge
FernetMenta Oct 17, 2015
f734e9d
VideoPlayer: fix ff after recent changes
FernetMenta Oct 17, 2015
b88722c
AE: squash audio sync
FernetMenta Oct 19, 2015
caceece
Fixed compilation of refactored EGL on X11
lkosmid Oct 21, 2015
e74e7cc
VideoPlayer: Remove SetFileItem method. RTMP needs a different solution
popcornmix Oct 27, 2015
f71b8b6
[videoplayer] Move filename from Open to contructor
popcornmix Oct 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 11 additions & 11 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,8 @@ lib/cpluff/stamp-h1
/system/cdrip/vorbis.dll
/system/cdrip/vorbisenc.dll

# /system/players/dvdplayer
/system/players/dvdplayer/*
# /system/players/VideoPlayer
/system/players/VideoPlayer/*

# /system/players/paplayer
/system/players/paplayer/libmodplug.dll
Expand Down Expand Up @@ -495,19 +495,19 @@ lib/cpluff/stamp-h1
/xbmc/cores/DllLoader/exports/wrapper.def
/xbmc/cores/DllLoader/Makefile
/xbmc/cores/DllLoader/exports/Makefile
/xbmc/cores/dvdplayer/Makefile
/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile
/xbmc/cores/dvdplayer/DVDCodecs/Makefile
/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile
/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile
/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile
/xbmc/cores/dvdplayer/DVDDemuxers/Makefile
/xbmc/cores/dvdplayer/DVDSubtitles/Makefile
/xbmc/cores/VideoPlayer/Makefile
/xbmc/cores/VideoPlayer/DVDCodecs/Audio/Makefile
/xbmc/cores/VideoPlayer/DVDCodecs/Makefile
/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/Makefile
/xbmc/cores/VideoPlayer/DVDCodecs/Video/libstagefrightICS/Makefile
/xbmc/cores/VideoPlayer/DVDCodecs/Video/Makefile
/xbmc/cores/VideoPlayer/DVDDemuxers/Makefile
/xbmc/cores/VideoPlayer/DVDSubtitles/Makefile
/xbmc/cores/omxplayer/Makefile
/xbmc/cores/paplayer/Makefile
/xbmc/cores/playercorefactory/Makefile
/xbmc/cores/Makefile
/xbmc/cores/VideoRenderers/Makefile
/xbmc/cores/VideoPlayer/VideoRenderers/Makefile

# /xbmc/filesystem/
/xbmc/filesystem/Makefile
Expand Down
202 changes: 115 additions & 87 deletions Kodi.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 14 additions & 22 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,16 @@ DVDPCODECS_DIRS= \
lib \
lib/libdvd

ifeq (@USE_LIBSTAGEFRIGHT@,1)
DVDPCODECS_DIRS += xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
endif

DVDPLAYER_ARCHIVES=xbmc/cores/dvdplayer/DVDPlayer.a \
xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \
xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a \
xbmc/cores/dvdplayer/DVDCodecs/Overlay/Overlay.a \
xbmc/cores/dvdplayer/DVDCodecs/Video/Video.a \
xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxers.a \
xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreams.a \
xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a

DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
VideoPlayer_ARCHIVES=xbmc/cores/VideoPlayer/VideoPlayer.a \
xbmc/cores/VideoPlayer/DVDCodecs/DVDCodecs.a \
xbmc/cores/VideoPlayer/DVDCodecs/Audio/Audio.a \
xbmc/cores/VideoPlayer/DVDCodecs/Overlay/Overlay.a \
xbmc/cores/VideoPlayer/DVDCodecs/Video/Video.a \
xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxers.a \
xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreams.a \
xbmc/cores/VideoPlayer/DVDSubtitles/DVDSubtitles.a

DIRECTORY_ARCHIVES=$(VideoPlayer_ARCHIVES) \
xbmc/addons/addons.a \
xbmc/cdrip/cdrip.a \
xbmc/contrib/kissfft/kissfft.a \
Expand All @@ -35,8 +31,9 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/cores/DllLoader/exports/exports.a \
xbmc/cores/DllLoader/exports/util/exports_utils.a \
xbmc/cores/ExternalPlayer/ExternalPlayer.a \
xbmc/cores/VideoRenderers/VideoRenderer.a \
xbmc/cores/VideoRenderers/VideoShaders/VideoShaders.a \
xbmc/cores/VideoPlayer/VideoRenderers/VideoRenderer.a \
xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/VideoShaders.a \
xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/HwDecRender.a \
xbmc/cores/cores.a \
xbmc/cores/paplayer/paplayer.a \
xbmc/cores/playercorefactory/playercorefactory.a \
Expand Down Expand Up @@ -310,7 +307,7 @@ endif

# Setup some dependencies for subdir makes
xbmc/cores/paplayer/paplayer.a:
$(DVDPLAYER_ARCHIVES) : dvdpcodecs
$(VideoPlayer_ARCHIVES) : dvdpcodecs

lib/cpluff/libcpluff/.libs/libcpluff.a: force
$(MAKE) -C lib/cpluff/libcpluff
Expand Down Expand Up @@ -341,12 +338,7 @@ libaddon: exports
dvdpcodecs: dllloader
$(MAKE) -C lib/libdvd

ifeq (@USE_LIBSTAGEFRIGHT@,1)
dvdpextcodecs: lib@[email protected]
$(MAKE) -C xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS
else
dvdpextcodecs:
endif

eventclients:
ifeq ($(findstring osx,@ARCH@), osx)
Expand Down
2 changes: 1 addition & 1 deletion Makefile.include.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.pvr
INCLUDES+=-I@abs_top_srcdir@/addons/library.xbmc.codec
INCLUDES+=$(sort @INCLUDES@)
INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/VideoPlayer
DEFINES+= \
@ARCH_DEFINES@ \
-D_FILE_DEFINED \
Expand Down
2 changes: 1 addition & 1 deletion addons/library.kodi.audioengine/libKODI_audioengine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ class CAddonAEStream
* @note This function may return false if the stream is not resampling, if you wish to use this be sure to set the AESTREAM_FORCE_RESAMPLE option
* @param ratio the new sample rate ratio, calculated by ((double)desiredRate / (double)GetSampleRate())
*/
virtual bool SetResampleRatio(double Ratio);
virtual void SetResampleRatio(double Ratio);

/**
* Sginal a clock change
Expand Down
Loading