Skip to content

Commit 7128551

Browse files
committed
onebinary: fixes for various outputs
1 parent 9508bd8 commit 7128551

31 files changed

+86
-5
lines changed

lib/downloader.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#pragma once
12
#include "http_parser.h"
23
#include "socket.h"
34
#include "url.h"

meson.build

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,6 @@ exec_tgts = []
206206
make_header = find_program('scripts/make_header.sh')
207207

208208
onebinary_stuff = []
209-
onebinary_stuff += 'MistOutRTMP'
210-
onebinary_stuff += 'MistOutHLS'
211-
onebinary_stuff += 'MistOutHTTP'
212209
onebinary_stuff += 'MistInAAC'
213210
onebinary_stuff += 'MistInBalancer'
214211
onebinary_stuff += 'MistInBuffer'
@@ -230,6 +227,33 @@ onebinary_stuff += 'MistInSubRip'
230227
onebinary_stuff += 'MistInTS'
231228
# onebinary_stuff += 'MistInTSRIST'
232229
# onebinary_stuff += 'MistInTSSRT'
230+
onebinary_stuff += 'MistOutAAC'
231+
# onebinary_stuff += 'MistOutCMAF'
232+
onebinary_stuff += 'MistOutDTSC'
233+
onebinary_stuff += 'MistOutEBML'
234+
onebinary_stuff += 'MistOutFLAC'
235+
onebinary_stuff += 'MistOutFLV'
236+
onebinary_stuff += 'MistOutH264'
237+
onebinary_stuff += 'MistOutHDS'
238+
# onebinary_stuff += 'MistOutHLS'
239+
onebinary_stuff += 'MistOutHTTP'
240+
onebinary_stuff += 'MistOutHTTPMinimalServer'
241+
onebinary_stuff += 'MistOutHTTPS'
242+
# onebinary_stuff += 'MistOutHTTPTS'
243+
onebinary_stuff += 'MistOutJSON'
244+
onebinary_stuff += 'MistOutJSONLine'
245+
onebinary_stuff += 'MistOutMP3'
246+
onebinary_stuff += 'MistOutMP4'
247+
onebinary_stuff += 'MistOutOGG'
248+
onebinary_stuff += 'MistOutRTMP'
249+
onebinary_stuff += 'MistOutRTSP'
250+
# onebinary_stuff += 'MistOutSDP'
251+
# onebinary_stuff += 'MistOutSubRip'
252+
onebinary_stuff += 'MistOutTS'
253+
# onebinary_stuff += 'MistOutTSRIST'
254+
# onebinary_stuff += 'MistOutTSSRT'
255+
onebinary_stuff += 'MistOutWAV'
256+
# onebinary_stuff += 'MistOutWebRTC'
233257

234258
onebinary_tgts = []
235259
onebinary_headers = []
@@ -296,7 +320,7 @@ onebinary = executable(
296320
onebinary_header,
297321
],
298322
cpp_args: [
299-
'-DTS_BASECLASS=HTTPOutput',
323+
'-DTS_BASECLASS=Output',
300324
'-DONE_BINARY=1',
301325
],
302326
dependencies : [libmist_dep],

src/output/output_aac.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ namespace Mist{
1515
};
1616
}// namespace Mist
1717

18+
#ifndef ONE_BINARY
1819
typedef Mist::OutAAC mistOut;
20+
#endif

src/output/output_cmaf.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,6 @@ namespace Mist{
8181
};
8282
}// namespace Mist
8383

84+
#ifndef ONE_BINARY
8485
typedef Mist::OutCMAF mistOut;
86+
#endif

src/output/output_dtsc.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,6 @@ namespace Mist{
2727
};
2828
}// namespace Mist
2929

30+
#ifndef ONE_BINARY
3031
typedef Mist::OutDTSC mistOut;
32+
#endif

src/output/output_ebml.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,6 @@ namespace Mist{
3939
};
4040
}// namespace Mist
4141

42+
#ifndef ONE_BINARY
4243
typedef Mist::OutEBML mistOut;
44+
#endif

src/output/output_flac.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ namespace Mist{
1414
};
1515
}// namespace Mist
1616

17+
#ifndef ONE_BINARY
1718
typedef Mist::OutFLAC mistOut;
19+
#endif

src/output/output_flv.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ namespace Mist{
1717
};
1818
}// namespace Mist
1919

20+
#ifndef ONE_BINARY
2021
typedef Mist::OutFLV mistOut;
22+
#endif

src/output/output_h264.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,6 @@ namespace Mist{
3030
};
3131
}// namespace Mist
3232

33+
#ifndef ONE_BINARY
3334
typedef Mist::OutH264 mistOut;
35+
#endif

src/output/output_hds.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ namespace Mist{
2323
};
2424
}// namespace Mist
2525

26+
#ifndef ONE_BINARY
2627
typedef Mist::OutHDS mistOut;
28+
#endif

0 commit comments

Comments
 (0)