[vlc-commits] [Git][videolan/vlc][master] 10 commits: adaptive: Chunk.h: remove unused vector include

Steve Lhomme (@robUx4) gitlab at videolan.org
Wed Sep 14 12:37:00 UTC 2022



Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0e7255eb by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
adaptive: Chunk.h: remove unused vector include

Also use cstdint instead of stdint.h.

- - - - -
7ba8b258 by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
logic: BufferingLogic: remove unused vector include

- - - - -
a794293f by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
SegmentChunk: remove unused string include

- - - - -
433288f3 by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
SegmentBaseType: remove unneeded forward decl.

- - - - -
5a201f52 by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
demux: adaptive: remove unused Properties.hpp include

Together with the previous commit, it is now possible to remove includes
of SegmentBase.h without breaking because Templates.hpp relied on an
include from SegmentBase.h.

- - - - -
f2910d24 by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
adaptive: Streams: remove unused SourceStream.hpp include

- - - - -
e74cb4c2 by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
demux: remove unneeded BasePeriod include/fwd decl.

Also removed unused cassert include in HLSRepresentation.cpp.

- - - - -
e5e06f34 by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
AdaptationSet: remove unused map, string and vector includes

- - - - -
d855b207 by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
ProgramInformation: remove unused map include

- - - - -
5326acd8 by Johannes Kauffmann at 2022-09-14T12:12:46+00:00
SourceStream: remove unused string, vlc_block.h includes

- - - - -


24 changed files:

- modules/demux/adaptive/Streams.hpp
- modules/demux/adaptive/adaptive.cpp
- modules/demux/adaptive/http/Chunk.h
- modules/demux/adaptive/logic/BufferingLogic.cpp
- modules/demux/adaptive/logic/BufferingLogic.hpp
- modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
- modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp
- modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
- modules/demux/adaptive/logic/Representationselectors.cpp
- modules/demux/adaptive/playlist/SegmentBase.h
- modules/demux/adaptive/playlist/SegmentBaseType.hpp
- modules/demux/adaptive/playlist/SegmentChunk.hpp
- modules/demux/adaptive/plumbing/SourceStream.hpp
- modules/demux/adaptive/test/playlist/SegmentBase.cpp
- modules/demux/adaptive/test/playlist/SegmentList.cpp
- modules/demux/adaptive/test/playlist/SegmentTimeline.cpp
- modules/demux/dash/mpd/AdaptationSet.cpp
- modules/demux/dash/mpd/AdaptationSet.h
- modules/demux/dash/mpd/MPD.cpp
- modules/demux/dash/mpd/ProgramInformation.h
- modules/demux/hls/playlist/HLSRepresentation.cpp
- modules/demux/hls/playlist/Parser.hpp
- modules/demux/smooth/playlist/Manifest.cpp
- modules/demux/smooth/playlist/SmoothParser.hpp


Changes:

=====================================
modules/demux/adaptive/Streams.hpp
=====================================
@@ -27,7 +27,6 @@
 
 #include "plumbing/CommandsQueue.hpp"
 #include "plumbing/Demuxer.hpp"
-#include "plumbing/SourceStream.hpp"
 #include "plumbing/FakeESOut.hpp"
 
 #include "Time.hpp"


=====================================
modules/demux/adaptive/adaptive.cpp
=====================================
@@ -33,7 +33,6 @@
 #include <vlc_demux.h>
 
 #include "SharedResources.hpp"
-#include "playlist/BasePeriod.h"
 #include "logic/BufferingLogic.hpp"
 #include "xml/DOMParser.h"
 


=====================================
modules/demux/adaptive/http/Chunk.h
=====================================
@@ -25,12 +25,12 @@
 #ifndef CHUNK_H_
 #define CHUNK_H_
 
+#include <cstdint>
+#include <string>
+
 #include "BytesRange.hpp"
 #include "ConnectionParams.hpp"
 #include "../ID.hpp"
-#include <vector>
-#include <string>
-#include <stdint.h>
 #include <vlc_cxx_helpers.hpp>
 
 typedef struct vlc_frame_t block_t;


=====================================
modules/demux/adaptive/logic/BufferingLogic.cpp
=====================================
@@ -23,7 +23,6 @@
 
 #include "BufferingLogic.hpp"
 #include "../playlist/BaseRepresentation.h"
-#include "../playlist/BasePeriod.h"
 #include "../playlist/BasePlaylist.hpp"
 #include "../playlist/SegmentTemplate.h"
 #include "../playlist/SegmentTimeline.h"


=====================================
modules/demux/adaptive/logic/BufferingLogic.hpp
=====================================
@@ -20,8 +20,8 @@
 #ifndef BUFFERINGLOGIC_HPP
 #define BUFFERINGLOGIC_HPP
 
-#include <vector>
 #include <vlc_common.h>
+
 #include "../tools/Properties.hpp"
 
 namespace adaptive


=====================================
modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
=====================================
@@ -26,7 +26,6 @@
 
 #include "../playlist/BaseAdaptationSet.h"
 #include "../playlist/BaseRepresentation.h"
-#include "../playlist/BasePeriod.h"
 #include "../http/Chunk.h"
 #include "../tools/Debug.hpp"
 


=====================================
modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp
=====================================
@@ -27,7 +27,6 @@
 
 #include "../playlist/BaseAdaptationSet.h"
 #include "../playlist/BaseRepresentation.h"
-#include "../playlist/BasePeriod.h"
 #include "../http/Chunk.h"
 #include "../tools/Debug.hpp"
 


=====================================
modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
=====================================
@@ -29,7 +29,6 @@
 #include "Representationselectors.hpp"
 
 #include "../playlist/BaseRepresentation.h"
-#include "../playlist/BasePeriod.h"
 #include "../http/Chunk.h"
 #include "../tools/Debug.hpp"
 


=====================================
modules/demux/adaptive/logic/Representationselectors.cpp
=====================================
@@ -24,9 +24,9 @@
 #include "Representationselectors.hpp"
 #include "../playlist/BaseRepresentation.h"
 #include "../playlist/BaseAdaptationSet.h"
-#include "../playlist/BasePeriod.h"
-#include <limits>
+
 #include <algorithm>
+#include <limits>
 
 using namespace adaptive::logic;
 


=====================================
modules/demux/adaptive/playlist/SegmentBase.h
=====================================
@@ -27,7 +27,6 @@
 
 #include "Segment.h"
 #include "SegmentBaseType.hpp"
-#include "../tools/Properties.hpp"
 
 namespace adaptive
 {


=====================================
modules/demux/adaptive/playlist/SegmentBaseType.hpp
=====================================
@@ -23,14 +23,12 @@
 #include "Segment.h"
 #include "Inheritables.hpp"
 #include "Templates.hpp"
-#include "../tools/Properties.hpp"
 
 namespace adaptive
 {
     namespace playlist
     {
         class SegmentInformation;
-        class SegmentTimeline;
 
         class AbstractSegmentBaseType : public Initializable<InitSegment>,
                                         public Indexable<IndexSegment>,


=====================================
modules/demux/adaptive/playlist/SegmentChunk.hpp
=====================================
@@ -20,7 +20,6 @@
 #ifndef SEGMENTCHUNK_HPP
 #define SEGMENTCHUNK_HPP
 
-#include <string>
 #include "../http/Chunk.h"
 #include "../StreamFormat.hpp"
 


=====================================
modules/demux/adaptive/plumbing/SourceStream.hpp
=====================================
@@ -21,9 +21,7 @@
 #define SOURCESTREAM_HPP
 
 #include <vlc_common.h>
-#include <vlc_block.h>
 #include <vlc_block_helper.h>
-#include <string>
 
 namespace adaptive
 {


=====================================
modules/demux/adaptive/test/playlist/SegmentBase.cpp
=====================================
@@ -23,7 +23,6 @@
 
 #include "../../playlist/Segment.h"
 #include "../../playlist/SegmentBase.h"
-#include "../../playlist/BasePeriod.h"
 #include "../../playlist/BaseAdaptationSet.h"
 #include "../../playlist/BaseRepresentation.h"
 #include "../../playlist/SegmentInformation.hpp"


=====================================
modules/demux/adaptive/test/playlist/SegmentList.cpp
=====================================
@@ -24,7 +24,6 @@
 #include "../../playlist/Segment.h"
 #include "../../playlist/SegmentList.h"
 #include "../../playlist/SegmentTimeline.h"
-#include "../../playlist/BasePeriod.h"
 #include "../../playlist/BaseAdaptationSet.h"
 #include "../../playlist/BaseRepresentation.h"
 


=====================================
modules/demux/adaptive/test/playlist/SegmentTimeline.cpp
=====================================
@@ -23,7 +23,6 @@
 
 #include "../../playlist/Segment.h"
 #include "../../playlist/SegmentTimeline.h"
-#include "../../playlist/BasePeriod.h"
 #include "../../playlist/BaseAdaptationSet.h"
 #include "../../playlist/BaseRepresentation.h"
 


=====================================
modules/demux/dash/mpd/AdaptationSet.cpp
=====================================
@@ -27,7 +27,6 @@
 
 #include "AdaptationSet.h"
 #include "Representation.h"
-#include "../../adaptive/playlist/BasePeriod.h"
 #include "MPD.h"
 
 using namespace dash::mpd;


=====================================
modules/demux/dash/mpd/AdaptationSet.h
=====================================
@@ -25,10 +25,6 @@
 #ifndef ADAPTATIONSET_H_
 #define ADAPTATIONSET_H_
 
-#include <vector>
-#include <string>
-#include <map>
-
 #include "../../adaptive/playlist/BaseAdaptationSet.h"
 #include "DASHCommonAttributesElements.h"
 


=====================================
modules/demux/dash/mpd/MPD.cpp
=====================================
@@ -29,7 +29,6 @@
 
 #include "MPD.h"
 #include "ProgramInformation.h"
-#include "../../adaptive/playlist/BasePeriod.h"
 
 #include <vlc_common.h>
 #include <vlc_stream.h>


=====================================
modules/demux/dash/mpd/ProgramInformation.h
=====================================
@@ -26,7 +26,6 @@
 #define PROGRAMINFORMATION_H_
 
 #include <string>
-#include <map>
 
 namespace dash
 {


=====================================
modules/demux/hls/playlist/HLSRepresentation.cpp
=====================================
@@ -27,13 +27,11 @@
 #include "M3U8.hpp"
 #include "Parser.hpp"
 #include "HLSSegment.hpp"
-#include "../../adaptive/playlist/BasePeriod.h"
 #include "../../adaptive/playlist/BaseAdaptationSet.h"
 #include "../../adaptive/playlist/SegmentList.h"
 
 #include <ctime>
 #include <limits>
-#include <cassert>
 
 using namespace hls;
 using namespace hls::playlist;


=====================================
modules/demux/hls/playlist/Parser.hpp
=====================================
@@ -36,7 +36,6 @@ namespace adaptive
     {
         class SegmentInformation;
         class SegmentTemplate;
-        class BasePeriod;
         class BaseAdaptationSet;
     }
 }


=====================================
modules/demux/smooth/playlist/Manifest.cpp
=====================================
@@ -22,7 +22,6 @@
 #endif
 
 #include "Manifest.hpp"
-#include "../../adaptive/playlist/BasePeriod.h"
 
 #include <vlc_common.h>
 


=====================================
modules/demux/smooth/playlist/SmoothParser.hpp
=====================================
@@ -33,7 +33,6 @@ namespace adaptive
     {
         class SegmentInformation;
         class SegmentTemplate;
-        class BasePeriod;
         class BaseAdaptationSet;
     }
     namespace xml



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f3d1d1b4b0db72252e0e79f662aa6f9217324075...5326acd8381f855e27ba7cc1dd09bfd00e72e40e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f3d1d1b4b0db72252e0e79f662aa6f9217324075...5326acd8381f855e27ba7cc1dd09bfd00e72e40e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance


More information about the vlc-commits mailing list