diff --git a/3rdparty/README.md b/3rdparty/README.md index 6e1840b..3a0787d 100644 --- a/3rdparty/README.md +++ b/3rdparty/README.md @@ -41,7 +41,7 @@ It doesn't require other manually installation because CMake will download and b # T31 -User need to put T31 board SDK under [3rdparty/T31/](3rdparty/T31/): +User need to put T31 board SDK under [3rdparty/T31/](T31/): ``` T31/ @@ -58,7 +58,7 @@ T31/ # FH8626V100 -User need to put FH8626V100 board SDK under [3rdparty/FH8626V100/](3rdparty/FH8626V100/): +User need to put FH8626V100 board SDK under [3rdparty/FH8626V100/](FH8626V100/): ``` FH8626V100/ diff --git a/README.md b/README.md index f26b0ed..d2da480 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ - FILE(Dummy boards that can capture from [sample frames](resources/frames/)) - x86/x64(By selecting board `V4L2` or `FILE`) - RPi(By selecting board `V4L2` or `FILE`) -- T31(By selecting board `T31` or `FILE`) -- FH8626V100(By selecting board `FH8626V100` or `FILE`) +- Ingenic T31(By selecting board `T31` or `FILE`) +- Fullhan FH8626V100(By selecting board `FH8626V100` or `FILE`) ## Getting started with out-of-box KVS WebRTC sample @@ -39,7 +39,7 @@ make ```bash export AWS_KVS_LOG_LEVEL=2 export AWS_DEFAULT_REGION=us-east-1 - export AWS_KVS_CACERT_PATH=cacert.pem + export AWS_KVS_CACERT_PATH=rootca.pem export AWS_ACCESS_KEY_ID=xxxxxxxxxxxxxxxxxxxx export AWS_SECRET_ACCESS_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx ``` @@ -59,8 +59,9 @@ make ``` > You can use Root CA in [resources/certs/rootca.pem](resources/certs/rootca.pem), or you can download it from [Amazon Trust Services](https://www.amazontrust.com/repository/SFSRootCAG2.pem) 7. Make sure your the system time on your board has been synchronized. You may set it manually or use ntp client. -8. Execute sample on your board: `./kvswebrtcmaster-static`. If you are using access key id/access key secret, execute sample with channel name as parameter: `./kvswebrtcmaster-static your_channel_name` -9. Check WebRTC live stream via AWS console or [AWS WebRTC test page](https://awslabs.github.io/amazon-kinesis-video-streams-webrtc-sdk-js/examples/index.html) +8. If you are using access key id/access key secret, execute sample with channel name as parameter: `./kvswebrtcmaster-static your_channel_name`. If you are using AWS IoT Certificate, execute sample on your board directly: `./kvswebrtcmaster-static`. +9. Check WebRTC live stream via AWS console or [AWS WebRTC test page](https://d3etpwtx4wgido.cloudfront.net/) + > Browser should work as viewer mode during test. ## Getting started with out-of-box KVS Producer sample diff --git a/resources/.DS_Store b/resources/.DS_Store deleted file mode 100644 index 943635b..0000000 Binary files a/resources/.DS_Store and /dev/null differ diff --git a/resources/frames/.DS_Store b/resources/frames/.DS_Store deleted file mode 100644 index f58716e..0000000 Binary files a/resources/frames/.DS_Store and /dev/null differ diff --git a/resources/frames/g711a/.DS_Store b/resources/frames/g711a/.DS_Store deleted file mode 100644 index baa616e..0000000 Binary files a/resources/frames/g711a/.DS_Store and /dev/null differ diff --git a/samples/kvs/CMakeLists.txt b/samples/kvs/CMakeLists.txt index 221507f..7a93067 100644 --- a/samples/kvs/CMakeLists.txt +++ b/samples/kvs/CMakeLists.txt @@ -14,7 +14,7 @@ message(STATUS "EMBEDDED_MEDIA_LINK_DIR - ${EMBEDDED_MEDIA_LINK_DIR}") include(ExternalProject) ExternalProject_Add(kvs-producer GIT_REPOSITORY https://github.com/aws-samples/amazon-kinesis-video-streams-producer-embedded-c.git - GIT_TAG v1.0.0 + GIT_TAG v1.0.1 CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${AWS_DEPENDENCIES_DIR}/kvs/ -DCMAKE_BUILD_TYPE=Release BUILD_ALWAYS TRUE GIT_PROGRESS TRUE diff --git a/samples/kvs/source/kvsappcli.c b/samples/kvs/source/kvsappcli.c index 32b2f62..58337c0 100644 --- a/samples/kvs/source/kvsappcli.c +++ b/samples/kvs/source/kvsappcli.c @@ -307,6 +307,7 @@ static int setKvsAppOptions(KvsAppHandle kvsAppHandle) int main(int argc, char *argv[]) { + int res = 0; KvsAppHandle kvsAppHandle; uint64_t uLastPrintMemStatTimestamp = 0; ePutMediaFragmentAckEventType eAckEventType = eUnknown; @@ -391,9 +392,9 @@ int main(int argc, char *argv[]) break; } - if (KvsApp_open(kvsAppHandle) != 0) + if ((res = KvsApp_open(kvsAppHandle)) != 0) { - printf("Failed to open KVS app\n"); + printf("Failed to open KVS app, err:-%X\n", -res); break; } @@ -403,8 +404,10 @@ int main(int argc, char *argv[]) { break; } - if (KvsApp_doWork(kvsAppHandle) != 0) + + if ((res = KvsApp_doWork(kvsAppHandle)) != 0) { + printf("do work err:-%X\n", -res); break; }