Merge branch 'error_updates' into protocol_updates

This commit is contained in:
Andrew committed 2020-11-29 13:51:58 +07:00
commit 882d34de5a
3 files changed
+7 -10

No files matched your search

+2 -2
View File
@@ -22,8 +22,8 @@ jobs:
choco install -y --no-progress gstreamer --version=1.16.2.20200527
choco install -y --no-progress gstreamer-devel --version=1.16.2
echo "Updating Cargo environment"
echo "::add-path::C:\gstreamer\1.0\x86_64\bin"
echo "::set-env name=GSTREAMER_1_0_ROOT_X86_64::C:\gstreamer\1.0\x86_64\"
echo "C:\gstreamer\1.0\x86_64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
echo "GSTREAMER_1_0_ROOT_X86_64=C:\gstreamer\1.0\x86_64\" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
- name: Cache cargo registry
uses: actions/cache@v1
with:
+4 -7
View File
@@ -58,15 +58,12 @@ impl BcConnection {
let connections_isencrypted = is_encrypted.clone();
let rx_thread = std::thread::spawn(move || {
let mut context = BcContext::new();
let mut result;
while {
match BcConnection::poll(&mut context, &conn, &mut subs) {
Ok(_) => true,
Err(err) => {
error!("Deserialization error: {:?}", err);
false
}
}
result = BcConnection::poll(&mut context, &conn, &mut subs);
result.is_ok()
} {}
error!("Deserialization error: {:?}", result.unwrap_err());
});
Ok(BcConnection {
+1 -1
View File
@@ -86,7 +86,7 @@ impl GstOutputs {
let launch_aud = match self.audio_format {
Some(StreamFormat::ADPCM) => "! queue silent=true max-size-bytes=10485760 min-threshold-bytes=1024 ! rawaudioparse format=pcm pcm-format=s16le sample-rate=8000 num-channels=1 interleaved=true ! audioconvert ! rtpL16pay name=pay1", // DVI4 is converted to pcm in the appsrc
Some(StreamFormat::AAC) => "! queue silent=true max-size-bytes=10485760 min-threshold-bytes=1024 ! aacparse ! rtpmp4apay name=pay1",
Some(StreamFormat::AAC) => "! queue silent=true max-size-bytes=10485760 min-threshold-bytes=1024 ! aacparse ! decodebin ! audioconvert ! rtpL16pay name=pay1 name=pay1",
_ => "! fakesink",
};