Skip to content

Commit 5e2a997

Browse files
authored
Merge pull request #15 from skyway/update/v3.3.1
v3.3.1
2 parents 3380b9a + ecd69cd commit 5e2a997

199 files changed

Lines changed: 4114 additions & 2133 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/annotated.html

Lines changed: 130 additions & 127 deletions
Large diffs are not rendered by default.

docs/annotated_dup.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,21 @@ var annotated_dup =
4646
[ "RemoteVideoStream", "classskyway_1_1core_1_1stream_1_1remote_1_1_remote_video_stream.html", "classskyway_1_1core_1_1stream_1_1remote_1_1_remote_video_stream" ]
4747
] ]
4848
] ],
49-
[ "Context", "classskyway_1_1core_1_1_context.html", "classskyway_1_1core_1_1_context" ],
5049
[ "ContextOptions", "structskyway_1_1core_1_1_context_options.html", "structskyway_1_1core_1_1_context_options" ],
5150
[ "Publication", "classskyway_1_1core_1_1_publication.html", "classskyway_1_1core_1_1_publication" ],
5251
[ "Subscription", "classskyway_1_1core_1_1_subscription.html", "classskyway_1_1core_1_1_subscription" ]
5352
] ],
5453
[ "global", null, [
5554
[ "interface", null, [
56-
[ "Logger", "classskyway_1_1global_1_1interface_1_1_logger.html", "classskyway_1_1global_1_1interface_1_1_logger" ]
55+
[ "Logger", "classskyway_1_1global_1_1interface_1_1_logger.html", "classskyway_1_1global_1_1interface_1_1_logger" ],
56+
[ "LoggerObserver", "classskyway_1_1global_1_1interface_1_1_logger_observer.html", "classskyway_1_1global_1_1interface_1_1_logger_observer" ]
57+
] ],
58+
[ "util", null, [
59+
[ "ScopeExit", "classskyway_1_1global_1_1util_1_1_scope_exit.html", null ]
5760
] ],
5861
[ "Error", "structskyway_1_1global_1_1_error.html", null ],
59-
[ "Logger", "classskyway_1_1global_1_1_logger.html", "classskyway_1_1global_1_1_logger" ]
62+
[ "Logger", "classskyway_1_1global_1_1_logger.html", "classskyway_1_1global_1_1_logger" ],
63+
[ "LoggerObserver", "classskyway_1_1global_1_1_logger_observer.html", null ]
6064
] ],
6165
[ "media", null, [
6266
[ "audio", null, [

docs/audio__data__forwarder_8hpp_source.html

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -115,35 +115,40 @@
115115
<div class="line"><a id="l00005" name="l00005"></a><span class="lineno"> 5</span><span class="preprocessor">#ifndef SKYWAY_CONTENT_AUDIO_DATA_FORWARDER_HPP</span></div>
116116
<div class="line"><a id="l00006" name="l00006"></a><span class="lineno"> 6</span><span class="preprocessor">#define SKYWAY_CONTENT_AUDIO_DATA_FORWARDER_HPP</span></div>
117117
<div class="line"><a id="l00007" name="l00007"></a><span class="lineno"> 7</span> </div>
118-
<div class="line"><a id="l00008" name="l00008"></a><span class="lineno"> 8</span><span class="preprocessor">#include &quot;audio_data_listener.hpp&quot;</span></div>
118+
<div class="line"><a id="l00008" name="l00008"></a><span class="lineno"> 8</span><span class="preprocessor">#include &lt;memory&gt;</span></div>
119119
<div class="line"><a id="l00009" name="l00009"></a><span class="lineno"> 9</span><span class="preprocessor">#include &lt;mutex&gt;</span></div>
120120
<div class="line"><a id="l00010" name="l00010"></a><span class="lineno"> 10</span><span class="preprocessor">#include &lt;set&gt;</span></div>
121-
<div class="line"><a id="l00011" name="l00011"></a><span class="lineno"> 11</span><span class="preprocessor">#include &lt;memory&gt;</span></div>
122-
<div class="line"><a id="l00012" name="l00012"></a><span class="lineno"> 12</span> </div>
123-
<div class="line"><a id="l00013" name="l00013"></a><span class="lineno"> 13</span><span class="keyword">namespace </span>skyway {</div>
124-
<div class="line"><a id="l00014" name="l00014"></a><span class="lineno"> 14</span><span class="keyword">namespace </span>content {</div>
125-
<div class="line"><a id="l00015" name="l00015"></a><span class="lineno"> 15</span><span class="keyword">namespace </span>audio {</div>
126-
<div class="line"><a id="l00016" name="l00016"></a><span class="lineno"> 16</span> </div>
127-
<div class="foldopen" id="foldopen00017" data-start="{" data-end="};">
128-
<div class="line"><a id="l00017" name="l00017"></a><span class="lineno"><a class="line" href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html"> 17</a></span><span class="keyword">class </span><a class="code hl_class" href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html">AudioDataForwarder</a> {</div>
129-
<div class="line"><a id="l00018" name="l00018"></a><span class="lineno"> 18</span><span class="keyword">public</span>:</div>
130-
<div class="line"><a id="l00019" name="l00019"></a><span class="lineno"> 19</span> <a class="code hl_class" href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html">AudioDataForwarder</a>();</div>
131-
<div class="line"><a id="l00020" name="l00020"></a><span class="lineno"> 20</span> <a class="code hl_class" href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html">~AudioDataForwarder</a>();</div>
132-
<div class="line"><a id="l00021" name="l00021"></a><span class="lineno"> 21</span> <span class="keywordtype">void</span> OnAudioData(<span class="keywordtype">size_t</span> num_channels, <span class="keywordtype">size_t</span> num_frames, <span class="keywordtype">int</span> sample_rate, std::vector&lt;int16_t&gt;&amp; audio_data);</div>
133-
<div class="line"><a id="l00022" name="l00022"></a><span class="lineno"> 22</span> <span class="keywordtype">void</span> AddAudioDataListener(std::shared_ptr&lt;AudioDataListener&gt; listener);</div>
134-
<div class="line"><a id="l00023" name="l00023"></a><span class="lineno"> 23</span> <span class="keywordtype">void</span> RemoveAudioDataListener(std::shared_ptr&lt;AudioDataListener&gt; listener);</div>
135-
<div class="line"><a id="l00024" name="l00024"></a><span class="lineno"> 24</span> <span class="keywordtype">void</span> ClearAudioDataListeners();</div>
136-
<div class="line"><a id="l00025" name="l00025"></a><span class="lineno"> 25</span><span class="keyword">private</span>:</div>
137-
<div class="line"><a id="l00026" name="l00026"></a><span class="lineno"> 26</span> std::vector&lt;std::shared_ptr&lt;AudioDataListener&gt;&gt; audio_data_listeners_;</div>
138-
<div class="line"><a id="l00027" name="l00027"></a><span class="lineno"> 27</span> std::mutex audio_data_listeners_mutex_;</div>
139-
<div class="line"><a id="l00028" name="l00028"></a><span class="lineno"> 28</span>};</div>
121+
<div class="line"><a id="l00011" name="l00011"></a><span class="lineno"> 11</span> </div>
122+
<div class="line"><a id="l00012" name="l00012"></a><span class="lineno"> 12</span><span class="preprocessor">#include &quot;audio_data_listener.hpp&quot;</span></div>
123+
<div class="line"><a id="l00013" name="l00013"></a><span class="lineno"> 13</span> </div>
124+
<div class="line"><a id="l00014" name="l00014"></a><span class="lineno"> 14</span><span class="keyword">namespace </span>skyway {</div>
125+
<div class="line"><a id="l00015" name="l00015"></a><span class="lineno"> 15</span><span class="keyword">namespace </span>content {</div>
126+
<div class="line"><a id="l00016" name="l00016"></a><span class="lineno"> 16</span><span class="keyword">namespace </span>audio {</div>
127+
<div class="line"><a id="l00017" name="l00017"></a><span class="lineno"> 17</span> </div>
128+
<div class="foldopen" id="foldopen00018" data-start="{" data-end="};">
129+
<div class="line"><a id="l00018" name="l00018"></a><span class="lineno"><a class="line" href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html"> 18</a></span><span class="keyword">class </span><a class="code hl_class" href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html">AudioDataForwarder</a> {</div>
130+
<div class="line"><a id="l00019" name="l00019"></a><span class="lineno"> 19</span><span class="keyword">public</span>:</div>
131+
<div class="line"><a id="l00020" name="l00020"></a><span class="lineno"> 20</span> <a class="code hl_class" href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html">AudioDataForwarder</a>();</div>
132+
<div class="line"><a id="l00021" name="l00021"></a><span class="lineno"> 21</span> <a class="code hl_class" href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html">~AudioDataForwarder</a>();</div>
133+
<div class="line"><a id="l00022" name="l00022"></a><span class="lineno"> 22</span> <span class="keywordtype">void</span> OnAudioData(<span class="keywordtype">size_t</span> num_channels,</div>
134+
<div class="line"><a id="l00023" name="l00023"></a><span class="lineno"> 23</span> <span class="keywordtype">size_t</span> num_frames,</div>
135+
<div class="line"><a id="l00024" name="l00024"></a><span class="lineno"> 24</span> <span class="keywordtype">int</span> sample_rate,</div>
136+
<div class="line"><a id="l00025" name="l00025"></a><span class="lineno"> 25</span> std::vector&lt;int16_t&gt;&amp; audio_data);</div>
137+
<div class="line"><a id="l00026" name="l00026"></a><span class="lineno"> 26</span> <span class="keywordtype">void</span> AddAudioDataListener(std::shared_ptr&lt;AudioDataListener&gt; listener);</div>
138+
<div class="line"><a id="l00027" name="l00027"></a><span class="lineno"> 27</span> <span class="keywordtype">void</span> RemoveAudioDataListener(std::shared_ptr&lt;AudioDataListener&gt; listener);</div>
139+
<div class="line"><a id="l00028" name="l00028"></a><span class="lineno"> 28</span> <span class="keywordtype">void</span> ClearAudioDataListeners();</div>
140+
<div class="line"><a id="l00029" name="l00029"></a><span class="lineno"> 29</span> </div>
141+
<div class="line"><a id="l00030" name="l00030"></a><span class="lineno"> 30</span><span class="keyword">private</span>:</div>
142+
<div class="line"><a id="l00031" name="l00031"></a><span class="lineno"> 31</span> std::vector&lt;std::shared_ptr&lt;AudioDataListener&gt;&gt; audio_data_listeners_;</div>
143+
<div class="line"><a id="l00032" name="l00032"></a><span class="lineno"> 32</span> std::mutex audio_data_listeners_mutex_;</div>
144+
<div class="line"><a id="l00033" name="l00033"></a><span class="lineno"> 33</span>};</div>
140145
</div>
141-
<div class="line"><a id="l00029" name="l00029"></a><span class="lineno"> 29</span>}</div>
142-
<div class="line"><a id="l00030" name="l00030"></a><span class="lineno"> 30</span>}</div>
143-
<div class="line"><a id="l00031" name="l00031"></a><span class="lineno"> 31</span>}</div>
144-
<div class="line"><a id="l00032" name="l00032"></a><span class="lineno"> 32</span> </div>
145-
<div class="line"><a id="l00033" name="l00033"></a><span class="lineno"> 33</span><span class="preprocessor">#endif </span><span class="comment">//SKYWAY_CONTENT_AUDIO_DATA_FORWARDER_HPP</span></div>
146-
<div class="ttc" id="aclassskyway_1_1content_1_1audio_1_1_audio_data_forwarder_html"><div class="ttname"><a href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html">skyway::content::audio::AudioDataForwarder</a></div><div class="ttdef"><b>Definition</b> audio_data_forwarder.hpp:17</div></div>
146+
<div class="line"><a id="l00034" name="l00034"></a><span class="lineno"> 34</span>} <span class="comment">// namespace audio</span></div>
147+
<div class="line"><a id="l00035" name="l00035"></a><span class="lineno"> 35</span>} <span class="comment">// namespace content</span></div>
148+
<div class="line"><a id="l00036" name="l00036"></a><span class="lineno"> 36</span>} <span class="comment">// namespace skyway</span></div>
149+
<div class="line"><a id="l00037" name="l00037"></a><span class="lineno"> 37</span> </div>
150+
<div class="line"><a id="l00038" name="l00038"></a><span class="lineno"> 38</span><span class="preprocessor">#endif </span><span class="comment">// SKYWAY_CONTENT_AUDIO_DATA_FORWARDER_HPP</span></div>
151+
<div class="ttc" id="aclassskyway_1_1content_1_1audio_1_1_audio_data_forwarder_html"><div class="ttname"><a href="classskyway_1_1content_1_1audio_1_1_audio_data_forwarder.html">skyway::content::audio::AudioDataForwarder</a></div><div class="ttdef"><b>Definition</b> audio_data_forwarder.hpp:18</div></div>
147152
</div><!-- fragment --></div><!-- contents -->
148153
</div><!-- doc-content -->
149154
<!-- start footer part -->

0 commit comments

Comments
 (0)