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.

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

support m3u8 format for pvr client #12

Open
wants to merge 232 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
232 commits
Select commit Hold shift + click to select a range
6d08978
[aml] add makefile for building against buildroot
Aug 22, 2012
d6780d9
[aml] silence compiler spew from gcc 4.4
Aug 22, 2012
2acc323
[aml] dvdnav: fix cross-compile
Oct 12, 2011
e20b663
[aml] don't define byte. it interferes with kernel headers
Aug 23, 2012
8a9d87d
[aml] rename byte to avoid system conflicts
Sep 10, 2012
e2cad40
[aml] set focus to the first non-disabled control
Mar 16, 2012
7d240aa
[aml] disable spin controls with only one entry
Mar 16, 2012
c6e72e8
[aml] introduce guisettings overrides (v2)
Mar 17, 2012
7464da5
[aml] allow packager to provide a base guisettings.xml
Mar 26, 2012
f523e23
[aml] Fix slow gui during fullscreen playback
Apr 10, 2012
e3f4cc6
[aml] frame-limit during fullscreen playback to avoid running at 100fps
Apr 10, 2012
6386bf5
[aml] speed up blending
Nov 27, 2011
4b53464
[aml] cut diffuse+blend render time by 1/3
Apr 10, 2012
3b419cd
[aml] Batch textures and their borders
Jan 3, 2012
66e5944
[aml] use native texturepacker for linux arm
Sep 6, 2012
a6ff4f4
[aml] skip dxt compression on all arm boards
Sep 6, 2012
7688b31
[aml] don't mark video control dirty for hardware players
Sep 14, 2012
c096563
[aml] add network Manager
davilla Sep 15, 2012
7174ed0
[aml] rename non-member var
Sep 19, 2012
00b29ed
[aml] fixed seeing usb keyboard/mouse devices that are inserted/remov…
davilla Aug 18, 2012
8c3c735
[aml] fixed, add UDevProvider to handle usb disk add/remove storage h…
davilla Apr 20, 2012
02b029c
[aml] fixed, add exfat to accepted partition types
davilla Apr 20, 2012
8a04a15
[aml] changed to handle ALT keys
davilla Mar 29, 2012
1987bb3
[aml] check and fail if trying to open .ifo (dvds)
davilla Sep 24, 2012
c58ccd9
[aml] amlplayer does not support dvds
davilla Sep 24, 2012
26c3c32
[aml] remove hdhomerun so other players can get it, add ifo so only d…
davilla Sep 24, 2012
9f9946a
[aml] add libdvdread hack to force ignore of /root (aml specific)
davilla Sep 24, 2012
d39a41a
[aml] respect the network manager as.xml setting
Oct 3, 2012
6207b61
[aml/droid] fix crash loading amlplayer
Oct 3, 2012
298aeeb
[aml] add macro for optional export resolving
Oct 3, 2012
f44ed42
[aml/droid] add config files if they exist in tools/android/packaging…
Oct 4, 2012
4f2a1cc
[aml-noupstream] aml-specific config files for android
Oct 4, 2012
5b6b78e
[aml] move lirc init before keyboard
Oct 5, 2012
483ed70
[aml] clear screen (in the right place) before shutdown
Oct 5, 2012
68ca5a7
[aml] 1) fixed subtitle lang/switching, 2) cosmetic change of __int64…
davilla Oct 8, 2012
5f20769
[droid] fix libssh
Oct 9, 2012
4efa863
[droid] sftp: skip saving known hosts for now
Oct 9, 2012
ec0b46e
[aml] fix sftp for amlplayer
Oct 9, 2012
103947d
[aml/droid] sync gui settings with linux
Oct 9, 2012
9e7b504
[aml] fix for crazy videos with >32 subtitles
Oct 10, 2012
acc8d52
[aml] clamp chapters, audio streams, video streams while we're at it
Oct 10, 2012
a73ee52
[aml] changed how to detect aml_present
davilla Nov 2, 2012
8e03290
[aml] cosmetics
davilla Nov 2, 2012
686f467
[aml] add chapter support
davilla Nov 8, 2012
b19ab48
[aml] fixed beta1 merge, missing --enable-player=amlplayer
davilla Nov 16, 2012
9369a41
changed, log the clamp value
davilla Oct 13, 2012
7e298ce
changed, reduce logging spew
davilla Oct 13, 2012
8aa3ff6
[aml] cleanup commented out functions
davilla Nov 16, 2012
5c5cf9b
add RegisterRenderFeaturesCallBack so a video codec can control the r…
davilla Oct 13, 2012
f0f9c83
add method to access dvdclock used by players without having to talk …
davilla Oct 13, 2012
d8ee7db
[aml] fixed build, audio_set_delay exists in our ics/android
davilla Nov 16, 2012
72a9b8a
[aml] fixed, revert mainline thread priority breakage until we fix bu…
davilla Nov 30, 2012
d66781a
[aml] tmp commit 1548.patch
davilla Nov 26, 2012
a56a66f
[aml] add DVDVideoCodecAmlogic
davilla Oct 11, 2012
2746693
[aml] fixed pause/resume under DVDVideoCodecAmlogic
davilla Dec 2, 2012
20d089f
[aml] move AMLUtils.cpp to utils dir and conditional build on amcodec…
davilla Dec 2, 2012
aba4125
[aml] simply a/v sync using DVDVideoCodecAmlogic
davilla Dec 3, 2012
319519f
[aml] fixed, do not fill hw video buffer. 2) cosmetic var rename.
davilla Dec 4, 2012
9bfe674
[aml] fixed missing checks for HAS_LIBAMCODEC
davilla Dec 4, 2012
bde45a1
[aml] changed, add iPhysicalId (pid) to hints
davilla Dec 5, 2012
e727a1b
[aml] fixed crash wirh realmedia content
davilla Dec 5, 2012
e2a8156
[aml] changed, allow ALSA to suspend
davilla Dec 5, 2012
39d7052
[aml] changed, if amcodec is enabled, do not use amlplayer for main p…
davilla Dec 5, 2012
7bb6c24
[aml] changed, suspend/resume SoftAE audio when amlplayer is used
davilla Dec 5, 2012
432224d
[aml] changed, play realmedai using amlplayer, we cannot play it usin…
davilla Dec 5, 2012
fb837c6
[aml] rename Amlogic.xxx to AMLCodec.xxx
davilla Dec 5, 2012
82e3c75
[aml] changed xbmc/android to support amcodec
davilla Dec 7, 2012
db904ac
[aml] fix passthough on android, system volume must be set to max bef…
davilla Dec 7, 2012
49026bc
[aml] cosmetics
davilla Dec 7, 2012
e509e31
[aml] fixed, force system volume to max so passthrough works
davilla Dec 8, 2012
0fc4e96
[aml] remove unused code
davilla Dec 8, 2012
8c22e33
[aml] fixed, use what we can do, not what we are asked to do
davilla Dec 8, 2012
a23ec37
[aml] fixed, am_private->vcodec.handle is valid for >= 0
davilla Dec 8, 2012
51251ff
[aml] changed, make amcodec a/v sync less sensitive
davilla Dec 11, 2012
70057ce
[aml] Changed, give android an additional 100ms audio latency
davilla Dec 12, 2012
22c296b
[aml] fixed, audio delay control
davilla Dec 12, 2012
3fd79a8
[aml] unhide teletextenabled, subtitles.charset, dvds.playerregion, d…
davilla Dec 16, 2012
a7b1794
[aml] fixed, android wifi
davilla Dec 18, 2012
40ed90d
[aml] 1) restore lost FRAMEBUFFER detect which fixes an error reverti…
davilla Dec 21, 2012
31b097b
[aml] changed, use functions in utils/AMLUtils.h
davilla Dec 21, 2012
5439c89
[aml] changed, run CDVDPlayerAudio:: Discontinuity1 with reduced cons…
davilla Dec 21, 2012
f87b9c4
[aml] fixed, always wait for a new picture to keep from filling hw vi…
davilla Dec 22, 2012
81c47b2
[droid] bump libass version to match ios
Dec 22, 2012
64338e2
[droid] package libass
Dec 22, 2012
657fb88
[aml] add PivosPowerSyscall class to handle m3 suspend
davilla Dec 23, 2012
7d1b5d8
[aml] finish rename of CAmlogic class to match the filename (AMLCodec)
davilla Dec 23, 2012
b67bae5
[aml] changed, expose pStream->r_frame_rate, fps from pStream->avg_fr…
davilla Dec 25, 2012
a89eb34
[aml] fixed, 1) video_rate can be wrong, use r_frame_rate instead of …
davilla Dec 25, 2012
e366a12
[aml] changed, also ignore m_pullupCorrection if RENDER_FMT_BYPASS, i…
davilla Dec 25, 2012
a3dfd73
[aml] changed, temp raise the trip fomr 100ms to 250ms for Discontinu…
davilla Dec 25, 2012
c5ec86a
delete context if connect fails
Dec 25, 2012
901d035
lock map and change order of delete and context destroy
Dec 26, 2012
89f5457
[aml] remove usless inlines, the compiler will take care of inlining …
davilla Dec 26, 2012
be572a7
[aml] fix busted locales in linux, probably still broken in android
Dec 27, 2012
fc919fa
[aml] fixed, 60 fps could be 1280x720/60p
davilla Dec 28, 2012
ed19c33
[aml] fixed, rfpsrate/rfpsscale comes from ffmpeg demus but these mig…
davilla Dec 28, 2012
44cc7e9
[aml] restore lost aml_probe_hdmi_audio function
davilla Dec 29, 2012
206362e
[aml] fixed, always disable video when not playing it or we can get f…
davilla Dec 31, 2012
0422886
[aml] rework m3 syspend/resume
davilla Dec 31, 2012
cba05c5
[aml] fixed, m3 1080p display
davilla Dec 31, 2012
0ab06cd
[aml] add suspend/result AE sink logging
davilla Dec 31, 2012
389ece5
[aml] fixed, playback of 60 fps video content
davilla Jan 1, 2013
badc8f1
[aml] fixed context menu 'remove safely' selection
davilla Jan 3, 2013
ea965e7
[aml] changed, bump up amlplayer udp buffer sizes
davilla Jan 5, 2013
48fd044
[aml] use amlplayer for udp:// streams
davilla Jan 5, 2013
b8cd8c6
[aml] fix h264 SD content in mp4 playback, video_rate is wrong
davilla Jan 6, 2013
c90b4bc
[aml] fixed typo
davilla Jan 6, 2013
5883705
[aml] fixed, trim amlplayer spin up/down time. Saves about 1 second o…
davilla Jan 6, 2013
496972f
[aml] change upd buffer values and trip levels
davilla Jan 7, 2013
7fce790
[aml] fixed, include width <= 720 in video rate exception
davilla Jan 7, 2013
074af12
[aml] fixed, SD h264 reporting as 30fps should be 24fps
davilla Jan 11, 2013
3bb2de7
[droid] bump librtmp from 2.3 to 2.4
davilla Jan 11, 2013
ea60424
[aml] fix configure logging for additional players/codecs
davilla Jan 13, 2013
10a036d
[aml] improve vc1 playback
davilla Jan 16, 2013
e0f472a
[aml] changed, never, ever trust pts in avi containers
davilla Jan 16, 2013
09cf21a
[aml] changed, if we get m_hints.ptsinvalid, nuke pts so we do not us…
davilla Jan 16, 2013
07f48ba
[aml] add debug logging to track pts adjustments
davilla Jan 16, 2013
6f6882d
[aml] fixed, mjpeg playback using hardware video decode
davilla Jan 18, 2013
4bc6141
Update xbmc/epg/EpgContainer.cpp
yang299kms Jan 19, 2013
9470572
add DVDVideoCodec::SetSpeed
davilla Jan 19, 2013
c6da2fc
[aml] implement DVDVideoCodec::SetSpeed for AMLCodec
davilla Jan 19, 2013
1150684
fixed amlplayer borks from merge
davilla Jan 21, 2013
da9057a
fixed more softAE borks from merge
davilla Jan 21, 2013
8303e88
[aml] fixed, alsa/kernel lies, so map everything to 44100 or 48000
davilla Jan 21, 2013
fa1a466
[aml] fixed, expand video rate exception to include more '30fps' content
davilla Jan 21, 2013
59db340
[aml] 1) fixed video buffer feed when showing still frames, 2) fixed …
davilla Jan 23, 2013
8b243ab
[aml] add frame rate tracking
davilla Jan 23, 2013
b6857a6
[aml] fixed some regressions, 100 bytes is too hi for still frames
davilla Jan 23, 2013
d4d94b9
[aml] fixed playback of video content with 24kHz audio
davilla Jan 27, 2013
af5c26a
Revert "[aml] introduce guisettings overrides (v2)"
Jan 29, 2013
13cd0b6
[aml] introduce guisettings overrides
Mar 17, 2012
5f6a9a7
[aml] fixed wifi detect under jellybean
davilla Jan 30, 2013
0cce565
[aml] fixed network WakeOnLan
davilla Feb 1, 2013
030461b
[aml] fixed compile under linux
davilla Feb 1, 2013
931366e
[aml] fixed displayed video fps
davilla Feb 2, 2013
6af1243
Revert "[aml] Changed, give android an additional 100ms audio latency"
davilla Feb 2, 2013
106006b
[aml] fixed wmv playback
davilla Feb 2, 2013
ff8ddfd
[aml] fixed rmvb playback, setting volume too early on m1 can bork pl…
davilla Feb 3, 2013
e55bb98
Force Interface List and Accesspoint List refresh on call to CPosixNe…
toys4me Feb 6, 2013
9622773
Merge pull request #5 from toys4me/bug/WifiRefresh
davilla Feb 6, 2013
42bc2e2
[aml] fixed, restore 'full stretch' so we can actually stretch
davilla Feb 6, 2013
3656dcb
[aml] add CODEC_ID_AVS, CODEC_ID_CAVS
davilla Feb 13, 2013
4b9c64a
[aml] temp hack to disable display mode, we have to show display mode…
davilla Feb 13, 2013
79085bd
[aml] fixes nfs debug boot of rootfs
davilla Feb 14, 2013
f3d3c28
fixed, CSoftAEStream::GetCacheTime was calculated wrong
davilla Feb 11, 2013
c015b7c
Revert "[aml] introduce guisettings overrides"
Feb 14, 2013
b5d00b6
[aml] introduce guisettings overrides v3
Mar 17, 2012
c677cdf
Revert "[aml] fixed, force system volume to max so passthrough works"
davilla Feb 15, 2013
193cac7
[aml] fix audio issues with SoftAE, temp until Frodo 12.1 comes in
davilla Feb 15, 2013
fbe68b2
[aml] fix seeded guisettings with new profiles
Feb 15, 2013
cffd33a
[aml] silence debug log spew
davilla Feb 19, 2013
0ddb90b
[aml] remove obsolete code
davilla Feb 18, 2013
44c6014
[aml] fixed, seeking would break a/v sync
davilla Feb 18, 2013
a8b27d9
[aml] fixed FrameRateTracking code, still unused at the moment
davilla Feb 18, 2013
128ad9e
[aml] refactor Libamplayer related code
davilla Feb 18, 2013
920d785
[aml] refactor a/v sync to be less intrusive
davilla Feb 19, 2013
a21217a
[aml] fixed lingering stuck in pause (amcodec bug)
davilla Feb 19, 2013
f87b042
[aml] add mx detect
davilla Feb 20, 2013
cc31a53
[aml] fixed, network might not be up when we are launched, so keep tr…
davilla Feb 20, 2013
7aeee6d
[aml] fixed, restrict network retry to android
davilla Feb 22, 2013
e0189c9
[aml] cosmetics
davilla Feb 25, 2013
7874d6c
[aml] fixed, use the right aspect ratio for display
davilla Feb 25, 2013
2c8f20d
[aml] fixed, add missing sample rates
davilla Feb 25, 2013
482c7bf
[aml] fixed, pts_pcrscr does not like negative values
davilla Feb 26, 2013
00c729c
[aml] changed, digital_raw => 1 for m1, => 2 for m3
davilla Feb 26, 2013
ebb7b6e
[aml] fixed, audio silence blips, make periodSize >= 1024 by forcing …
davilla Feb 26, 2013
fb89276
[aml] refactor resolution handling
davilla Feb 27, 2013
693a7a7
[aml] cosmetics
davilla Feb 27, 2013
aa9244a
[gles] fix compiler warning
davilla Feb 27, 2013
e8b47fc
[gles] fixed, m_iVSyncMode var in two places with different type, opp…
davilla Feb 27, 2013
0c9d3c3
[aml] fixed, check for hints.aspect > 0.0 && !hints.forced_aspect
davilla Feb 28, 2013
f31eb4e
[aml] fix memleak, add queue mutex, cleanup
davilla Feb 28, 2013
7733a3a
[aml] more temp AE fixes, this time from https://github.com/xbmc/xbmc…
davilla Feb 28, 2013
f8b834d
[aml] temp fixes, from frodo 12.1 backports, replace when we merge wi…
davilla Feb 28, 2013
be36243
[aml] fixed double deviceid from f8b834d2ec031a13c0297bb49fabe9aad386…
davilla Mar 2, 2013
acc683f
[aml] temp fixes, from frodo 12.1 backports, replace when we merge wi…
davilla Mar 2, 2013
0f782a8
[aml] fixed, do not talk to codec if it is not open yet
davilla Mar 2, 2013
2af1db8
[aml] fixed ffmpeg-rtp to use four byte startcodes
davilla Mar 3, 2013
bd0da67
[aml] fixed ffmpeg-rtp, try tcp first
davilla Mar 3, 2013
4b20706
[aml] fixed ffmpeg-rtp, nb_rtsp_streams bug on send SETUP cmd
davilla Mar 3, 2013
e7654f6
Allow Powerdown menu for devices other than M1
toys4me Mar 4, 2013
f4b1740
AE: Fix resample of e.g. 192 khz to 48 khz audio by scaling the usual…
fritsch Mar 5, 2013
105d849
[aml] general cleanup
davilla Mar 8, 2013
52710d7
add function to parse for mpeg2 aspect_ratio_information
davilla Mar 8, 2013
f8f588f
[aml] fixed, add mpeg2 aspect ratio tracking
davilla Mar 8, 2013
4a390b2
silence debug spew
davilla Mar 8, 2013
1e6d0f5
[aml] temp fixes, from frodo 12.1 backports, replace when we merge wi…
davilla Mar 8, 2013
9b933dd
[aml] fixed droid build, add missing vformat
davilla Mar 8, 2013
f534d76
fixed, hook GetPreferredResolution in WinSystemEGL
davilla Mar 10, 2013
423cf14
changed, on boot display/mode contains a prefered res so check it 1st
davilla Mar 10, 2013
1fe026d
[aml] changed, track width, height and frame rate as well as aspect r…
davilla Mar 19, 2013
3fa5536
[aml] changed, kernel driver contains default 'decoder ppmgr amvideo'…
davilla Mar 19, 2013
18a2369
Merge pull request #7 from toys4me/PR/SafeShutdown
davilla Mar 19, 2013
703a61a
[aml] fixed, track speed even if decoder is not open
davilla Mar 19, 2013
376572d
changed, assert(0) is nasty, this could just be a bad audio packet
davilla Mar 19, 2013
e0f8b4a
Add packet-fps-change-detection for PVRClient
Apr 3, 2013
435d415
added: startposition to xbmc.PlayPlaylist python method
Mar 22, 2013
8616a6d
give startno into PlaylistPlayerPlay
whaupt Mar 25, 2013
1e8f64b
Merge pull request #8 from JoeKar/bug/pvr-hints.fps
davilla Apr 10, 2013
9981241
[aml] adjust video_rate tweaks and back off pts error correction
davilla Apr 10, 2013
540e72e
[aml] fixed compile warning
davilla Apr 12, 2013
7319d9f
[aml] fixed, if mpeg2 video, check the NAL to find width,height,aspec…
davilla Apr 12, 2013
c660cad
[aml] sync to mainline AudioEngine
davilla Apr 12, 2013
e0a862b
AERemap: Fix mixing front and rear channels in some 5.1 setups
manio Apr 9, 2013
df4e6ab
[aml] more AE mainline fixes
davilla Apr 14, 2013
13a119d
[aml] disable AE auto suspend
davilla Apr 14, 2013
d320e35
[aml] fixed music playback, grAEken bites again
davilla Apr 14, 2013
6a3b120
Merge pull request #11 from at-visions/pivos_python_playlist
davilla Apr 15, 2013
b68ff2b
Extend the forwarding of stream informations (hints)
Apr 14, 2013
698283e
fixed, audio on pivos/android seems to run 1/4 second delayed
davilla Apr 17, 2013
ecd2d3d
feature, add as.xml control over the delay until busy dialog is shown…
davilla Apr 17, 2013
fa8ed14
Added hotplug support for Linux input devices.
dezi Mar 18, 2013
6ed8c9b
[aml] fixed ff/rw
davilla Apr 18, 2013
16e38ba
support m3u8 format for pvr client
ljwzsjs Apr 19, 2013
b270ba9
[aml] fixed aspect ratio, hints.aspect == 1 typically means a default…
davilla Apr 24, 2013
be3c2f4
[aml] fix tvheadend, a) passing 1st NAL as three byte, b) aml pts ran…
davilla Apr 24, 2013
46e3921
[aml] fixed, too agressive in previous commit, some video demux conte…
davilla Apr 30, 2013
dfaf472
mainline syncs for audio fixes
davilla Apr 30, 2013
d9119f2
[aml] fixed, add ifdefs for pivos changes
davilla Apr 30, 2013
ae3f74e
disable auto mount usb
ljwzsjs May 22, 2013
2840e9f
GUIScrollBarControl: fix onright/ondown navigation when master contro…
pieh Apr 5, 2013
a36a92b
Merge pull request #15 from at-visions/atv/pivos/scrollbar
davilla May 27, 2013
3b3cbc6
Merge remote-tracking branch 'Pivosgroup/master'
ljwzsjs May 31, 2013
c93b0cf
[aml] privatize m_pPlayer so we can provide locking access
davilla Jun 4, 2013
297bb13
[aml] refactor CBitstreamConverter and add CBitstreamParser
davilla Jun 11, 2013
6544ef3
[aml] fixed slow startup
davilla Jun 11, 2013
dc83feb
[aml] fixed, streaming sites that stream avcC, convert avcC to annex-b
davilla Jun 11, 2013
ef340fa
add missing stat() filesystem wrapper - fixes reading VIDEO_TS dvds o…
May 15, 2013
276c11f
[aml] fixed android build
davilla Jun 14, 2013
a23c617
support load duration form stack:// path
ljwzsjs Jun 14, 2013
d5dcc29
Merge branch 'master' of https://github.com/ljwzsjs/xbmc
ljwzsjs Jun 14, 2013
7840631
Merge remote-tracking branch 'xios/master'
ljwzsjs Jun 16, 2013
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
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,8 @@ lib/cmyth/Makefile
/xbmc/cores/amlplayer/Makefile
/xbmc/cores/omxplayer/Makefile

/xbmc/utils/Makefile

# /lib/ffmpeg/
/lib/ffmpeg/config.h
/lib/ffmpeg/config.err
Expand Down Expand Up @@ -1099,6 +1101,7 @@ lib/cmyth/Makefile

# /xbmc/network/
/xbmc/network/Makefile
/xbmc/network/linux/Makefile
/xbmc/network/upnp/Makefile

# /lib/libRTV/
Expand Down
1 change: 1 addition & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ DIRECTORY_ARCHIVES=$(DVDPLAYER_ARCHIVES) \
xbmc/pvr/timers/pvrtimers.a \
xbmc/pvr/windows/pvrwindows.a \
xbmc/rendering/rendering.a \
xbmc/security/security.a \
xbmc/settings/settings.a \
xbmc/storage/storage.a \
xbmc/utils/utils.a \
Expand Down
179 changes: 179 additions & 0 deletions addons/skin.confluence/720p/DialogAccessPoints.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
<window id="141">
<defaultcontrol>3</defaultcontrol>
<include>dialogeffect</include>
<controls>
<control type="group">
<posx>340</posx>
<posy>110</posy>
<width>600</width>
<height>500</height>
<control type="image">
<description>background image</description>
<posx>0</posx>
<posy>0</posy>
<width>600</width>
<height>500</height>
<texture border="40">DialogBack.png</texture>
<visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
</control>
<control type="image">
<description>background image</description>
<posx>0</posx>
<posy>0</posy>
<width>600</width>
<height>500</height>
<texture border="40">DialogBack2.png</texture>
<visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
</control>
<control type="image">
<description>Dialog Header image</description>
<posx>40</posx>
<posy>16</posy>
<width>520</width>
<height>40</height>
<texture>dialogheader.png</texture>
</control>
<control type="label" id="1">
<description>heading label</description>
<posx>40</posx>
<posy>20</posy>
<width>520</width>
<height>30</height>
<font>font13_title</font>
<label>1046</label>
<align>center</align>
<aligny>center</aligny>
<textcolor>selected</textcolor>
<shadowcolor>black</shadowcolor>
</control>
<control type="button">
<description>Close Window button</description>
<posx>510</posx>
<posy>15</posy>
<width>64</width>
<height>32</height>
<label>-</label>
<font>-</font>
<onclick>PreviousMenu</onclick>
<texturefocus>DialogCloseButton-focus.png</texturefocus>
<texturenofocus>DialogCloseButton.png</texturenofocus>
<onleft>3</onleft>
<onright>3</onright>
<onup>3</onup>
<ondown>3</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>
<control type="list" id="3">
<posx>20</posx>
<posy>70</posy>
<width>530</width>
<height>400</height>
<onup>3</onup>
<ondown>3</ondown>
<onleft>61</onleft>
<onright>61</onright>
<pagecontrol>61</pagecontrol>
<scrolltime>200</scrolltime>
<itemlayout height="40" width="530">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>530</width>
<height>40</height>
<texture border="0,2,0,2">MenuItemNF.png</texture>
</control>
<control type="image">
<posx>475</posx>
<posy>10</posy>
<width>20</width>
<height>20</height>
<visible>!IsEmpty(ListItem.Property(encryption))</visible>
<texture>ap-lock.png</texture>
</control>
<control type="image">
<posx>440</posx>
<posy>5</posy>
<width>30</width>
<height>30</height>
<texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>40</width>
<height>40</height>
<texture>$INFO[ListItem.Property(state)].png</texture>
</control>
<control type="label">
<posx>40</posx>
<posy>0</posy>
<width>490</width>
<height>40</height>
<font>font13</font>
<textcolor>grey2</textcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
</control>
</itemlayout>
<focusedlayout height="40" width="530">
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>530</width>
<height>40</height>
<texture border="0,2,0,2">MenuItemFO.png</texture>
</control>
<control type="image">
<posx>475</posx>
<posy>10</posy>
<width>20</width>
<height>20</height>
<visible>!IsEmpty(ListItem.Property(encryption))</visible>
<texture>ap-lock.png</texture>
</control>
<control type="image">
<posx>440</posx>
<posy>5</posy>
<width>30</width>
<height>30</height>
<texture>ap-signal$INFO[ListItem.Property(signal)].png</texture>
</control>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>40</width>
<height>40</height>
<texture>$INFO[ListItem.Property(state)].png</texture>
</control>
<control type="label">
<posx>40</posx>
<posy>0</posy>
<width>490</width>
<height>40</height>
<font>font13</font>
<textcolor>selected</textcolor>
<align>left</align>
<aligny>center</aligny>
<label>$INFO[ListItem.Label]</label>
</control>
</focusedlayout>
</control>
<control type="scrollbar" id="61">
<posx>555</posx>
<posy>70</posy>
<width>25</width>
<height>400</height>
<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
<textureslidernib>ScrollBarNib.png</textureslidernib>
<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
<onleft>3</onleft>
<onright>3</onright>
<showonepage>false</showonepage>
<orientation>vertical</orientation>
</control>
</control>
</controls>
</window>
2 changes: 1 addition & 1 deletion addons/skin.confluence/media/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ all: $(TARGET)
.PHONY: force

$(TARGET): $(XBMCTEX) $(IMAGES)
ifeq (@USE_ANDROID@,1)
ifeq (@ARCH@,arm)
$(XBMCTEX) -use_none -input . -output $(TARGET)
else
$(XBMCTEX) -input . -output $(TARGET)
Expand Down
Binary file added addons/skin.confluence/media/ap-lock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/ap-signal5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/connected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/connecting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added addons/skin.confluence/media/disconnected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 42 additions & 3 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,21 @@ AC_DEFUN([XB_ADD_PLAYER],
esac
])

# check for enabling additional codecs
AC_DEFUN([XB_ADD_CODEC],
[
AC_MSG_CHECKING([for $2])
case $add_codecs in
*$2*)
AC_SUBST([USE_$1], 1)
AC_DEFINE([HAS_$1], 1, [using $2])
AC_MSG_RESULT([enabling $2])
;;
*)
AC_MSG_RESULT([$2 is not enabled])
esac
])

# check for library basenames
AC_DEFUN([XB_FIND_SONAME],
[
Expand Down Expand Up @@ -507,6 +522,12 @@ AC_ARG_ENABLE([gtest],
[configure_gtest=$enableval],
[configure_gtest=no])

AC_ARG_ENABLE([codec],
[AS_HELP_STRING([--enable-codec],
[enable additional codecs from a list of comma separated names, (default is none, choices are amcodec)])],
[add_codecs=$enableval],
[add_codecs=no])

### External libraries options
AC_ARG_ENABLE([external-libraries],
[AS_HELP_STRING([--enable-external-libraries],
Expand Down Expand Up @@ -622,10 +643,12 @@ case $host in
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
;;
arm*-*-linux-gnu*)
use_texturepacker=no
use_texturepacker_native=yes
ARCH="arm"
use_arch="arm"
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
CFLAGS="$CFLAGS -Wno-psabi -Wa,-mno-warn-deprecated"
CXXFLAGS="$CXXFLAGS -Wno-psabi -Wa,-mno-warn-deprecated"
;;
arm*-*linux-android*)
target_platform=target_android
Expand Down Expand Up @@ -1830,6 +1853,14 @@ case $add_players in
;;
esac

# additional internal codecs
case $add_codecs in
*amcodec*)
AC_CHECK_HEADER([amlplayer/codec_error.h],, AC_MSG_ERROR($missing_headers))
XB_ADD_CODEC([LIBAMCODEC], [amcodec])
;;
esac

# platform specific bin utilities
if test "$host_vendor" != "apple" ; then
AC_CHECK_PROG(HAVE_GAWK,gawk,"yes","no",)
Expand Down Expand Up @@ -2283,11 +2314,17 @@ else
fi

if test "x$add_players" != "xno"; then
final_message="$final_message\n additional players:\tYes"
final_message="$final_message\n additional players:\tYes, $add_players"
else
final_message="$final_message\n additional players:\tNo"
fi

if test "x$add_codecs" != "xno"; then
final_message="$final_message\n additional codecs:\tYes, $add_codecs"
else
final_message="$final_message\n additional codecs:\tNo"
fi

### External libraries messages

if test "$use_external_ffmpeg" = "yes"; then
Expand Down Expand Up @@ -2355,6 +2392,7 @@ OUTPUT_FILES="Makefile \
xbmc/guilib/Makefile \
xbmc/interfaces/Makefile \
xbmc/network/Makefile \
xbmc/network/linux/Makefile \
xbmc/network/upnp/Makefile \
lib/libRTV/Makefile \
lib/libexif/Makefile \
Expand Down Expand Up @@ -2387,7 +2425,8 @@ OUTPUT_FILES="Makefile \
xbmc/peripherals/devices/Makefile \
xbmc/android/activity/Makefile \
xbmc/android/loader/Makefile \
xbmc/main/Makefile"
xbmc/main/Makefile \
xbmc/utils/Makefile"

if test "$use_skin_touched" = "yes"; then
OUTPUT_FILES="$OUTPUT_FILES addons/skin.touched/media/Makefile"
Expand Down
18 changes: 16 additions & 2 deletions language/English/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -2555,7 +2555,9 @@ msgctxt "#713"
msgid "HTTP proxy"
msgstr ""

#empty string with id 714
msgctxt "#714"
msgid "- Network Connection"
msgstr ""

msgctxt "#715"
msgid "- Assignment"
Expand Down Expand Up @@ -11015,8 +11017,20 @@ msgctxt "#33200"
msgid "Detected New Connection"
msgstr ""

#empty strings from id 33201 to 33999
msgctxt "#33201"
msgid "Available connections"
msgstr ""

msgctxt "#33202"
msgid "Disconnected"
msgstr ""

msgctxt "#33203"
msgid "Connecting"
msgstr ""

#translators: no need to add these to your language files
#empty strings from id 33204 to 33999

msgctxt "#34000"
msgid "Lame"
Expand Down
4 changes: 2 additions & 2 deletions lib/ffmpeg/libavformat/rtpdec_h264.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ static int sdp_parse_fmtp_config_h264(AVStream * stream,
h264_data->level_idc = level_idc;
}
} else if (!strcmp(attr, "sprop-parameter-sets")) {
uint8_t start_sequence[]= { 0, 0, 1 };
uint8_t start_sequence[]= { 0, 0, 0, 1 };
codec->extradata_size= 0;
codec->extradata= NULL;

Expand Down Expand Up @@ -176,7 +176,7 @@ static int h264_handle_packet(AVFormatContext *ctx,
uint8_t nal = buf[0];
uint8_t type = (nal & 0x1f);
int result= 0;
uint8_t start_sequence[]= {0, 0, 1};
uint8_t start_sequence[]= {0, 0, 0, 1};

#ifdef DEBUG
assert(data);
Expand Down
2 changes: 1 addition & 1 deletion lib/ffmpeg/libavformat/rtsp.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
break;
case 'a':
if (av_strstart(p, "control:", &p)) {
if (s->nb_streams == 0) {
if (rt->nb_rtsp_streams == 0) {
if (!strncmp(p, "rtsp://", 7))
av_strlcpy(rt->control_uri, p,
sizeof(rt->control_uri));
Expand Down
4 changes: 2 additions & 2 deletions lib/ffmpeg/libavformat/rtsp.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
* Network layer over which RTP/etc packet data will be transported.
*/
enum RTSPLowerTransport {
RTSP_LOWER_TRANSPORT_UDP = 0, /**< UDP/unicast */
RTSP_LOWER_TRANSPORT_TCP = 1, /**< TCP; interleaved in RTSP */
RTSP_LOWER_TRANSPORT_TCP = 0, /**< TCP; interleaved in RTSP */
RTSP_LOWER_TRANSPORT_UDP = 1, /**< UDP/unicast */
RTSP_LOWER_TRANSPORT_UDP_MULTICAST = 2, /**< UDP/multicast */
RTSP_LOWER_TRANSPORT_NB,
RTSP_LOWER_TRANSPORT_HTTP = 8, /**< HTTP tunneled - not a proper
Expand Down
Loading