From e589df79f145291c9444931a3fa26f915543b9b7 Mon Sep 17 00:00:00 2001 From: sirknightj Date: Thu, 6 Feb 2025 21:13:16 -0800 Subject: [PATCH] Adding sample checks --- .github/workflows/samples.yml | 154 ++++++++++++++++--- samples/kvs_gstreamer_multistream_sample.cpp | 15 +- src/gstreamer/gstkvssink.cpp | 13 ++ 3 files changed, 156 insertions(+), 26 deletions(-) diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml index d9ce73eb..20d22931 100644 --- a/.github/workflows/samples.yml +++ b/.github/workflows/samples.yml @@ -21,15 +21,13 @@ jobs: args: -f sample.mp4 - name: kvs_gstreamer_file_uploader_sample args: sample.mp4 0 audio-video -# - name: kvs_gstreamer_multistream_sample -# args: "" - name: kvs_gstreamer_sample args: sample.mp4 - name: kvssink_gstreamer_sample args: sample.mp4 runner: - - id: macos-latest - image: macos-latest + - id: macos-13 + image: macos-13 - id: ubuntu-22.04 image: ubuntu-latest @@ -50,8 +48,9 @@ jobs: env: AWS_KVS_LOG_LEVEL: 2 - KVS_DEBUG_DUMP_DATA_FILE_DIR: ./debug_output + KVS_DEBUG_DUMP_DATA_FILE_DIR: ${{ github.workspace }}/build/debug_output DEBIAN_FRONTEND: noninteractive + GST_PLUGIN_PATH: ${{ github.workspace }}/build permissions: id-token: write @@ -92,17 +91,14 @@ jobs: - name: Build samples (Windows) if: runner.os == 'Windows' - shell: cmd run: | - @echo on - set PATH=%PATH%;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\a\amazon-kinesis-video-streams-producer-c\amazon-kinesis-video-streams-producer-c\open-source\lib;D:\a\amazon-kinesis-video-streams-producer-c\amazon-kinesis-video-streams-producer-c\open-source\bin + $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\producer\open-source\local\lib;D:\producer\open-source\local\bin' + mkdir D:\producer + Move-Item -Path "D:\a\amazon-kinesis-video-streams-producer-sdk-cpp\amazon-kinesis-video-streams-producer-sdk-cpp\*" -Destination "D:\producer" + cd D:\producer git config --system core.longpaths true - "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - mkdir build - cd build - cmake -G "NMake Makefiles" -DBUILD_GSTREAMER_PLUGIN=ON -DPKG_CONFIG_EXECUTABLE="D:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe" .. - nmake - mkdir "%KVS_DEBUG_DUMP_DATA_FILE_DIR%" + dir + .github\build_windows.bat - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 @@ -114,9 +110,6 @@ jobs: - name: Run ${{ matrix.sample.name }} (Linux & Mac) if: runner.os == 'Linux' || runner.os == 'macOS' - env: - GST_PLUGIN_PATH: ${{ github.workspace }}/build - KVS_DEBUG_DUMP_DATA_FILE_DIR: ${{ github.workspace }}/build/debug_output working-directory: ./build run: | curl -fsSL -o sample.mp4 https://awsj-iot-handson.s3-ap-northeast-1.amazonaws.com/kvs-workshop/sample.mp4 @@ -125,15 +118,21 @@ jobs: - name: Run ${{ matrix.sample.name }} (Windows) if: runner.os == 'Windows' env: - GST_PLUGIN_PATH: ${{ github.workspace }}/build - KVS_DEBUG_DUMP_DATA_FILE_DIR: ${{ github.workspace }}/build/debug_output - working-directory: ./build + GST_PLUGIN_PATH: D:\producer\build + KVS_DEBUG_DUMP_DATA_FILE_DIR: D:\producer\debug_output + working-directory: D:\producer\build run: | + # Equivalent to set -x + Set-PSDebug -Trace 1 + $env:Path += ';C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Strawberry\c\bin;C:\Program Files\NASM;D:\producer\open-source\local\lib;D:\producer\open-source\local\bin;D:\gstreamer\1.0\msvc_x86_64\bin' + mkdir D:\producer\debug_output + Invoke-WebRequest -Uri https://awsj-iot-handson.s3-ap-northeast-1.amazonaws.com/kvs-workshop/sample.mp4 -OutFile sample.mp4 - $exePath = Join-Path $PWD ${{ matrix.sample.name }} - & $exePath.exe demo-stream-producer-cpp-${{ matrix.runner.id }}-ci-${{ matrix.sample.name }} ${{ matrix.sample.args }} + dir + $exePath = Join-Path $PWD ${{ matrix.sample.name }}.exe + & $exePath demo-stream-producer-cpp-${{ matrix.runner.id }}-ci-${{ matrix.sample.name }} ${{ matrix.sample.args }} - name: Verify MKV dump (Mac & Linux) if: runner.os == 'Linux' || runner.os == 'macOS' @@ -154,13 +153,13 @@ jobs: done shell: bash - - name: Verify MKV dump + - name: Verify MKV dump (Windows) if: runner.os == 'Windows' working-directory: D:\producer\build run: | $env:Path += ";C:\Program Files\MKVToolNix" - dir debug_output - $mkvFiles = Get-ChildItem -Path "D:\producer\build\debug_output" -Filter *.mkv + dir D:\producer\debug_output + $mkvFiles = Get-ChildItem -Path "D:\producer\debug_output" -Filter *.mkv if ($mkvFiles.Count -eq 0) { Write-Error "No MKV files found in D:\producer\build\debug_output" exit 1 @@ -170,3 +169,108 @@ jobs: Write-Output "Verifying $($file.FullName) with mkvinfo (verbose and hexdump):" mkvinfo.exe -v -X "$($file.FullName)" } + + multistream-sample: + name: Multistream sample on Mac + runs-on: macos-13 + timeout-minutes: 30 + + env: + AWS_KVS_LOG_LEVEL: 2 + KVS_DEBUG_DUMP_DATA_FILE_DIR: ${{ github.workspace }}/build/debug_output + GST_PLUGIN_PATH: ${{ github.workspace }}/build + DEBIAN_FRONTEND: noninteractive + + permissions: + id-token: write + contents: read + + steps: + - name: Clone repository + uses: actions/checkout@v4 + + - name: Install dependencies + run: | + brew install gstreamer log4cplus mkvtoolnix coreutils + brew install --cask docker + + - name: Build samples + run: | + mkdir build && cd build + mkdir -p $KVS_DEBUG_DUMP_DATA_FILE_DIR + cmake .. -DBUILD_GSTREAMER_PLUGIN=ON -DBUILD_DEPENDENCIES=OFF + make -j$(nproc) + + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }} + role-session-name: ${{ secrets.AWS_ROLE_SESSION_NAME }} + aws-region: ${{ secrets.AWS_REGION }} + role-duration-seconds: 10800 + + - name: Run multistream sample + working-directory: ./build + run: | + set -x + + open -a /Applications/Docker.app --args --unattended --accept-license + echo "We are waiting for Docker to be up and running. It can take over 2 minutes..." + while ! /Applications/Docker.app/Contents/Resources/bin/docker info &>/dev/null; do sleep 1; done + + sudo ln -s ~/.docker/run/docker.sock /var/run/docker.sock + + docker run -d --rm -it -e RTSP_PROTOCOLS=tcp -p 8554:8554 bluenviron/mediamtx:latest + docker run -d --rm -it -e RTSP_PROTOCOLS=tcp -p 8555:8554 bluenviron/mediamtx:latest + + ( + ffmpeg -re -f lavfi -i "testsrc=size=640x480:rate=10" -vcodec libx264 -x264-params keyint=25 -f rtsp rtsp://localhost:8554/mystream + ) & + ( + ffmpeg -re -f lavfi -i "testsrc=size=640x480:rate=10" -vcodec libx264 -x264-params keyint=25 -f rtsp rtsp://localhost:8555/mystream + ) & + + echo "rtsp://0.0.0.0:8554/mystream" > rtsp-urls.txt + echo "rtsp://0.0.0.0:8555/mystream" >> rtsp-urls.txt + + sleep 10 + gst-discoverer-1.0 rtsp://0.0.0.0:8554/mystream + gst-discoverer-1.0 rtsp://0.0.0.0:8555/mystream + + set +e # Disable exit on error for the timeout command + gtimeout --preserve-status --signal=SIGINT --kill-after=15s 30s \ + ./kvs_gstreamer_multistream_sample demo-stream-producer-cpp-macos-13-ci-kvs_gstreamer_multistream_sample rtsp-urls.txt + EXIT_CODE=$? + set -e # Re-enable exit on error + + # 0: Process exited after interrupt with code 0 + # 1: Process exited with error code 1 + # 137: Process killed by SIGKILL (if the --kill-after timeout is reached) + echo "Command exited with code: $EXIT_CODE" + if [ $EXIT_CODE -ne 0 ]; then + echo "Command did not exit gracefully after interrupt." + exit 1 + fi + + shell: bash + + - name: Verify MKV dump + working-directory: ./build/debug_output + run: | + shopt -s nullglob # Ensure globbing works correctly and avoids errors when no files are found + + ls -tlrh + mkvfiles=(*.mkv) + if [ ${#mkvfiles[@]} -eq 0 ]; then + echo "No MKV files found in debug_output" + exit 1 + elif [ ${#mkvfiles[@]} -lt 2 ]; then + echo "Only 1 MKV was found, but there should be at least 2" + exit 1 + endif + + for file in "${mkvfiles[@]}"; do + echo "Verifying $file with mkvinfo (verbose and hexdump):" + mkvinfo -v -X "$file" + done + shell: bash diff --git a/samples/kvs_gstreamer_multistream_sample.cpp b/samples/kvs_gstreamer_multistream_sample.cpp index fe2b9e22..b85c7f0b 100644 --- a/samples/kvs_gstreamer_multistream_sample.cpp +++ b/samples/kvs_gstreamer_multistream_sample.cpp @@ -53,6 +53,7 @@ LOGGER_TAG("com.amazonaws.kinesis.video.gstreamer"); #define DEFAULT_BUFFER_SIZE (1 * 1024 * 1024) #define DEFAULT_STORAGE_SIZE (128 * 1024 * 1024) #define DEFAULT_ROTATION_TIME_SECONDS 3600 +#define DEFAULT_FRAME_DURATION_MS 2 namespace com { namespace amazonaws { namespace kinesis { namespace video { @@ -180,6 +181,7 @@ typedef struct _CustomData { // Pts of first frame map first_pts_map; map producer_start_time_map; + map last_dts_map; } CustomData; void create_kinesis_video_frame(Frame *frame, const nanoseconds &pts, const nanoseconds &dts, FRAME_FLAGS flags, @@ -188,6 +190,10 @@ void create_kinesis_video_frame(Frame *frame, const nanoseconds &pts, const nano frame->decodingTs = static_cast(dts.count()) / DEFAULT_TIME_UNIT_IN_NANOS; frame->presentationTs = static_cast(pts.count()) / DEFAULT_TIME_UNIT_IN_NANOS; // set duration to 0 due to potential high spew from rtsp streams + + cout << frame->decodingTs << " DTS" << endl; + cout << frame->presentationTs << " PTS" << endl; + frame->duration = 0; frame->size = static_cast(len); frame->frameData = reinterpret_cast(data); @@ -259,6 +265,12 @@ static GstFlowReturn on_new_sample(GstElement *sink, CustomData *data) { buffer->pts += data->producer_start_time_map[stream_handle_key] - data->first_pts_map[stream_handle_key]; + if (!GST_BUFFER_DTS_IS_VALID(buffer)) { + buffer->dts = data->last_dts_map[stream_handle_key] + DEFAULT_FRAME_DURATION_MS * HUNDREDS_OF_NANOS_IN_A_MILLISECOND * DEFAULT_TIME_UNIT_IN_NANOS; + } + + data->last_dts_map[stream_handle_key] = buffer->dts; + if (false == put_frame(data->kinesis_video_stream_handles[stream_handle_key], data->frame_data_map[stream_handle_key], buffer_size, std::chrono::nanoseconds(buffer->pts), std::chrono::nanoseconds(buffer->dts), kinesis_video_flags)) { GST_WARNING("Dropped frame"); @@ -405,7 +417,8 @@ int gstreamer_init(int argc, char *argv[]) { data.frame_data_map = map(); data.frame_data_size_map = map(); data.first_pts_map = map(); - data.producer_start_time_map = map();; + data.producer_start_time_map = map(); + data.last_dts_map = map();; /* init GStreamer */ gst_init(&argc, &argv); diff --git a/src/gstreamer/gstkvssink.cpp b/src/gstreamer/gstkvssink.cpp index 83b9a4b1..4a47f88d 100644 --- a/src/gstreamer/gstkvssink.cpp +++ b/src/gstreamer/gstkvssink.cpp @@ -1218,6 +1218,10 @@ bool put_frame(shared_ptr data, void *frame_data, size_t len, Frame frame; create_kinesis_video_frame(&frame, pts, dts, flags, frame_data, len, track_id, index); + + cout << frame.decodingTs << " DTS" << endl; + cout << frame.presentationTs << " PTS" << endl; + bool ret = data->kinesis_video_stream->putFrame(frame); if (data->get_metrics && ret) { if (CHECK_FRAME_FLAG_KEY_FRAME(flags) || data->on_first_frame) { @@ -1250,6 +1254,8 @@ gst_kvs_sink_handle_buffer (GstCollectPads * pads, FRAME_FLAGS kinesis_video_flags = FRAME_FLAG_NONE; GstMapInfo info; + cout << "Received DtS from GST: " << buf->dts << endl; + info.data = NULL; // eos reached if (buf == NULL && track_data == NULL) { @@ -1302,6 +1308,8 @@ gst_kvs_sink_handle_buffer (GstCollectPads * pads, goto CleanUp; } + cout << "Received DtS from GST2: " << buf->dts << endl; + // In offline mode, if user specifies a file_start_time, the stream will be configured to use absolute // timestamp. Therefore in here we add the file_start_time to frame pts to create absolute timestamp. // If user did not specify file_start_time, file_start_time will be 0 and has no effect. @@ -1313,9 +1321,12 @@ gst_kvs_sink_handle_buffer (GstCollectPads * pads, buf->pts = buf->dts; } } else if (!GST_BUFFER_DTS_IS_VALID(buf)) { + cout << "In here!!" << endl; buf->dts = data->last_dts + DEFAULT_FRAME_DURATION_MS * HUNDREDS_OF_NANOS_IN_A_MILLISECOND * DEFAULT_TIME_UNIT_IN_NANOS; } + cout << "Received DtS from GST3: " << buf->dts << endl; + data->last_dts = buf->dts; track_id = kvs_sink_track_data->track_id; @@ -1358,6 +1369,8 @@ gst_kvs_sink_handle_buffer (GstCollectPads * pads, } } + cout << "Received DtS from GST4: " << buf->dts << endl; + put_frame(kvssink->data, info.data, info.size, std::chrono::nanoseconds(buf->pts), std::chrono::nanoseconds(buf->dts), kinesis_video_flags, track_id, data->frame_count);