Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change fragment metadata count from 25 to 10 #251

Merged
merged 5 commits into from
Mar 20, 2024
Merged

Change fragment metadata count from 25 to 10 #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee56b23
25 --> 10
niyatim23 Mar 1, 2024
65d3b38
checkout@v4
niyatim23 Mar 4, 2024
37fd3b5
macos-11 --> 12
niyatim23 Mar 4, 2024
8d73c33
fix test
niyatim23 Mar 4, 2024
f24ea54
MAX_FRAGMENT_METADATA_TAGS MAX_FRAGMENT_METADATA_COUNT
niyatim23 Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ on:
- master
jobs:
clang-format-check:
runs-on: macos-11
runs-on: macos-12
steps:
- name: Clone repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install clang-format
run: |
brew install clang-format
Expand All @@ -30,7 +30,7 @@ jobs:
AWS_KVS_LOG_LEVEL: 2
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build repository
run: |
mkdir build && cd build
Expand All @@ -56,7 +56,7 @@ jobs:
AWS_KVS_LOG_LEVEL: 2
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build repository
run: |
mkdir build && cd build
Expand All @@ -82,7 +82,7 @@ jobs:
AWS_KVS_LOG_LEVEL: 2
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build repository
run: |
brew unlink openssl
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
with:
xcode-version: '15.2'
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build repository
run: |
brew unlink openssl
Expand All @@ -142,7 +142,7 @@ jobs:
AWS_KVS_LOG_LEVEL: 2
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build repository
run: |
mkdir build && cd build
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
AWS_KVS_LOG_LEVEL: 2
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build repository
run: |
mkdir build && cd build
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
AWS_KVS_LOG_LEVEL: 2
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install dependencies
run: |
sudo apt-get update
Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:
CC: gcc-4.4
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install deps
run: |
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
# AWS_KVS_LOG_LEVEL: 2
# steps:
# - name: Clone repository
# uses: actions/checkout@v2
# uses: actions/checkout@v4
# - name: Install dependencies
# run: |
# sudo apt-get update
Expand All @@ -295,7 +295,7 @@ jobs:
AWS_KVS_LOG_LEVEL: 2
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Install dependencies
run: |
sudo apt-get update
Expand Down Expand Up @@ -326,7 +326,7 @@ jobs:
AWS_KVS_LOG_LEVEL: 7
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build and run
run: |
.github/build_windows.bat
Expand All @@ -344,7 +344,7 @@ jobs:
sudo apt update
sudo apt-get -y install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build Repository
run: |
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
Expand All @@ -362,7 +362,7 @@ jobs:
sudo apt update
sudo apt-get -y install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi binutils-arm-linux-gnueabi
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Build Repository
run: |
sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6'
Expand Down
4 changes: 2 additions & 2 deletions src/client/include/com/amazonaws/kinesis/video/client/Include.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,12 @@ extern "C" {
/**
* Maximal size of the metadata queue for a fragment
*/
#define MAX_FRAGMENT_METADATA_COUNT 25
#define MAX_FRAGMENT_METADATA_COUNT 10

/**
* Maximum amount of the "tags" element metadata for a fragment
niyatim23 marked this conversation as resolved.
Show resolved Hide resolved
*/
#define MAX_FRAGMENT_METADATA_TAGS 10
#define MAX_FRAGMENT_METADATA_TAGS MAX_FRAGMENT_METADATA_COUNT

/**
* Max name/value pairs for custom event metadata
Expand Down
6 changes: 3 additions & 3 deletions tst/client/StreamPutGetTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1427,8 +1427,8 @@ TEST_F(StreamPutGetTest, putFrame_PutGetNotifyAndTagsStoreData)
// Set the frame bits
MEMSET(frame.frameData, (BYTE) i, SIZEOF(tempBuffer));

// Key frame every 10th
frame.flags = i % 10 == 0 ? FRAME_FLAG_KEY_FRAME : FRAME_FLAG_NONE;
niyatim23 marked this conversation as resolved.
Show resolved Hide resolved
// Key frame every 8th
frame.flags = i % 8 == 0 ? FRAME_FLAG_KEY_FRAME : FRAME_FLAG_NONE;

EXPECT_EQ(STATUS_SUCCESS, putKinesisVideoFrame(mStreamHandle, &frame)) << "Iteration " << i;
EXPECT_EQ(STATUS_SUCCESS, putKinesisVideoFragmentMetadata(mStreamHandle, (PCHAR) "postTagName", (PCHAR) "postTagValue", FALSE)) << i;
Expand All @@ -1449,7 +1449,7 @@ TEST_F(StreamPutGetTest, putFrame_PutGetNotifyAndTagsStoreData)
ASSERT_TRUE(retStatus == STATUS_SUCCESS || retStatus == STATUS_NO_MORE_DATA_AVAILABLE);

// Manually pre-validated data file size
EXPECT_EQ(18646, filledSize);
EXPECT_EQ(19150, filledSize);

// Store the data in a file
EXPECT_EQ(STATUS_SUCCESS, writeFile((PCHAR) "test_put_get_tags.mkv", TRUE, FALSE, getDataBuffer, filledSize));
Expand Down