Commit 395db15f authored by François Cartegnie's avatar François Cartegnie 🤞

demux: adaptative: rename to adaptive

parent b1a23af3
...@@ -23,7 +23,7 @@ $Id$ ...@@ -23,7 +23,7 @@ $Id$
* access_realrtsp: Real RTSP access * access_realrtsp: Real RTSP access
* access_wasapi: WASAPI audio input * access_wasapi: WASAPI audio input
* accesstweaks: access control tweaking module (dev tool) * accesstweaks: access control tweaking module (dev tool)
* adaptative: Unified adaptative streaming module (DASH/HLS) * adaptive: Unified adaptive streaming module (DASH/HLS)
* addonsfsstorage: Local storage extensions repository * addonsfsstorage: Local storage extensions repository
* addonsvorepository: Videolan extensions repository * addonsvorepository: Videolan extensions repository
* adjust: Contrast/Hue/saturation/Brightness adjust module * adjust: Contrast/Hue/saturation/Brightness adjust module
......
...@@ -264,102 +264,102 @@ if HAVE_DVBPSI ...@@ -264,102 +264,102 @@ if HAVE_DVBPSI
demux_LTLIBRARIES += libts_plugin.la demux_LTLIBRARIES += libts_plugin.la
endif endif
libadaptative_plugin_la_SOURCES = \ libadaptive_plugin_la_SOURCES = \
demux/adaptative/playlist/AbstractPlaylist.cpp \ demux/adaptive/playlist/AbstractPlaylist.cpp \
demux/adaptative/playlist/AbstractPlaylist.hpp \ demux/adaptive/playlist/AbstractPlaylist.hpp \
demux/adaptative/playlist/BaseAdaptationSet.cpp \ demux/adaptive/playlist/BaseAdaptationSet.cpp \
demux/adaptative/playlist/BaseAdaptationSet.h \ demux/adaptive/playlist/BaseAdaptationSet.h \
demux/adaptative/playlist/BasePeriod.cpp \ demux/adaptive/playlist/BasePeriod.cpp \
demux/adaptative/playlist/BasePeriod.h \ demux/adaptive/playlist/BasePeriod.h \
demux/adaptative/playlist/BaseRepresentation.cpp \ demux/adaptive/playlist/BaseRepresentation.cpp \
demux/adaptative/playlist/BaseRepresentation.h \ demux/adaptive/playlist/BaseRepresentation.h \
demux/adaptative/playlist/CommonAttributesElements.cpp \ demux/adaptive/playlist/CommonAttributesElements.cpp \
demux/adaptative/playlist/CommonAttributesElements.h \ demux/adaptive/playlist/CommonAttributesElements.h \
demux/adaptative/playlist/ICanonicalUrl.hpp \ demux/adaptive/playlist/ICanonicalUrl.hpp \
demux/adaptative/playlist/ID.hpp \ demux/adaptive/playlist/ID.hpp \
demux/adaptative/playlist/ID.cpp \ demux/adaptive/playlist/ID.cpp \
demux/adaptative/playlist/Inheritables.hpp \ demux/adaptive/playlist/Inheritables.hpp \
demux/adaptative/playlist/Inheritables.cpp \ demux/adaptive/playlist/Inheritables.cpp \
demux/adaptative/playlist/Segment.cpp \ demux/adaptive/playlist/Segment.cpp \
demux/adaptative/playlist/Segment.h \ demux/adaptive/playlist/Segment.h \
demux/adaptative/playlist/SegmentBase.cpp \ demux/adaptive/playlist/SegmentBase.cpp \
demux/adaptative/playlist/SegmentBase.h \ demux/adaptive/playlist/SegmentBase.h \
demux/adaptative/playlist/SegmentChunk.cpp \ demux/adaptive/playlist/SegmentChunk.cpp \
demux/adaptative/playlist/SegmentChunk.hpp \ demux/adaptive/playlist/SegmentChunk.hpp \
demux/adaptative/playlist/SegmentInfoCommon.cpp \ demux/adaptive/playlist/SegmentInfoCommon.cpp \
demux/adaptative/playlist/SegmentInfoCommon.h \ demux/adaptive/playlist/SegmentInfoCommon.h \
demux/adaptative/playlist/SegmentList.cpp \ demux/adaptive/playlist/SegmentList.cpp \
demux/adaptative/playlist/SegmentList.h \ demux/adaptive/playlist/SegmentList.h \
demux/adaptative/playlist/SegmentTimeline.cpp \ demux/adaptive/playlist/SegmentTimeline.cpp \
demux/adaptative/playlist/SegmentTimeline.h \ demux/adaptive/playlist/SegmentTimeline.h \
demux/adaptative/playlist/SegmentInformation.cpp \ demux/adaptive/playlist/SegmentInformation.cpp \
demux/adaptative/playlist/SegmentInformation.hpp \ demux/adaptive/playlist/SegmentInformation.hpp \
demux/adaptative/playlist/SegmentTemplate.cpp \ demux/adaptive/playlist/SegmentTemplate.cpp \
demux/adaptative/playlist/SegmentTemplate.h \ demux/adaptive/playlist/SegmentTemplate.h \
demux/adaptative/playlist/Url.cpp \ demux/adaptive/playlist/Url.cpp \
demux/adaptative/playlist/Url.hpp \ demux/adaptive/playlist/Url.hpp \
demux/adaptative/playlist/Templates.hpp \ demux/adaptive/playlist/Templates.hpp \
demux/adaptative/logic/AbstractAdaptationLogic.cpp \ demux/adaptive/logic/AbstractAdaptationLogic.cpp \
demux/adaptative/logic/AbstractAdaptationLogic.h \ demux/adaptive/logic/AbstractAdaptationLogic.h \
demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp \ demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp \
demux/adaptative/logic/AlwaysBestAdaptationLogic.h \ demux/adaptive/logic/AlwaysBestAdaptationLogic.h \
demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp \ demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp \
demux/adaptative/logic/AlwaysLowestAdaptationLogic.hpp \ demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp \
demux/adaptative/logic/IDownloadRateObserver.h \ demux/adaptive/logic/IDownloadRateObserver.h \
demux/adaptative/logic/RateBasedAdaptationLogic.h \ demux/adaptive/logic/RateBasedAdaptationLogic.h \
demux/adaptative/logic/RateBasedAdaptationLogic.cpp \ demux/adaptive/logic/RateBasedAdaptationLogic.cpp \
demux/adaptative/logic/Representationselectors.hpp \ demux/adaptive/logic/Representationselectors.hpp \
demux/adaptative/logic/Representationselectors.cpp \ demux/adaptive/logic/Representationselectors.cpp \
demux/adaptative/mp4/AtomsReader.cpp \ demux/adaptive/mp4/AtomsReader.cpp \
demux/adaptative/mp4/AtomsReader.hpp \ demux/adaptive/mp4/AtomsReader.hpp \
demux/adaptative/http/BytesRange.cpp \ demux/adaptive/http/BytesRange.cpp \
demux/adaptative/http/BytesRange.hpp \ demux/adaptive/http/BytesRange.hpp \
demux/adaptative/http/Chunk.cpp \ demux/adaptive/http/Chunk.cpp \
demux/adaptative/http/Chunk.h \ demux/adaptive/http/Chunk.h \
demux/adaptative/http/Downloader.cpp \ demux/adaptive/http/Downloader.cpp \
demux/adaptative/http/Downloader.hpp \ demux/adaptive/http/Downloader.hpp \
demux/adaptative/http/HTTPConnection.cpp \ demux/adaptive/http/HTTPConnection.cpp \
demux/adaptative/http/HTTPConnection.hpp \ demux/adaptive/http/HTTPConnection.hpp \
demux/adaptative/http/HTTPConnectionManager.cpp \ demux/adaptive/http/HTTPConnectionManager.cpp \
demux/adaptative/http/HTTPConnectionManager.h \ demux/adaptive/http/HTTPConnectionManager.h \
demux/adaptative/http/Sockets.hpp \ demux/adaptive/http/Sockets.hpp \
demux/adaptative/http/Sockets.cpp \ demux/adaptive/http/Sockets.cpp \
demux/adaptative/plumbing/CommandsQueue.cpp \ demux/adaptive/plumbing/CommandsQueue.cpp \
demux/adaptative/plumbing/CommandsQueue.hpp \ demux/adaptive/plumbing/CommandsQueue.hpp \
demux/adaptative/plumbing/Demuxer.cpp \ demux/adaptive/plumbing/Demuxer.cpp \
demux/adaptative/plumbing/Demuxer.hpp \ demux/adaptive/plumbing/Demuxer.hpp \
demux/adaptative/plumbing/FakeESOut.cpp \ demux/adaptive/plumbing/FakeESOut.cpp \
demux/adaptative/plumbing/FakeESOut.hpp \ demux/adaptive/plumbing/FakeESOut.hpp \
demux/adaptative/plumbing/FakeESOutID.cpp \ demux/adaptive/plumbing/FakeESOutID.cpp \
demux/adaptative/plumbing/FakeESOutID.hpp \ demux/adaptive/plumbing/FakeESOutID.hpp \
demux/adaptative/plumbing/SourceStream.cpp \ demux/adaptive/plumbing/SourceStream.cpp \
demux/adaptative/plumbing/SourceStream.hpp \ demux/adaptive/plumbing/SourceStream.hpp \
demux/adaptative/ChunksSource.hpp \ demux/adaptive/ChunksSource.hpp \
demux/adaptative/PlaylistManager.cpp \ demux/adaptive/PlaylistManager.cpp \
demux/adaptative/PlaylistManager.h \ demux/adaptive/PlaylistManager.h \
demux/adaptative/SegmentTracker.cpp \ demux/adaptive/SegmentTracker.cpp \
demux/adaptative/SegmentTracker.hpp \ demux/adaptive/SegmentTracker.hpp \
demux/adaptative/StreamFormat.cpp \ demux/adaptive/StreamFormat.cpp \
demux/adaptative/StreamFormat.hpp \ demux/adaptive/StreamFormat.hpp \
demux/adaptative/Streams.cpp \ demux/adaptive/Streams.cpp \
demux/adaptative/Streams.hpp \ demux/adaptive/Streams.hpp \
demux/adaptative/Time.hpp \ demux/adaptive/Time.hpp \
demux/adaptative/tools/Conversions.hpp \ demux/adaptive/tools/Conversions.hpp \
demux/adaptative/tools/Conversions.cpp \ demux/adaptive/tools/Conversions.cpp \
demux/adaptative/tools/Debug.hpp \ demux/adaptive/tools/Debug.hpp \
demux/adaptative/tools/Helper.cpp \ demux/adaptive/tools/Helper.cpp \
demux/adaptative/tools/Helper.h \ demux/adaptive/tools/Helper.h \
demux/adaptative/tools/Properties.hpp \ demux/adaptive/tools/Properties.hpp \
demux/adaptative/tools/Retrieve.cpp \ demux/adaptive/tools/Retrieve.cpp \
demux/adaptative/tools/Retrieve.hpp \ demux/adaptive/tools/Retrieve.hpp \
demux/adaptative/xml/DOMHelper.cpp \ demux/adaptive/xml/DOMHelper.cpp \
demux/adaptative/xml/DOMHelper.h \ demux/adaptive/xml/DOMHelper.h \
demux/adaptative/xml/DOMParser.cpp \ demux/adaptive/xml/DOMParser.cpp \
demux/adaptative/xml/DOMParser.h \ demux/adaptive/xml/DOMParser.h \
demux/adaptative/xml/Node.cpp \ demux/adaptive/xml/Node.cpp \
demux/adaptative/xml/Node.h demux/adaptive/xml/Node.h
libadaptative_dash_SOURCES = \ libadaptive_dash_SOURCES = \
demux/dash/mpd/AdaptationSet.cpp \ demux/dash/mpd/AdaptationSet.cpp \
demux/dash/mpd/AdaptationSet.h \ demux/dash/mpd/AdaptationSet.h \
demux/dash/mpd/DASHCommonAttributesElements.cpp \ demux/dash/mpd/DASHCommonAttributesElements.cpp \
...@@ -389,7 +389,7 @@ libadaptative_dash_SOURCES = \ ...@@ -389,7 +389,7 @@ libadaptative_dash_SOURCES = \
demux/dash/DASHStream.cpp \ demux/dash/DASHStream.cpp \
demux/dash/DASHStream.hpp demux/dash/DASHStream.hpp
libadaptative_hls_SOURCES = \ libadaptive_hls_SOURCES = \
demux/hls/playlist/M3U8.hpp \ demux/hls/playlist/M3U8.hpp \
demux/hls/playlist/M3U8.cpp \ demux/hls/playlist/M3U8.cpp \
demux/hls/playlist/Parser.hpp \ demux/hls/playlist/Parser.hpp \
...@@ -405,7 +405,7 @@ libadaptative_hls_SOURCES = \ ...@@ -405,7 +405,7 @@ libadaptative_hls_SOURCES = \
demux/hls/HLSStreams.hpp \ demux/hls/HLSStreams.hpp \
demux/hls/HLSStreams.cpp demux/hls/HLSStreams.cpp
libadaptative_smooth_SOURCES = \ libadaptive_smooth_SOURCES = \
demux/smooth/mp4/IndexReader.cpp \ demux/smooth/mp4/IndexReader.cpp \
demux/smooth/mp4/IndexReader.hpp \ demux/smooth/mp4/IndexReader.hpp \
demux/smooth/playlist/ForgedInitSegment.hpp \ demux/smooth/playlist/ForgedInitSegment.hpp \
...@@ -424,24 +424,24 @@ libadaptative_smooth_SOURCES = \ ...@@ -424,24 +424,24 @@ libadaptative_smooth_SOURCES = \
demux/smooth/SmoothManager.cpp \ demux/smooth/SmoothManager.cpp \
demux/smooth/SmoothStream.hpp \ demux/smooth/SmoothStream.hpp \
demux/smooth/SmoothStream.cpp demux/smooth/SmoothStream.cpp
libadaptative_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 packetizer/h264_nal.c packetizer/h264_nal.h
libadaptative_plugin_la_SOURCES += $(libadaptative_hls_SOURCES) libadaptive_plugin_la_SOURCES += $(libadaptive_hls_SOURCES)
libadaptative_plugin_la_SOURCES += $(libadaptative_dash_SOURCES) libadaptive_plugin_la_SOURCES += $(libadaptive_dash_SOURCES)
libadaptative_plugin_la_SOURCES += $(libadaptative_smooth_SOURCES) libadaptive_plugin_la_SOURCES += $(libadaptive_smooth_SOURCES)
libadaptative_plugin_la_SOURCES += demux/adaptative/adaptative.cpp libadaptive_plugin_la_SOURCES += demux/adaptive/adaptive.cpp
libadaptative_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h libadaptive_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
libadaptative_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir)/demux/adaptative libadaptive_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir)/demux/adaptive
libadaptative_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM) libadaptive_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
if HAVE_ZLIB if HAVE_ZLIB
libadaptative_plugin_la_LIBADD += -lz libadaptive_plugin_la_LIBADD += -lz
endif endif
if HAVE_GCRYPT if HAVE_GCRYPT
libadaptative_plugin_la_CXXFLAGS += $(GCRYPT_CFLAGS) libadaptive_plugin_la_CXXFLAGS += $(GCRYPT_CFLAGS)
libadaptative_plugin_la_LIBADD += $(GCRYPT_LIBS) libadaptive_plugin_la_LIBADD += $(GCRYPT_LIBS)
endif endif
demux_LTLIBRARIES += libadaptative_plugin.la demux_LTLIBRARIES += libadaptive_plugin.la
libttml_plugin_la_SOURCES = demux/ttml.c libttml_plugin_la_SOURCES = demux/ttml.c
demux_LTLIBRARIES += libttml_plugin.la demux_LTLIBRARIES += libttml_plugin.la
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <vlc_common.h> #include <vlc_common.h>
namespace adaptative namespace adaptive
{ {
class ChunksSource class ChunksSource
{ {
......
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
#include <ctime> #include <ctime>
using namespace adaptative::http; using namespace adaptive::http;
using namespace adaptative::logic; using namespace adaptive::logic;
using namespace adaptative; using namespace adaptive;
PlaylistManager::PlaylistManager( demux_t *p_demux_, PlaylistManager::PlaylistManager( demux_t *p_demux_,
AbstractPlaylist *pl, AbstractPlaylist *pl,
...@@ -444,7 +444,7 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L ...@@ -444,7 +444,7 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L
{ {
case AbstractAdaptationLogic::FixedRate: case AbstractAdaptationLogic::FixedRate:
{ {
size_t bps = var_InheritInteger(p_demux, "adaptative-bw") * 8192; size_t bps = var_InheritInteger(p_demux, "adaptive-bw") * 8192;
return new (std::nothrow) FixedRateAdaptationLogic(bps); return new (std::nothrow) FixedRateAdaptationLogic(bps);
} }
case AbstractAdaptationLogic::AlwaysLowest: case AbstractAdaptationLogic::AlwaysLowest:
...@@ -454,8 +454,8 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L ...@@ -454,8 +454,8 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L
case AbstractAdaptationLogic::Default: case AbstractAdaptationLogic::Default:
case AbstractAdaptationLogic::RateBased: case AbstractAdaptationLogic::RateBased:
{ {
int width = var_InheritInteger(p_demux, "adaptative-width"); int width = var_InheritInteger(p_demux, "adaptive-width");
int height = var_InheritInteger(p_demux, "adaptative-height"); int height = var_InheritInteger(p_demux, "adaptive-height");
RateBasedAdaptationLogic *logic = RateBasedAdaptationLogic *logic =
new (std::nothrow) RateBasedAdaptationLogic(VLC_OBJECT(p_demux), width, height); new (std::nothrow) RateBasedAdaptationLogic(VLC_OBJECT(p_demux), width, height);
conn->setDownloadRateObserver(logic); conn->setDownloadRateObserver(logic);
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "Streams.hpp" #include "Streams.hpp"
#include <vector> #include <vector>
namespace adaptative namespace adaptive
{ {
namespace playlist namespace playlist
{ {
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
#include "playlist/SegmentChunk.hpp" #include "playlist/SegmentChunk.hpp"
#include "logic/AbstractAdaptationLogic.h" #include "logic/AbstractAdaptationLogic.h"
using namespace adaptative; using namespace adaptive;
using namespace adaptative::logic; using namespace adaptive::logic;
using namespace adaptative::playlist; using namespace adaptive::playlist;
SegmentTrackerEvent::SegmentTrackerEvent(SegmentChunk *s) SegmentTrackerEvent::SegmentTrackerEvent(SegmentChunk *s)
{ {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <vlc_common.h> #include <vlc_common.h>
#include <list> #include <list>
namespace adaptative namespace adaptive
{ {
namespace http namespace http
{ {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
*****************************************************************************/ *****************************************************************************/
#include "StreamFormat.hpp" #include "StreamFormat.hpp"
using namespace adaptative; using namespace adaptive;
StreamFormat::operator unsigned() const StreamFormat::operator unsigned() const
{ {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <string> #include <string>
namespace adaptative namespace adaptive
{ {
class StreamFormat class StreamFormat
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include "tools/Debug.hpp" #include "tools/Debug.hpp"
#include <vlc_demux.h> #include <vlc_demux.h>
using namespace adaptative; using namespace adaptive;
using namespace adaptative::http; using namespace adaptive::http;
AbstractStream::AbstractStream(demux_t * demux_, const StreamFormat &format_) AbstractStream::AbstractStream(demux_t * demux_, const StreamFormat &format_)
{ {
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <string> #include <string>
namespace adaptative namespace adaptive
{ {
class SegmentTracker; class SegmentTracker;
......
/***************************************************************************** /*****************************************************************************
* adaptative.cpp: Adaptative streaming module * adaptive.cpp: Adaptative streaming module
***************************************************************************** *****************************************************************************
* Copyright © 2015 - VideoLAN and VLC Authors * Copyright © 2015 - VideoLAN and VLC Authors
* *
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
#include "../smooth/SmoothStream.hpp" #include "../smooth/SmoothStream.hpp"
#include "../smooth/playlist/Parser.hpp" #include "../smooth/playlist/Parser.hpp"
using namespace adaptative::logic; using namespace adaptive::logic;
using namespace adaptative::playlist; using namespace adaptive::playlist;
using namespace adaptative::xml; using namespace adaptive::xml;
using namespace dash::mpd; using namespace dash::mpd;
using namespace dash; using namespace dash;
using namespace hls; using namespace hls;
...@@ -68,7 +68,7 @@ static void Close (vlc_object_t *); ...@@ -68,7 +68,7 @@ static void Close (vlc_object_t *);
#define ADAPT_HEIGHT_TEXT N_("Preferred Height") #define ADAPT_HEIGHT_TEXT N_("Preferred Height")
#define ADAPT_BW_TEXT N_("Fixed Bandwidth in KiB/s") #define ADAPT_BW_TEXT N_("Fixed Bandwidth in KiB/s")
#define ADAPT_BW_LONGTEXT N_("Preferred bandwidth for non adaptative streams") #define ADAPT_BW_LONGTEXT N_("Preferred bandwidth for non adaptive streams")
#define ADAPT_LOGIC_TEXT N_("Adaptation Logic") #define ADAPT_LOGIC_TEXT N_("Adaptation Logic")
...@@ -84,16 +84,16 @@ static const char *const ppsz_logics[] = { N_("Bandwidth Adaptive"), ...@@ -84,16 +84,16 @@ static const char *const ppsz_logics[] = { N_("Bandwidth Adaptive"),
vlc_module_begin () vlc_module_begin ()
set_shortname( N_("Adaptative")) set_shortname( N_("Adaptative"))
set_description( N_("Unified adaptative streaming for DASH/HLS") ) set_description( N_("Unified adaptive streaming for DASH/HLS") )
set_capability( "demux", 12 ) set_capability( "demux", 12 )
set_category( CAT_INPUT ) set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX ) set_subcategory( SUBCAT_INPUT_DEMUX )
add_integer( "adaptative-logic", AbstractAdaptationLogic::Default, add_integer( "adaptive-logic", AbstractAdaptationLogic::Default,
ADAPT_LOGIC_TEXT, NULL, false ) ADAPT_LOGIC_TEXT, NULL, false )
change_integer_list( pi_logics, ppsz_logics ) change_integer_list( pi_logics, ppsz_logics )
add_integer( "adaptative-width", 480, ADAPT_WIDTH_TEXT, ADAPT_WIDTH_TEXT, true ) add_integer( "adaptive-width", 480, ADAPT_WIDTH_TEXT, ADAPT_WIDTH_TEXT, true )
add_integer( "adaptative-height", 360, ADAPT_HEIGHT_TEXT, ADAPT_HEIGHT_TEXT, true ) add_integer( "adaptive-height", 360, ADAPT_HEIGHT_TEXT, ADAPT_HEIGHT_TEXT, true )
add_integer( "adaptative-bw", 250, ADAPT_BW_TEXT, ADAPT_BW_LONGTEXT, false ) add_integer( "adaptive-bw", 250, ADAPT_BW_TEXT, ADAPT_BW_LONGTEXT, false )
set_callbacks( Open, Close ) set_callbacks( Open, Close )
vlc_module_end () vlc_module_end ()
...@@ -123,7 +123,7 @@ static int Open(vlc_object_t *p_obj) ...@@ -123,7 +123,7 @@ static int Open(vlc_object_t *p_obj)
PlaylistManager *p_manager = NULL; PlaylistManager *p_manager = NULL;
AbstractAdaptationLogic::LogicType logic = AbstractAdaptationLogic::LogicType logic =
static_cast<AbstractAdaptationLogic::LogicType>(var_InheritInteger(p_obj, "adaptative-logic")); static_cast<AbstractAdaptationLogic::LogicType>(var_InheritInteger(p_obj, "adaptive-logic"));
std::string playlisturl(p_demux->psz_access); std::string playlisturl(p_demux->psz_access);
playlisturl.append("://"); playlisturl.append("://");
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
*****************************************************************************/ *****************************************************************************/
#include "BytesRange.hpp" #include "BytesRange.hpp"
using namespace adaptative::http; using namespace adaptive::http;
BytesRange::BytesRange() BytesRange::BytesRange()
{ {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <vlc_common.h> #include <vlc_common.h>
namespace adaptative namespace adaptive
{ {
namespace http namespace http
{ {
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <algorithm> #include <algorithm>
using namespace adaptative::http; using namespace adaptive::http;
AbstractChunkSource::AbstractChunkSource() AbstractChunkSource::AbstractChunkSource()
{ {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
typedef struct block_t block_t; typedef struct block_t block_t;
namespace adaptative namespace adaptive
{ {
namespace http namespace http
{ {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <vlc_threads.h> #include <vlc_threads.h>
#include <vlc_atomic.h> #include <vlc_atomic.h>
using namespace adaptative::http; using namespace adaptive::http;