Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Steve Lhomme
VLC
Commits
395db15f
Commit
395db15f
authored
Feb 19, 2016
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: adaptative: rename to adaptive
parent
b1a23af3
Changes
140
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
140 changed files
with
381 additions
and
381 deletions
+381
-381
modules/MODULES_LIST
modules/MODULES_LIST
+1
-1
modules/demux/Makefile.am
modules/demux/Makefile.am
+110
-110
modules/demux/adaptive/ChunksSource.hpp
modules/demux/adaptive/ChunksSource.hpp
+1
-1
modules/demux/adaptive/PlaylistManager.cpp
modules/demux/adaptive/PlaylistManager.cpp
+6
-6
modules/demux/adaptive/PlaylistManager.h
modules/demux/adaptive/PlaylistManager.h
+1
-1
modules/demux/adaptive/SegmentTracker.cpp
modules/demux/adaptive/SegmentTracker.cpp
+3
-3
modules/demux/adaptive/SegmentTracker.hpp
modules/demux/adaptive/SegmentTracker.hpp
+1
-1
modules/demux/adaptive/StreamFormat.cpp
modules/demux/adaptive/StreamFormat.cpp
+1
-1
modules/demux/adaptive/StreamFormat.hpp
modules/demux/adaptive/StreamFormat.hpp
+1
-1
modules/demux/adaptive/Streams.cpp
modules/demux/adaptive/Streams.cpp
+2
-2
modules/demux/adaptive/Streams.hpp
modules/demux/adaptive/Streams.hpp
+1
-1
modules/demux/adaptive/Time.hpp
modules/demux/adaptive/Time.hpp
+0
-0
modules/demux/adaptive/adaptive.cpp
modules/demux/adaptive/adaptive.cpp
+11
-11
modules/demux/adaptive/http/BytesRange.cpp
modules/demux/adaptive/http/BytesRange.cpp
+1
-1
modules/demux/adaptive/http/BytesRange.hpp
modules/demux/adaptive/http/BytesRange.hpp
+1
-1
modules/demux/adaptive/http/Chunk.cpp
modules/demux/adaptive/http/Chunk.cpp
+1
-1
modules/demux/adaptive/http/Chunk.h
modules/demux/adaptive/http/Chunk.h
+1
-1
modules/demux/adaptive/http/Downloader.cpp
modules/demux/adaptive/http/Downloader.cpp
+1
-1
modules/demux/adaptive/http/Downloader.hpp
modules/demux/adaptive/http/Downloader.hpp
+1
-1
modules/demux/adaptive/http/HTTPConnection.cpp
modules/demux/adaptive/http/HTTPConnection.cpp
+2
-2
modules/demux/adaptive/http/HTTPConnection.hpp
modules/demux/adaptive/http/HTTPConnection.hpp
+1
-1
modules/demux/adaptive/http/HTTPConnectionManager.cpp
modules/demux/adaptive/http/HTTPConnectionManager.cpp
+1
-1
modules/demux/adaptive/http/HTTPConnectionManager.h
modules/demux/adaptive/http/HTTPConnectionManager.h
+1
-1
modules/demux/adaptive/http/Sockets.cpp
modules/demux/adaptive/http/Sockets.cpp
+1
-1
modules/demux/adaptive/http/Sockets.hpp
modules/demux/adaptive/http/Sockets.hpp
+1
-1
modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
+1
-1
modules/demux/adaptive/logic/AbstractAdaptationLogic.h
modules/demux/adaptive/logic/AbstractAdaptationLogic.h
+1
-1
modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
+2
-2
modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
+1
-1
modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
+2
-2
modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
+1
-1
modules/demux/adaptive/logic/IDownloadRateObserver.h
modules/demux/adaptive/logic/IDownloadRateObserver.h
+1
-1
modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
+2
-2
modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
+1
-1
modules/demux/adaptive/logic/Representationselectors.cpp
modules/demux/adaptive/logic/Representationselectors.cpp
+1
-1
modules/demux/adaptive/logic/Representationselectors.hpp
modules/demux/adaptive/logic/Representationselectors.hpp
+1
-1
modules/demux/adaptive/mp4/AtomsReader.cpp
modules/demux/adaptive/mp4/AtomsReader.cpp
+1
-1
modules/demux/adaptive/mp4/AtomsReader.hpp
modules/demux/adaptive/mp4/AtomsReader.hpp
+1
-1
modules/demux/adaptive/playlist/AbstractPlaylist.cpp
modules/demux/adaptive/playlist/AbstractPlaylist.cpp
+1
-1
modules/demux/adaptive/playlist/AbstractPlaylist.hpp
modules/demux/adaptive/playlist/AbstractPlaylist.hpp
+1
-1
modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
+2
-2
modules/demux/adaptive/playlist/BaseAdaptationSet.h
modules/demux/adaptive/playlist/BaseAdaptationSet.h
+1
-1
modules/demux/adaptive/playlist/BasePeriod.cpp
modules/demux/adaptive/playlist/BasePeriod.cpp
+1
-1
modules/demux/adaptive/playlist/BasePeriod.h
modules/demux/adaptive/playlist/BasePeriod.h
+1
-1
modules/demux/adaptive/playlist/BaseRepresentation.cpp
modules/demux/adaptive/playlist/BaseRepresentation.cpp
+2
-2
modules/demux/adaptive/playlist/BaseRepresentation.h
modules/demux/adaptive/playlist/BaseRepresentation.h
+1
-1
modules/demux/adaptive/playlist/CommonAttributesElements.cpp
modules/demux/adaptive/playlist/CommonAttributesElements.cpp
+1
-1
modules/demux/adaptive/playlist/CommonAttributesElements.h
modules/demux/adaptive/playlist/CommonAttributesElements.h
+1
-1
modules/demux/adaptive/playlist/ICanonicalUrl.hpp
modules/demux/adaptive/playlist/ICanonicalUrl.hpp
+1
-1
modules/demux/adaptive/playlist/ID.cpp
modules/demux/adaptive/playlist/ID.cpp
+1
-1
modules/demux/adaptive/playlist/ID.hpp
modules/demux/adaptive/playlist/ID.hpp
+1
-1
modules/demux/adaptive/playlist/Inheritables.cpp
modules/demux/adaptive/playlist/Inheritables.cpp
+1
-1
modules/demux/adaptive/playlist/Inheritables.hpp
modules/demux/adaptive/playlist/Inheritables.hpp
+1
-1
modules/demux/adaptive/playlist/Segment.cpp
modules/demux/adaptive/playlist/Segment.cpp
+2
-2
modules/demux/adaptive/playlist/Segment.h
modules/demux/adaptive/playlist/Segment.h
+1
-1
modules/demux/adaptive/playlist/SegmentBase.cpp
modules/demux/adaptive/playlist/SegmentBase.cpp
+1
-1
modules/demux/adaptive/playlist/SegmentBase.h
modules/demux/adaptive/playlist/SegmentBase.h
+1
-1
modules/demux/adaptive/playlist/SegmentChunk.cpp
modules/demux/adaptive/playlist/SegmentChunk.cpp
+2
-2
modules/demux/adaptive/playlist/SegmentChunk.hpp
modules/demux/adaptive/playlist/SegmentChunk.hpp
+1
-1
modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
+1
-1
modules/demux/adaptive/playlist/SegmentInfoCommon.h
modules/demux/adaptive/playlist/SegmentInfoCommon.h
+1
-1
modules/demux/adaptive/playlist/SegmentInformation.cpp
modules/demux/adaptive/playlist/SegmentInformation.cpp
+1
-1
modules/demux/adaptive/playlist/SegmentInformation.hpp
modules/demux/adaptive/playlist/SegmentInformation.hpp
+1
-1
modules/demux/adaptive/playlist/SegmentList.cpp
modules/demux/adaptive/playlist/SegmentList.cpp
+1
-1
modules/demux/adaptive/playlist/SegmentList.h
modules/demux/adaptive/playlist/SegmentList.h
+1
-1
modules/demux/adaptive/playlist/SegmentTemplate.cpp
modules/demux/adaptive/playlist/SegmentTemplate.cpp
+1
-1
modules/demux/adaptive/playlist/SegmentTemplate.h
modules/demux/adaptive/playlist/SegmentTemplate.h
+1
-1
modules/demux/adaptive/playlist/SegmentTimeline.cpp
modules/demux/adaptive/playlist/SegmentTimeline.cpp
+1
-1
modules/demux/adaptive/playlist/SegmentTimeline.h
modules/demux/adaptive/playlist/SegmentTimeline.h
+1
-1
modules/demux/adaptive/playlist/Templates.hpp
modules/demux/adaptive/playlist/Templates.hpp
+1
-1
modules/demux/adaptive/playlist/Url.cpp
modules/demux/adaptive/playlist/Url.cpp
+1
-1
modules/demux/adaptive/playlist/Url.hpp
modules/demux/adaptive/playlist/Url.hpp
+1
-1
modules/demux/adaptive/plumbing/CommandsQueue.cpp
modules/demux/adaptive/plumbing/CommandsQueue.cpp
+2
-2
modules/demux/adaptive/plumbing/CommandsQueue.hpp
modules/demux/adaptive/plumbing/CommandsQueue.hpp
+1
-1
modules/demux/adaptive/plumbing/Demuxer.cpp
modules/demux/adaptive/plumbing/Demuxer.cpp
+1
-1
modules/demux/adaptive/plumbing/Demuxer.hpp
modules/demux/adaptive/plumbing/Demuxer.hpp
+1
-1
modules/demux/adaptive/plumbing/FakeESOut.cpp
modules/demux/adaptive/plumbing/FakeESOut.cpp
+2
-2
modules/demux/adaptive/plumbing/FakeESOut.hpp
modules/demux/adaptive/plumbing/FakeESOut.hpp
+1
-1
modules/demux/adaptive/plumbing/FakeESOutID.cpp
modules/demux/adaptive/plumbing/FakeESOutID.cpp
+1
-1
modules/demux/adaptive/plumbing/FakeESOutID.hpp
modules/demux/adaptive/plumbing/FakeESOutID.hpp
+1
-1
modules/demux/adaptive/plumbing/SourceStream.cpp
modules/demux/adaptive/plumbing/SourceStream.cpp
+1
-1
modules/demux/adaptive/plumbing/SourceStream.hpp
modules/demux/adaptive/plumbing/SourceStream.hpp
+1
-1
modules/demux/adaptive/tools/Conversions.cpp
modules/demux/adaptive/tools/Conversions.cpp
+0
-0
modules/demux/adaptive/tools/Conversions.hpp
modules/demux/adaptive/tools/Conversions.hpp
+0
-0
modules/demux/adaptive/tools/Debug.hpp
modules/demux/adaptive/tools/Debug.hpp
+0
-0
modules/demux/adaptive/tools/Helper.cpp
modules/demux/adaptive/tools/Helper.cpp
+1
-1
modules/demux/adaptive/tools/Helper.h
modules/demux/adaptive/tools/Helper.h
+1
-1
modules/demux/adaptive/tools/Properties.hpp
modules/demux/adaptive/tools/Properties.hpp
+0
-0
modules/demux/adaptive/tools/Retrieve.cpp
modules/demux/adaptive/tools/Retrieve.cpp
+2
-2
modules/demux/adaptive/tools/Retrieve.hpp
modules/demux/adaptive/tools/Retrieve.hpp
+1
-1
modules/demux/adaptive/xml/DOMHelper.cpp
modules/demux/adaptive/xml/DOMHelper.cpp
+1
-1
modules/demux/adaptive/xml/DOMHelper.h
modules/demux/adaptive/xml/DOMHelper.h
+1
-1
modules/demux/adaptive/xml/DOMParser.cpp
modules/demux/adaptive/xml/DOMParser.cpp
+1
-1
modules/demux/adaptive/xml/DOMParser.h
modules/demux/adaptive/xml/DOMParser.h
+1
-1
modules/demux/adaptive/xml/Node.cpp
modules/demux/adaptive/xml/Node.cpp
+1
-1
modules/demux/adaptive/xml/Node.h
modules/demux/adaptive/xml/Node.h
+1
-1
modules/demux/dash/DASHManager.cpp
modules/demux/dash/DASHManager.cpp
+5
-5
modules/demux/dash/DASHManager.h
modules/demux/dash/DASHManager.h
+4
-4
modules/demux/dash/DASHStream.hpp
modules/demux/dash/DASHStream.hpp
+2
-2
modules/demux/dash/mp4/IndexReader.cpp
modules/demux/dash/mp4/IndexReader.cpp
+1
-1
modules/demux/dash/mp4/IndexReader.hpp
modules/demux/dash/mp4/IndexReader.hpp
+4
-4
modules/demux/dash/mpd/AdaptationSet.cpp
modules/demux/dash/mpd/AdaptationSet.cpp
+1
-1
modules/demux/dash/mpd/AdaptationSet.h
modules/demux/dash/mpd/AdaptationSet.h
+3
-3
modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
+2
-2
modules/demux/dash/mpd/DASHSegment.cpp
modules/demux/dash/mpd/DASHSegment.cpp
+4
-4
modules/demux/dash/mpd/DASHSegment.h
modules/demux/dash/mpd/DASHSegment.h
+3
-3
modules/demux/dash/mpd/IsoffMainParser.cpp
modules/demux/dash/mpd/IsoffMainParser.cpp
+12
-12
modules/demux/dash/mpd/IsoffMainParser.h
modules/demux/dash/mpd/IsoffMainParser.h
+4
-4
modules/demux/dash/mpd/MPD.h
modules/demux/dash/mpd/MPD.h
+4
-4
modules/demux/dash/mpd/Period.h
modules/demux/dash/mpd/Period.h
+4
-4
modules/demux/dash/mpd/Representation.cpp
modules/demux/dash/mpd/Representation.cpp
+2
-2
modules/demux/dash/mpd/Representation.h
modules/demux/dash/mpd/Representation.h
+4
-4
modules/demux/hls/HLSManager.cpp
modules/demux/hls/HLSManager.cpp
+4
-4
modules/demux/hls/HLSManager.hpp
modules/demux/hls/HLSManager.hpp
+3
-3
modules/demux/hls/HLSStreams.hpp
modules/demux/hls/HLSStreams.hpp
+2
-2
modules/demux/hls/playlist/HLSSegment.cpp
modules/demux/hls/playlist/HLSSegment.cpp
+2
-2
modules/demux/hls/playlist/HLSSegment.hpp
modules/demux/hls/playlist/HLSSegment.hpp
+2
-2
modules/demux/hls/playlist/M3U8.cpp
modules/demux/hls/playlist/M3U8.cpp
+2
-2
modules/demux/hls/playlist/M3U8.hpp
modules/demux/hls/playlist/M3U8.hpp
+2
-2
modules/demux/hls/playlist/Parser.cpp
modules/demux/hls/playlist/Parser.cpp
+8
-8
modules/demux/hls/playlist/Parser.hpp
modules/demux/hls/playlist/Parser.hpp
+3
-3
modules/demux/hls/playlist/Representation.cpp
modules/demux/hls/playlist/Representation.cpp
+3
-3
modules/demux/hls/playlist/Representation.hpp
modules/demux/hls/playlist/Representation.hpp
+5
-5
modules/demux/smooth/SmoothManager.cpp
modules/demux/smooth/SmoothManager.cpp
+4
-4
modules/demux/smooth/SmoothManager.hpp
modules/demux/smooth/SmoothManager.hpp
+4
-4
modules/demux/smooth/SmoothStream.hpp
modules/demux/smooth/SmoothStream.hpp
+2
-2
modules/demux/smooth/mp4/IndexReader.cpp
modules/demux/smooth/mp4/IndexReader.cpp
+6
-6
modules/demux/smooth/mp4/IndexReader.hpp
modules/demux/smooth/mp4/IndexReader.hpp
+4
-4
modules/demux/smooth/playlist/ForgedInitSegment.cpp
modules/demux/smooth/playlist/ForgedInitSegment.cpp
+2
-2
modules/demux/smooth/playlist/ForgedInitSegment.hpp
modules/demux/smooth/playlist/ForgedInitSegment.hpp
+4
-4
modules/demux/smooth/playlist/Manifest.cpp
modules/demux/smooth/playlist/Manifest.cpp
+1
-1
modules/demux/smooth/playlist/Manifest.hpp
modules/demux/smooth/playlist/Manifest.hpp
+2
-2
modules/demux/smooth/playlist/MemoryChunk.hpp
modules/demux/smooth/playlist/MemoryChunk.hpp
+2
-2
modules/demux/smooth/playlist/Parser.cpp
modules/demux/smooth/playlist/Parser.cpp
+9
-9
modules/demux/smooth/playlist/Parser.hpp
modules/demux/smooth/playlist/Parser.hpp
+4
-4
modules/demux/smooth/playlist/Representation.cpp
modules/demux/smooth/playlist/Representation.cpp
+3
-3
modules/demux/smooth/playlist/Representation.hpp
modules/demux/smooth/playlist/Representation.hpp
+5
-5
modules/demux/smooth/playlist/SmoothSegment.cpp
modules/demux/smooth/playlist/SmoothSegment.cpp
+2
-2
modules/demux/smooth/playlist/SmoothSegment.hpp
modules/demux/smooth/playlist/SmoothSegment.hpp
+2
-2
po/POTFILES.in
po/POTFILES.in
+1
-1
No files found.
modules/MODULES_LIST
View file @
395db15f
...
...
@@ -23,7 +23,7 @@ $Id$
* access_realrtsp: Real RTSP access
* access_wasapi: WASAPI audio input
* accesstweaks: access control tweaking module (dev tool)
* adapt
ative: Unified adapta
tive streaming module (DASH/HLS)
* adapt
ive: Unified adap
tive streaming module (DASH/HLS)
* addonsfsstorage: Local storage extensions repository
* addonsvorepository: Videolan extensions repository
* adjust: Contrast/Hue/saturation/Brightness adjust module
...
...
modules/demux/Makefile.am
View file @
395db15f
...
...
@@ -264,102 +264,102 @@ if HAVE_DVBPSI
demux_LTLIBRARIES
+=
libts_plugin.la
endif
libadapt
at
ive_plugin_la_SOURCES
=
\
demux/adapt
at
ive/playlist/AbstractPlaylist.cpp
\
demux/adapt
at
ive/playlist/AbstractPlaylist.hpp
\
demux/adapt
at
ive/playlist/BaseAdaptationSet.cpp
\
demux/adapt
at
ive/playlist/BaseAdaptationSet.h
\
demux/adapt
at
ive/playlist/BasePeriod.cpp
\
demux/adapt
at
ive/playlist/BasePeriod.h
\
demux/adapt
at
ive/playlist/BaseRepresentation.cpp
\
demux/adapt
at
ive/playlist/BaseRepresentation.h
\
demux/adapt
at
ive/playlist/CommonAttributesElements.cpp
\
demux/adapt
at
ive/playlist/CommonAttributesElements.h
\
demux/adapt
at
ive/playlist/ICanonicalUrl.hpp
\
demux/adapt
at
ive/playlist/ID.hpp
\
demux/adapt
at
ive/playlist/ID.cpp
\
demux/adapt
at
ive/playlist/Inheritables.hpp
\
demux/adapt
at
ive/playlist/Inheritables.cpp
\
demux/adapt
at
ive/playlist/Segment.cpp
\
demux/adapt
at
ive/playlist/Segment.h
\
demux/adapt
at
ive/playlist/SegmentBase.cpp
\
demux/adapt
at
ive/playlist/SegmentBase.h
\
demux/adapt
at
ive/playlist/SegmentChunk.cpp
\
demux/adapt
at
ive/playlist/SegmentChunk.hpp
\
demux/adapt
at
ive/playlist/SegmentInfoCommon.cpp
\
demux/adapt
at
ive/playlist/SegmentInfoCommon.h
\
demux/adapt
at
ive/playlist/SegmentList.cpp
\
demux/adapt
at
ive/playlist/SegmentList.h
\
demux/adapt
at
ive/playlist/SegmentTimeline.cpp
\
demux/adapt
at
ive/playlist/SegmentTimeline.h
\
demux/adapt
at
ive/playlist/SegmentInformation.cpp
\
demux/adapt
at
ive/playlist/SegmentInformation.hpp
\
demux/adapt
at
ive/playlist/SegmentTemplate.cpp
\
demux/adapt
at
ive/playlist/SegmentTemplate.h
\
demux/adapt
at
ive/playlist/Url.cpp
\
demux/adapt
at
ive/playlist/Url.hpp
\
demux/adapt
at
ive/playlist/Templates.hpp
\
demux/adapt
at
ive/logic/AbstractAdaptationLogic.cpp
\
demux/adapt
at
ive/logic/AbstractAdaptationLogic.h
\
demux/adapt
at
ive/logic/AlwaysBestAdaptationLogic.cpp
\
demux/adapt
at
ive/logic/AlwaysBestAdaptationLogic.h
\
demux/adapt
at
ive/logic/AlwaysLowestAdaptationLogic.cpp
\
demux/adapt
at
ive/logic/AlwaysLowestAdaptationLogic.hpp
\
demux/adapt
at
ive/logic/IDownloadRateObserver.h
\
demux/adapt
at
ive/logic/RateBasedAdaptationLogic.h
\
demux/adapt
at
ive/logic/RateBasedAdaptationLogic.cpp
\
demux/adapt
at
ive/logic/Representationselectors.hpp
\
demux/adapt
at
ive/logic/Representationselectors.cpp
\
demux/adapt
at
ive/mp4/AtomsReader.cpp
\
demux/adapt
at
ive/mp4/AtomsReader.hpp
\
demux/adapt
at
ive/http/BytesRange.cpp
\
demux/adapt
at
ive/http/BytesRange.hpp
\
demux/adapt
at
ive/http/Chunk.cpp
\
demux/adapt
at
ive/http/Chunk.h
\
demux/adapt
at
ive/http/Downloader.cpp
\
demux/adapt
at
ive/http/Downloader.hpp
\
demux/adapt
at
ive/http/HTTPConnection.cpp
\
demux/adapt
at
ive/http/HTTPConnection.hpp
\
demux/adapt
at
ive/http/HTTPConnectionManager.cpp
\
demux/adapt
at
ive/http/HTTPConnectionManager.h
\
demux/adapt
at
ive/http/Sockets.hpp
\
demux/adapt
at
ive/http/Sockets.cpp
\
demux/adapt
at
ive/plumbing/CommandsQueue.cpp
\
demux/adapt
at
ive/plumbing/CommandsQueue.hpp
\
demux/adapt
at
ive/plumbing/Demuxer.cpp
\
demux/adapt
at
ive/plumbing/Demuxer.hpp
\
demux/adapt
at
ive/plumbing/FakeESOut.cpp
\
demux/adapt
at
ive/plumbing/FakeESOut.hpp
\
demux/adapt
at
ive/plumbing/FakeESOutID.cpp
\
demux/adapt
at
ive/plumbing/FakeESOutID.hpp
\
demux/adapt
at
ive/plumbing/SourceStream.cpp
\
demux/adapt
at
ive/plumbing/SourceStream.hpp
\
demux/adapt
at
ive/ChunksSource.hpp
\
demux/adapt
at
ive/PlaylistManager.cpp
\
demux/adapt
at
ive/PlaylistManager.h
\
demux/adapt
at
ive/SegmentTracker.cpp
\
demux/adapt
at
ive/SegmentTracker.hpp
\
demux/adapt
at
ive/StreamFormat.cpp
\
demux/adapt
at
ive/StreamFormat.hpp
\
demux/adapt
at
ive/Streams.cpp
\
demux/adapt
at
ive/Streams.hpp
\
demux/adapt
at
ive/Time.hpp
\
demux/adapt
at
ive/tools/Conversions.hpp
\
demux/adapt
at
ive/tools/Conversions.cpp
\
demux/adapt
at
ive/tools/Debug.hpp
\
demux/adapt
at
ive/tools/Helper.cpp
\
demux/adapt
at
ive/tools/Helper.h
\
demux/adapt
at
ive/tools/Properties.hpp
\
demux/adapt
at
ive/tools/Retrieve.cpp
\
demux/adapt
at
ive/tools/Retrieve.hpp
\
demux/adapt
at
ive/xml/DOMHelper.cpp
\
demux/adapt
at
ive/xml/DOMHelper.h
\
demux/adapt
at
ive/xml/DOMParser.cpp
\
demux/adapt
at
ive/xml/DOMParser.h
\
demux/adapt
at
ive/xml/Node.cpp
\
demux/adapt
at
ive/xml/Node.h
libadapt
at
ive_dash_SOURCES
=
\
libadaptive_plugin_la_SOURCES
=
\
demux/adaptive/playlist/AbstractPlaylist.cpp
\
demux/adaptive/playlist/AbstractPlaylist.hpp
\
demux/adaptive/playlist/BaseAdaptationSet.cpp
\
demux/adaptive/playlist/BaseAdaptationSet.h
\
demux/adaptive/playlist/BasePeriod.cpp
\
demux/adaptive/playlist/BasePeriod.h
\
demux/adaptive/playlist/BaseRepresentation.cpp
\
demux/adaptive/playlist/BaseRepresentation.h
\
demux/adaptive/playlist/CommonAttributesElements.cpp
\
demux/adaptive/playlist/CommonAttributesElements.h
\
demux/adaptive/playlist/ICanonicalUrl.hpp
\
demux/adaptive/playlist/ID.hpp
\
demux/adaptive/playlist/ID.cpp
\
demux/adaptive/playlist/Inheritables.hpp
\
demux/adaptive/playlist/Inheritables.cpp
\
demux/adaptive/playlist/Segment.cpp
\
demux/adaptive/playlist/Segment.h
\
demux/adaptive/playlist/SegmentBase.cpp
\
demux/adaptive/playlist/SegmentBase.h
\
demux/adaptive/playlist/SegmentChunk.cpp
\
demux/adaptive/playlist/SegmentChunk.hpp
\
demux/adaptive/playlist/SegmentInfoCommon.cpp
\
demux/adaptive/playlist/SegmentInfoCommon.h
\
demux/adaptive/playlist/SegmentList.cpp
\
demux/adaptive/playlist/SegmentList.h
\
demux/adaptive/playlist/SegmentTimeline.cpp
\
demux/adaptive/playlist/SegmentTimeline.h
\
demux/adaptive/playlist/SegmentInformation.cpp
\
demux/adaptive/playlist/SegmentInformation.hpp
\
demux/adaptive/playlist/SegmentTemplate.cpp
\
demux/adaptive/playlist/SegmentTemplate.h
\
demux/adaptive/playlist/Url.cpp
\
demux/adaptive/playlist/Url.hpp
\
demux/adaptive/playlist/Templates.hpp
\
demux/adaptive/logic/AbstractAdaptationLogic.cpp
\
demux/adaptive/logic/AbstractAdaptationLogic.h
\
demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
\
demux/adaptive/logic/AlwaysBestAdaptationLogic.h
\
demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
\
demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
\
demux/adaptive/logic/IDownloadRateObserver.h
\
demux/adaptive/logic/RateBasedAdaptationLogic.h
\
demux/adaptive/logic/RateBasedAdaptationLogic.cpp
\
demux/adaptive/logic/Representationselectors.hpp
\
demux/adaptive/logic/Representationselectors.cpp
\
demux/adaptive/mp4/AtomsReader.cpp
\
demux/adaptive/mp4/AtomsReader.hpp
\
demux/adaptive/http/BytesRange.cpp
\
demux/adaptive/http/BytesRange.hpp
\
demux/adaptive/http/Chunk.cpp
\
demux/adaptive/http/Chunk.h
\
demux/adaptive/http/Downloader.cpp
\
demux/adaptive/http/Downloader.hpp
\
demux/adaptive/http/HTTPConnection.cpp
\
demux/adaptive/http/HTTPConnection.hpp
\
demux/adaptive/http/HTTPConnectionManager.cpp
\
demux/adaptive/http/HTTPConnectionManager.h
\
demux/adaptive/http/Sockets.hpp
\
demux/adaptive/http/Sockets.cpp
\
demux/adaptive/plumbing/CommandsQueue.cpp
\
demux/adaptive/plumbing/CommandsQueue.hpp
\
demux/adaptive/plumbing/Demuxer.cpp
\
demux/adaptive/plumbing/Demuxer.hpp
\
demux/adaptive/plumbing/FakeESOut.cpp
\
demux/adaptive/plumbing/FakeESOut.hpp
\
demux/adaptive/plumbing/FakeESOutID.cpp
\
demux/adaptive/plumbing/FakeESOutID.hpp
\
demux/adaptive/plumbing/SourceStream.cpp
\
demux/adaptive/plumbing/SourceStream.hpp
\
demux/adaptive/ChunksSource.hpp
\
demux/adaptive/PlaylistManager.cpp
\
demux/adaptive/PlaylistManager.h
\
demux/adaptive/SegmentTracker.cpp
\
demux/adaptive/SegmentTracker.hpp
\
demux/adaptive/StreamFormat.cpp
\
demux/adaptive/StreamFormat.hpp
\
demux/adaptive/Streams.cpp
\
demux/adaptive/Streams.hpp
\
demux/adaptive/Time.hpp
\
demux/adaptive/tools/Conversions.hpp
\
demux/adaptive/tools/Conversions.cpp
\
demux/adaptive/tools/Debug.hpp
\
demux/adaptive/tools/Helper.cpp
\
demux/adaptive/tools/Helper.h
\
demux/adaptive/tools/Properties.hpp
\
demux/adaptive/tools/Retrieve.cpp
\
demux/adaptive/tools/Retrieve.hpp
\
demux/adaptive/xml/DOMHelper.cpp
\
demux/adaptive/xml/DOMHelper.h
\
demux/adaptive/xml/DOMParser.cpp
\
demux/adaptive/xml/DOMParser.h
\
demux/adaptive/xml/Node.cpp
\
demux/adaptive/xml/Node.h
libadaptive_dash_SOURCES
=
\
demux/dash/mpd/AdaptationSet.cpp
\
demux/dash/mpd/AdaptationSet.h
\
demux/dash/mpd/DASHCommonAttributesElements.cpp
\
...
...
@@ -389,7 +389,7 @@ libadaptative_dash_SOURCES = \
demux/dash/DASHStream.cpp
\
demux/dash/DASHStream.hpp
libadapt
at
ive_hls_SOURCES
=
\
libadaptive_hls_SOURCES
=
\
demux/hls/playlist/M3U8.hpp
\
demux/hls/playlist/M3U8.cpp
\
demux/hls/playlist/Parser.hpp
\
...
...
@@ -405,7 +405,7 @@ libadaptative_hls_SOURCES = \
demux/hls/HLSStreams.hpp
\
demux/hls/HLSStreams.cpp
libadapt
at
ive_smooth_SOURCES
=
\
libadaptive_smooth_SOURCES
=
\
demux/smooth/mp4/IndexReader.cpp
\
demux/smooth/mp4/IndexReader.hpp
\
demux/smooth/playlist/ForgedInitSegment.hpp
\
...
...
@@ -424,24 +424,24 @@ libadaptative_smooth_SOURCES = \
demux/smooth/SmoothManager.cpp
\
demux/smooth/SmoothStream.hpp
\
demux/smooth/SmoothStream.cpp
libadapt
at
ive_smooth_SOURCES
+=
mux/mp4/libmp4mux.c mux/mp4/libmp4mux.h
\
libadaptive_smooth_SOURCES
+=
mux/mp4/libmp4mux.c mux/mp4/libmp4mux.h
\
packetizer/h264_nal.c packetizer/h264_nal.h
libadapt
ative_plugin_la_SOURCES
+=
$(libadapta
tive_hls_SOURCES)
libadapt
ative_plugin_la_SOURCES
+=
$(libadapta
tive_dash_SOURCES)
libadapt
ative_plugin_la_SOURCES
+=
$(libadapta
tive_smooth_SOURCES)
libadapt
ative_plugin_la_SOURCES
+=
demux/adaptative/adapta
tive.cpp
libadapt
at
ive_plugin_la_SOURCES
+=
demux/mp4/libmp4.c demux/mp4/libmp4.h
libadapt
ative_plugin_la_CXXFLAGS
=
$(AM_CXXFLAGS)
-I
$(srcdir)
/demux/adapta
tive
libadapt
at
ive_plugin_la_LIBADD
=
$(SOCKET_LIBS)
$(LIBM)
libadapt
ive_plugin_la_SOURCES
+=
$(libadap
tive_hls_SOURCES)
libadapt
ive_plugin_la_SOURCES
+=
$(libadap
tive_dash_SOURCES)
libadapt
ive_plugin_la_SOURCES
+=
$(libadap
tive_smooth_SOURCES)
libadapt
ive_plugin_la_SOURCES
+=
demux/adaptive/adap
tive.cpp
libadaptive_plugin_la_SOURCES
+=
demux/mp4/libmp4.c demux/mp4/libmp4.h
libadapt
ive_plugin_la_CXXFLAGS
=
$(AM_CXXFLAGS)
-I
$(srcdir)
/demux/adap
tive
libadaptive_plugin_la_LIBADD
=
$(SOCKET_LIBS)
$(LIBM)
if
HAVE_ZLIB
libadapt
at
ive_plugin_la_LIBADD
+=
-lz
libadaptive_plugin_la_LIBADD
+=
-lz
endif
if
HAVE_GCRYPT
libadapt
at
ive_plugin_la_CXXFLAGS
+=
$(GCRYPT_CFLAGS)
libadapt
at
ive_plugin_la_LIBADD
+=
$(GCRYPT_LIBS)
libadaptive_plugin_la_CXXFLAGS
+=
$(GCRYPT_CFLAGS)
libadaptive_plugin_la_LIBADD
+=
$(GCRYPT_LIBS)
endif
demux_LTLIBRARIES
+=
libadapt
at
ive_plugin.la
demux_LTLIBRARIES
+=
libadaptive_plugin.la
libttml_plugin_la_SOURCES
=
demux/ttml.c
demux_LTLIBRARIES
+=
libttml_plugin.la
...
...
modules/demux/adapt
at
ive/ChunksSource.hpp
→
modules/demux/adaptive/ChunksSource.hpp
View file @
395db15f
...
...
@@ -26,7 +26,7 @@
#include <vlc_common.h>
namespace
adapt
at
ive
namespace
adaptive
{
class
ChunksSource
{
...
...
modules/demux/adapt
at
ive/PlaylistManager.cpp
→
modules/demux/adaptive/PlaylistManager.cpp
View file @
395db15f
...
...
@@ -39,9 +39,9 @@
#include <ctime>
using
namespace
adapt
at
ive
::
http
;
using
namespace
adapt
at
ive
::
logic
;
using
namespace
adapt
at
ive
;
using
namespace
adaptive
::
http
;
using
namespace
adaptive
::
logic
;
using
namespace
adaptive
;
PlaylistManager
::
PlaylistManager
(
demux_t
*
p_demux_
,
AbstractPlaylist
*
pl
,
...
...
@@ -444,7 +444,7 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L
{
case
AbstractAdaptationLogic
::
FixedRate
:
{
size_t
bps
=
var_InheritInteger
(
p_demux
,
"adapt
at
ive-bw"
)
*
8192
;
size_t
bps
=
var_InheritInteger
(
p_demux
,
"adaptive-bw"
)
*
8192
;
return
new
(
std
::
nothrow
)
FixedRateAdaptationLogic
(
bps
);
}
case
AbstractAdaptationLogic
::
AlwaysLowest
:
...
...
@@ -454,8 +454,8 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L
case
AbstractAdaptationLogic
::
Default
:
case
AbstractAdaptationLogic
::
RateBased
:
{
int
width
=
var_InheritInteger
(
p_demux
,
"adapt
at
ive-width"
);
int
height
=
var_InheritInteger
(
p_demux
,
"adapt
at
ive-height"
);
int
width
=
var_InheritInteger
(
p_demux
,
"adaptive-width"
);
int
height
=
var_InheritInteger
(
p_demux
,
"adaptive-height"
);
RateBasedAdaptationLogic
*
logic
=
new
(
std
::
nothrow
)
RateBasedAdaptationLogic
(
VLC_OBJECT
(
p_demux
),
width
,
height
);
conn
->
setDownloadRateObserver
(
logic
);
...
...
modules/demux/adapt
at
ive/PlaylistManager.h
→
modules/demux/adaptive/PlaylistManager.h
View file @
395db15f
...
...
@@ -26,7 +26,7 @@
#include "Streams.hpp"
#include <vector>
namespace
adapt
at
ive
namespace
adaptive
{
namespace
playlist
{
...
...
modules/demux/adapt
at
ive/SegmentTracker.cpp
→
modules/demux/adaptive/SegmentTracker.cpp
View file @
395db15f
...
...
@@ -25,9 +25,9 @@
#include "playlist/SegmentChunk.hpp"
#include "logic/AbstractAdaptationLogic.h"
using
namespace
adapt
at
ive
;
using
namespace
adapt
at
ive
::
logic
;
using
namespace
adapt
at
ive
::
playlist
;
using
namespace
adaptive
;
using
namespace
adaptive
::
logic
;
using
namespace
adaptive
::
playlist
;
SegmentTrackerEvent
::
SegmentTrackerEvent
(
SegmentChunk
*
s
)
{
...
...
modules/demux/adapt
at
ive/SegmentTracker.hpp
→
modules/demux/adaptive/SegmentTracker.hpp
View file @
395db15f
...
...
@@ -29,7 +29,7 @@
#include <vlc_common.h>
#include <list>
namespace
adapt
at
ive
namespace
adaptive
{
namespace
http
{
...
...
modules/demux/adapt
at
ive/StreamFormat.cpp
→
modules/demux/adaptive/StreamFormat.cpp
View file @
395db15f
...
...
@@ -19,7 +19,7 @@
*****************************************************************************/
#include "StreamFormat.hpp"
using
namespace
adapt
at
ive
;
using
namespace
adaptive
;
StreamFormat
::
operator
unsigned
()
const
{
...
...
modules/demux/adapt
at
ive/StreamFormat.hpp
→
modules/demux/adaptive/StreamFormat.hpp
View file @
395db15f
...
...
@@ -22,7 +22,7 @@
#include <string>
namespace
adapt
at
ive
namespace
adaptive
{
class
StreamFormat
...
...
modules/demux/adapt
at
ive/Streams.cpp
→
modules/demux/adaptive/Streams.cpp
View file @
395db15f
...
...
@@ -27,8 +27,8 @@
#include "tools/Debug.hpp"
#include <vlc_demux.h>
using
namespace
adapt
at
ive
;
using
namespace
adapt
at
ive
::
http
;
using
namespace
adaptive
;
using
namespace
adaptive
::
http
;
AbstractStream
::
AbstractStream
(
demux_t
*
demux_
,
const
StreamFormat
&
format_
)
{
...
...
modules/demux/adapt
at
ive/Streams.hpp
→
modules/demux/adaptive/Streams.hpp
View file @
395db15f
...
...
@@ -35,7 +35,7 @@
#include <string>
namespace
adapt
at
ive
namespace
adaptive
{
class
SegmentTracker
;
...
...
modules/demux/adapt
at
ive/Time.hpp
→
modules/demux/adaptive/Time.hpp
View file @
395db15f
File moved
modules/demux/adapt
ative/adapta
tive.cpp
→
modules/demux/adapt
ive/adap
tive.cpp
View file @
395db15f
/*****************************************************************************
* adapt
at
ive.cpp: Adaptative streaming module
* adaptive.cpp: Adaptative streaming module
*****************************************************************************
* Copyright © 2015 - VideoLAN and VLC Authors
*
...
...
@@ -47,9 +47,9 @@
#include "../smooth/SmoothStream.hpp"
#include "../smooth/playlist/Parser.hpp"
using
namespace
adapt
at
ive
::
logic
;
using
namespace
adapt
at
ive
::
playlist
;
using
namespace
adapt
at
ive
::
xml
;
using
namespace
adaptive
::
logic
;
using
namespace
adaptive
::
playlist
;
using
namespace
adaptive
::
xml
;
using
namespace
dash
::
mpd
;
using
namespace
dash
;
using
namespace
hls
;
...
...
@@ -68,7 +68,7 @@ static void Close (vlc_object_t *);
#define ADAPT_HEIGHT_TEXT N_("Preferred Height")
#define ADAPT_BW_TEXT N_("Fixed Bandwidth in KiB/s")
#define ADAPT_BW_LONGTEXT N_("Preferred bandwidth for non adapt
at
ive streams")
#define ADAPT_BW_LONGTEXT N_("Preferred bandwidth for non adaptive streams")
#define ADAPT_LOGIC_TEXT N_("Adaptation Logic")
...
...
@@ -84,16 +84,16 @@ static const char *const ppsz_logics[] = { N_("Bandwidth Adaptive"),
vlc_module_begin
()
set_shortname
(
N_
(
"Adaptative"
))
set_description
(
N_
(
"Unified adapt
at
ive streaming for DASH/HLS"
)
)
set_description
(
N_
(
"Unified adaptive streaming for DASH/HLS"
)
)
set_capability
(
"demux"
,
12
)
set_category
(
CAT_INPUT
)
set_subcategory
(
SUBCAT_INPUT_DEMUX
)
add_integer
(
"adapt
at
ive-logic"
,
AbstractAdaptationLogic
::
Default
,
add_integer
(
"adaptive-logic"
,
AbstractAdaptationLogic
::
Default
,
ADAPT_LOGIC_TEXT
,
NULL
,
false
)
change_integer_list
(
pi_logics
,
ppsz_logics
)
add_integer
(
"adapt
at
ive-width"
,
480
,
ADAPT_WIDTH_TEXT
,
ADAPT_WIDTH_TEXT
,
true
)
add_integer
(
"adapt
at
ive-height"
,
360
,
ADAPT_HEIGHT_TEXT
,
ADAPT_HEIGHT_TEXT
,
true
)
add_integer
(
"adapt
at
ive-bw"
,
250
,
ADAPT_BW_TEXT
,
ADAPT_BW_LONGTEXT
,
false
)
add_integer
(
"adaptive-width"
,
480
,
ADAPT_WIDTH_TEXT
,
ADAPT_WIDTH_TEXT
,
true
)
add_integer
(
"adaptive-height"
,
360
,
ADAPT_HEIGHT_TEXT
,
ADAPT_HEIGHT_TEXT
,
true
)
add_integer
(
"adaptive-bw"
,
250
,
ADAPT_BW_TEXT
,
ADAPT_BW_LONGTEXT
,
false
)
set_callbacks
(
Open
,
Close
)
vlc_module_end
()
...
...
@@ -123,7 +123,7 @@ static int Open(vlc_object_t *p_obj)
PlaylistManager
*
p_manager
=
NULL
;
AbstractAdaptationLogic
::
LogicType
logic
=
static_cast
<
AbstractAdaptationLogic
::
LogicType
>
(
var_InheritInteger
(
p_obj
,
"adapt
at
ive-logic"
));
static_cast
<
AbstractAdaptationLogic
::
LogicType
>
(
var_InheritInteger
(
p_obj
,
"adaptive-logic"
));
std
::
string
playlisturl
(
p_demux
->
psz_access
);
playlisturl
.
append
(
"://"
);
...
...
modules/demux/adapt
at
ive/http/BytesRange.cpp
→
modules/demux/adaptive/http/BytesRange.cpp
View file @
395db15f
...
...
@@ -19,7 +19,7 @@
*****************************************************************************/
#include "BytesRange.hpp"
using
namespace
adapt
at
ive
::
http
;
using
namespace
adaptive
::
http
;
BytesRange
::
BytesRange
()
{
...
...
modules/demux/adapt
at
ive/http/BytesRange.hpp
→
modules/demux/adaptive/http/BytesRange.hpp
View file @
395db15f
...
...
@@ -26,7 +26,7 @@
#include <vlc_common.h>
namespace
adapt
at
ive
namespace
adaptive
{
namespace
http
{
...
...
modules/demux/adapt
at
ive/http/Chunk.cpp
→
modules/demux/adaptive/http/Chunk.cpp
View file @
395db15f
...
...
@@ -36,7 +36,7 @@
#include <algorithm>
using
namespace
adapt
at
ive
::
http
;
using
namespace
adaptive
::
http
;
AbstractChunkSource
::
AbstractChunkSource
()
{
...
...
modules/demux/adapt
at
ive/http/Chunk.h
→
modules/demux/adaptive/http/Chunk.h
View file @
395db15f
...
...
@@ -32,7 +32,7 @@
typedef
struct
block_t
block_t
;
namespace
adapt
at
ive
namespace
adaptive
{
namespace
http
{
...
...
modules/demux/adapt
at
ive/http/Downloader.cpp
→
modules/demux/adaptive/http/Downloader.cpp
View file @
395db15f
...
...
@@ -22,7 +22,7 @@
#include <vlc_threads.h>
#include <vlc_atomic.h>
using
namespace
adapt
at
ive
::
http
;
using
namespace
adaptive
::
http
;
Downloader
::
Downloader
()
{
...
...
modules/demux/adapt
at
ive/http/Downloader.hpp
→
modules/demux/adaptive/http/Downloader.hpp
View file @
395db15f
...
...
@@ -29,7 +29,7 @@
#include <vlc_common.h>
#include <list>
namespace
adapt
at
ive
namespace
adaptive
{
namespace
http
...
...
modules/demux/adapt
at
ive/http/HTTPConnection.cpp
→
modules/demux/adaptive/http/HTTPConnection.cpp
View file @
395db15f
...
...
@@ -20,11 +20,11 @@
#include "HTTPConnection.hpp"
#include "Sockets.hpp"
#include "../adapt
at
ive/tools/Helper.h"
#include "../adaptive/tools/Helper.h"
#include <sstream>
using
namespace
adapt
at
ive
::
http
;
using
namespace
adaptive
::
http
;
HTTPConnection
::
HTTPConnection
(
vlc_object_t
*
stream_
,
Socket
*
socket_
,
bool
persistent
)
{
...
...
modules/demux/adapt
at
ive/http/HTTPConnection.hpp
→
modules/demux/adaptive/http/HTTPConnection.hpp
View file @
395db15f
...
...
@@ -33,7 +33,7 @@
#include <vlc_common.h>
#include <string>
namespace
adapt
at
ive
namespace
adaptive
{
namespace
http
{
...
...
modules/demux/adapt
at
ive/http/HTTPConnectionManager.cpp
→
modules/demux/adaptive/http/HTTPConnectionManager.cpp
View file @
395db15f
...
...
@@ -31,7 +31,7 @@
#include "Downloader.hpp"
#include <vlc_url.h>
using
namespace
adapt
at
ive
::
http
;
using
namespace
adaptive
::
http
;
HTTPConnectionManager
::
HTTPConnectionManager
(
vlc_object_t
*
stream
)
:
stream
(
stream
),
...
...
modules/demux/adapt
at
ive/http/HTTPConnectionManager.h
→
modules/demux/adaptive/http/HTTPConnectionManager.h
View file @
395db15f
...
...
@@ -35,7 +35,7 @@
#include <vector>
#include <string>
namespace
adapt
at
ive
namespace
adaptive
{
namespace
http
{
...
...
modules/demux/adapt
at
ive/http/Sockets.cpp
→
modules/demux/adaptive/http/Sockets.cpp
View file @
395db15f
...
...
@@ -22,7 +22,7 @@
#include <vlc_network.h>
#include <cerrno>
using
namespace
adapt
at
ive
::
http
;
using
namespace
adaptive
::
http
;
Socket
::
Socket
()
{
...
...
modules/demux/adapt
at
ive/http/Sockets.hpp
→
modules/demux/adaptive/http/Sockets.hpp
View file @
395db15f
...
...
@@ -28,7 +28,7 @@
#include <vlc_tls.h>
#include <string>
namespace
adapt
at
ive
namespace
adaptive
{
namespace
http
{
...
...
modules/demux/adapt
at
ive/logic/AbstractAdaptationLogic.cpp
→
modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
View file @
395db15f
...
...
@@ -27,7 +27,7 @@
#include "AbstractAdaptationLogic.h"
using
namespace
adapt
at
ive
::
logic
;
using
namespace
adaptive
::
logic
;
AbstractAdaptationLogic
::
AbstractAdaptationLogic
()
{
...
...
modules/demux/adapt
at
ive/logic/AbstractAdaptationLogic.h
→
modules/demux/adaptive/logic/AbstractAdaptationLogic.h
View file @
395db15f
...
...
@@ -28,7 +28,7 @@
#include "IDownloadRateObserver.h"
#include "../SegmentTracker.hpp"
namespace
adapt
at
ive
namespace
adaptive
{
namespace
playlist
{
...
...
modules/demux/adapt
at
ive/logic/AlwaysBestAdaptationLogic.cpp
→
modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
View file @
395db15f
...
...
@@ -28,8 +28,8 @@
#include "AlwaysBestAdaptationLogic.h"
#include "Representationselectors.hpp"
using
namespace
adapt
at
ive
::
logic
;
using
namespace
adapt
at
ive
::
playlist
;
using
namespace
adaptive
::
logic
;
using
namespace
adaptive
::
playlist
;
AlwaysBestAdaptationLogic
::
AlwaysBestAdaptationLogic
()
:
AbstractAdaptationLogic
()
...
...