mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-02-16 21:05:15 +00:00
Code Issues Projects Releases Wiki Activity

aws: Update to aws 0.21/0.51

Browse source
This commit is contained in:
Sebastian Dröge 2022-10-31 11:00:55 +02:00
parent 7106b0484d
commit 6ceeadc0f0
5 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/aws/Cargo.toml
View file

@ -16,13 +16,13 @@ futures = "0.3"
gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" } gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"] } gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"] }
aws-config = "0.49.0" aws-config = "0.51.0"
aws-sdk-s3 = "0.19.0" aws-sdk-s3 = "0.21.0"
aws-sdk-transcribe = "0.19.0" aws-sdk-transcribe = "0.21.0"
aws-types = "0.49.0" aws-types = "0.51.0"
aws-sig-auth = "0.49.0" aws-sig-auth = "0.51.0"
aws-smithy-http = { version = "0.49.0", features = [ "rt-tokio" ] } aws-smithy-http = { version = "0.51.0", features = [ "rt-tokio" ] }
aws-smithy-types = "0.49.0" aws-smithy-types = "0.51.0"
http = "0.2.7" http = "0.2.7"
chrono = "0.4" chrono = "0.4"
url = "2" url = "2"

2
net/aws/src/s3hlssink/imp.rs
View file

@ -23,7 +23,7 @@ use aws_sdk_s3::config;
use aws_sdk_s3::model::ObjectCannedAcl; use aws_sdk_s3::model::ObjectCannedAcl;
use aws_sdk_s3::types::ByteStream; use aws_sdk_s3::types::ByteStream;
use aws_sdk_s3::Endpoint; use aws_sdk_s3::Endpoint;
use aws_sdk_s3::{Client, Credentials, Region, RetryConfig}; use aws_sdk_s3::{config::retry::RetryConfig, Client, Credentials, Region};
use aws_types::sdk_config::SdkConfig; use aws_types::sdk_config::SdkConfig;
use http::Uri; use http::Uri;

2
net/aws/src/s3sink/imp.rs
View file

@ -18,7 +18,7 @@ use aws_sdk_s3::config;
use aws_sdk_s3::model::{CompletedMultipartUpload, CompletedPart}; use aws_sdk_s3::model::{CompletedMultipartUpload, CompletedPart};
use aws_sdk_s3::types::ByteStream; use aws_sdk_s3::types::ByteStream;
use aws_sdk_s3::Endpoint; use aws_sdk_s3::Endpoint;
use aws_sdk_s3::{Client, Credentials, Region, RetryConfig}; use aws_sdk_s3::{config::retry::RetryConfig, Client, Credentials, Region};
use http::Uri; use http::Uri;
use futures::future; use futures::future;

2
net/aws/src/s3src/imp.rs
View file

@ -14,7 +14,7 @@ use std::time::Duration;
use aws_sdk_s3::config; use aws_sdk_s3::config;
use aws_sdk_s3::Endpoint; use aws_sdk_s3::Endpoint;
use aws_sdk_s3::{Client, Credentials, RetryConfig}; use aws_sdk_s3::{config::retry::RetryConfig, Client, Credentials};
use http::Uri; use http::Uri;
use gst::glib; use gst::glib;

16
net/aws/src/s3utils.rs
View file

@ -7,11 +7,10 @@
// SPDX-License-Identifier: MPL-2.0 // SPDX-License-Identifier: MPL-2.0
use aws_config::meta::region::RegionProviderChain; use aws_config::meta::region::RegionProviderChain;
use aws_sdk_s3::{Credentials, Region}; use aws_sdk_s3::{config::timeout::TimeoutConfig, Credentials, Region};
use aws_types::sdk_config::SdkConfig; use aws_types::sdk_config::SdkConfig;
use aws_smithy_http::byte_stream::{ByteStream, Error}; use aws_smithy_http::byte_stream::{ByteStream, Error};
use aws_smithy_types::{timeout, tristate::TriState};
use bytes::{buf::BufMut, Bytes, BytesMut}; use bytes::{buf::BufMut, Bytes, BytesMut};
use futures::stream::TryStreamExt; use futures::stream::TryStreamExt;
@ -96,19 +95,16 @@ pub fn wait_stream(
} }
// See setting-timeouts example in aws-sdk-rust. // See setting-timeouts example in aws-sdk-rust.
pub fn timeout_config(request_timeout: Duration) -> timeout::Config { pub fn timeout_config(request_timeout: Duration) -> TimeoutConfig {
timeout::Config::new().with_api_timeouts( TimeoutConfig::builder()
timeout::Api::new() .operation_attempt_timeout(request_timeout)
// This timeout acts at the "HTTP request" level and sets a separate timeout for each .build()
// HTTP request made as part of a "service request."
.with_call_attempt_timeout(TriState::Set(request_timeout)),
)
} }
pub fn wait_config( pub fn wait_config(
canceller: &Mutex<Option<future::AbortHandle>>, canceller: &Mutex<Option<future::AbortHandle>>,
region: Region, region: Region,
timeout_config: timeout::Config, timeout_config: TimeoutConfig,
credentials: Option<Credentials>, credentials: Option<Credentials>,
) -> Result<SdkConfig, WaitError<Error>> { ) -> Result<SdkConfig, WaitError<Error>> {
let region_provider = RegionProviderChain::first_try(region) let region_provider = RegionProviderChain::first_try(region)