diff --git a/InferenceSystem/README.md b/InferenceSystem/README.md index 4f5f3dcd..936fd537 100644 --- a/InferenceSystem/README.md +++ b/InferenceSystem/README.md @@ -384,5 +384,5 @@ export PODCAST_AZURE_STORAGE_CONNECTION_STRING="" Call the script as follows, substituting appropriate values. ``` -python PrepareDataForPredictionExplorer.py --start_time "2020-07-25 19:15" --end_time "2020-07-25 20:15" --s3_stream https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_orcasound_lab --model_path --annotation_threshold 0.4 --round_id round5 --dataset_folder +python PrepareDataForPredictionExplorer.py --start_time "2020-07-25 19:15" --end_time "2020-07-25 20:15" --s3_stream https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_orcasound_lab --model_path --annotation_threshold 0.4 --round_id round5 --dataset_folder ``` diff --git a/InferenceSystem/demos/hls_reader.py b/InferenceSystem/demos/hls_reader.py index 47a0fa64..552b4437 100644 --- a/InferenceSystem/demos/hls_reader.py +++ b/InferenceSystem/demos/hls_reader.py @@ -18,10 +18,10 @@ import spectrogram_visualizer ORCASOUND_STREAMS = { - # 'OrcasoundLab': 'https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_orcasound_lab' - 'BushPoint': 'https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_bush_point' - # 'PortTownsend': 'https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_port_townsend' - 'SunsetBay': 'https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_sunset_bay' + # 'OrcasoundLab': 'https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_orcasound_lab' + 'BushPoint': 'https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_bush_point' + # 'PortTownsend': 'https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_port_townsend' + 'SunsetBay': 'https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_sunset_bay' } dirname = os.getcwd() diff --git a/InferenceSystem/misc/notesOnHLSConversion.txt b/InferenceSystem/misc/notesOnHLSConversion.txt index 5de37674..158fe411 100644 --- a/InferenceSystem/misc/notesOnHLSConversion.txt +++ b/InferenceSystem/misc/notesOnHLSConversion.txt @@ -3,7 +3,7 @@ The relevant bucket tonight was a directory with the UNIX timestamp 1543804333, mkdir 20181202_1920-humpback-biggs_OrcasoundLab cd 20181202_1920-humpback-biggs_OrcasoundLab/ -aws s3 sync s3://streaming-orcasound-net/rpi_orcasound_lab/hls/1543804333 . +aws s3 sync s3://audio-orcasound-net/rpi_orcasound_lab/hls/1543804333 . printf "file '%s'\n" ./*.ts > mylist.txt ffmpeg -f concat -safe 0 -i mylist.txt -c copy all.ts ffmpeg -i all.ts -c:v libx264 -c:a copy -bsf:a aac_adtstoasc output.mp4 diff --git a/InferenceSystem/src/LiveInferenceOrchestrator.py b/InferenceSystem/src/LiveInferenceOrchestrator.py index 1d22f94d..e39f21a8 100644 --- a/InferenceSystem/src/LiveInferenceOrchestrator.py +++ b/InferenceSystem/src/LiveInferenceOrchestrator.py @@ -142,7 +142,7 @@ def populate_metadata_json( hls_stream_type = config_params["hls_stream_type"] hls_polling_interval = config_params["hls_polling_interval"] hls_hydrophone_id = config_params["hls_hydrophone_id"] - hydrophone_stream_url = 'https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/' + hls_hydrophone_id + hydrophone_stream_url = 'https://s3-us-west-2.amazonaws.com/audio-orcasound-net/' + hls_hydrophone_id if hls_stream_type == "LiveHLS": hls_stream = HLSStream(hydrophone_stream_url, hls_polling_interval, local_dir) diff --git a/InferenceSystem/src/globals.py b/InferenceSystem/src/globals.py index dbd89a2c..94118c0a 100644 --- a/InferenceSystem/src/globals.py +++ b/InferenceSystem/src/globals.py @@ -1,11 +1,11 @@ import datetime S3_STREAM_URLS = { - "orcasound_lab": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_orcasound_lab", - "port_townsend": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_port_townsend", - "bush_point": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_bush_point", - "sunset_bay": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_sunset_bay", - "point_robinson": "https://s3-us-west-2.amazonaws.com/streaming-orcasound-net/rpi_point_robinson", + "orcasound_lab": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_orcasound_lab", + "port_townsend": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_port_townsend", + "bush_point": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_bush_point", + "sunset_bay": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_sunset_bay", + "point_robinson": "https://s3-us-west-2.amazonaws.com/audio-orcasound-net/rpi_point_robinson", } # Limits time window (end - start) of negative samples to be downloaded for retraining