diff options
author | JackLivio <jack@livio.io> | 2021-10-27 11:15:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-27 11:15:13 -0400 |
commit | 68f082169e0a40fccd9eb0db3c83911c28870f07 (patch) | |
tree | a43ab7c105412b9b4baf3f93178bfc7d030a5652 /src/components/media_manager | |
parent | f43fbe015e5c7f84d1bcc1c154aeec6afad217d9 (diff) | |
parent | 0907428858f2eeadc9707d4192971cf555a7785c (diff) | |
download | sdl_core-68f082169e0a40fccd9eb0db3c83911c28870f07.tar.gz |
Merge pull request #3775 from smartdevicelink/release/8.0.08.0.0
Release 8.0.0
Diffstat (limited to 'src/components/media_manager')
12 files changed, 9 insertions, 69 deletions
diff --git a/src/components/media_manager/CMakeLists.txt b/src/components/media_manager/CMakeLists.txt index 50c9fce20a..f4da8ded48 100644 --- a/src/components/media_manager/CMakeLists.txt +++ b/src/components/media_manager/CMakeLists.txt @@ -102,7 +102,7 @@ collect_sources(SOURCES "${PATHS}" "${EXCLUDE_PATHS}") add_library("MediaManager" ${SOURCES}) target_link_libraries("MediaManager" ${LIBRARIES}) -if(ENABLE_LOG) +if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX") target_link_libraries("MediaManager" log4cxx -L${LOG4CXX_LIBS_DIRECTORY}) endif() diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h index 9e0a8b5123..5ecb1a6b4a 100644 --- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h +++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h @@ -53,7 +53,6 @@ class FromMicRecorderAdapter : public MediaAdapterImpl { void StopActivity(int32_t application_key); bool is_app_performing_activity(int32_t application_key) const; void set_output_file(const std::string& output_file); - DEPRECATED void set_duration(int32_t duration); void set_config(mobile_apis::SamplingRate::eType sampling_rate, mobile_apis::BitsPerSample::eType bits_per_sample, mobile_apis::AudioType::eType audio_type, diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h index 3e24212ed5..faa51feec9 100644 --- a/src/components/media_manager/include/media_manager/media_manager_impl.h +++ b/src/components/media_manager/include/media_manager/media_manager_impl.h @@ -60,13 +60,6 @@ class MediaManagerImpl : public MediaManager, const MediaManagerSettings& settings); virtual ~MediaManagerImpl(); - virtual void PlayA2DPSource(int32_t application_key); - virtual void StopA2DPSource(int32_t application_key); - - DEPRECATED virtual void StartMicrophoneRecording( - int32_t application_key, - const std::string& outputFileName, - int32_t duration); virtual void StartMicrophoneRecording( int32_t application_key, const std::string& outputFileName, diff --git a/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc b/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc index 68018028ae..911ef239cc 100644 --- a/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc +++ b/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc @@ -108,10 +108,6 @@ void FromMicRecorderAdapter::set_output_file(const std::string& output_file) { output_file_ = output_file; } -void FromMicRecorderAdapter::set_duration(int32_t duration) { - duration_ = duration; -} - void FromMicRecorderAdapter::set_config( mobile_apis::SamplingRate::eType sampling_rate, mobile_apis::BitsPerSample::eType bits_per_sample, diff --git a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc index d2634214fa..310fca7aa3 100644 --- a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc +++ b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc @@ -111,7 +111,7 @@ void FromMicToFileRecorderThread::deinitArgs() { SDL_LOG_AUTO_TRACE(); if (argv_) { - for (int32_t i = 0; i < argc_; i++) { + for (int32_t i = 0; i < argc_; ++i) { delete[] argv_[i]; } delete[] argv_; @@ -164,7 +164,7 @@ void FromMicToFileRecorderThread::threadMain() { // g_option_context_parse() modifies params, so keep argc_ and argv_ int32_t argc = argc_; gchar** argv = new gchar*[argc]; - for (int32_t i = 0; i < argc; i++) { + for (int32_t i = 0; i < argc; ++i) { argv[i] = argv_[i]; } @@ -366,7 +366,7 @@ void FromMicToFileRecorderThread::exitThreadMain() { if (sleepThread_) { SDL_LOG_DEBUG("Stop sleep thread\n"); - sleepThread_->stop(); + sleepThread_->Stop(threads::Thread::kThreadStopDelegate); } SDL_LOG_TRACE("Set should be stopped flag\n"); diff --git a/src/components/media_manager/src/file_streamer_adapter.cc b/src/components/media_manager/src/file_streamer_adapter.cc index 301b093829..f17d1f89ed 100644 --- a/src/components/media_manager/src/file_streamer_adapter.cc +++ b/src/components/media_manager/src/file_streamer_adapter.cc @@ -95,7 +95,7 @@ bool FileStreamerAdapter::FileStreamer::Send( return false; } - SDL_LOG_INFO("Streamer::sent " << msg->data_size()); + SDL_LOG_TRACE("Streamer::sent " << msg->data_size()); return true; } diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc index 4fc8b38d87..8a73101b47 100644 --- a/src/components/media_manager/src/media_manager_impl.cc +++ b/src/components/media_manager/src/media_manager_impl.cc @@ -184,39 +184,6 @@ void MediaManagerImpl::Init() { } } -void MediaManagerImpl::PlayA2DPSource(int32_t application_key) { - SDL_LOG_AUTO_TRACE(); - -#if defined(EXTENDED_MEDIA_MODE) - if (!a2dp_player_ && protocol_handler_) { - a2dp_player_ = - new A2DPSourcePlayerAdapter(protocol_handler_->get_session_observer()); - } -#endif - - if (a2dp_player_) { - a2dp_player_->StartActivity(application_key); - } -} - -void MediaManagerImpl::StopA2DPSource(int32_t application_key) { - SDL_LOG_AUTO_TRACE(); - if (a2dp_player_) { - a2dp_player_->StopActivity(application_key); - } -} - -void MediaManagerImpl::StartMicrophoneRecording(int32_t application_key, - const std::string& output_file, - int32_t duration) { - StartMicrophoneRecording(application_key, - output_file, - duration, - mobile_apis::SamplingRate::INVALID_ENUM, - mobile_apis::BitsPerSample::INVALID_ENUM, - mobile_apis::AudioType::INVALID_ENUM); -} - void MediaManagerImpl::StartMicrophoneRecording( int32_t application_key, const std::string& output_file, diff --git a/src/components/media_manager/src/pipe_streamer_adapter.cc b/src/components/media_manager/src/pipe_streamer_adapter.cc index 5e4c87c73d..b4e66be483 100644 --- a/src/components/media_manager/src/pipe_streamer_adapter.cc +++ b/src/components/media_manager/src/pipe_streamer_adapter.cc @@ -144,7 +144,7 @@ bool PipeStreamerAdapter::PipeStreamer::Send( // Loop to send remaining data if there is any. } while (data_remaining); - SDL_LOG_INFO("Streamer::sent " << msg->data_size()); + SDL_LOG_TRACE("Streamer::sent " << msg->data_size()); return true; } diff --git a/src/components/media_manager/src/socket_streamer_adapter.cc b/src/components/media_manager/src/socket_streamer_adapter.cc index 2f10a29c7d..134ccb8038 100644 --- a/src/components/media_manager/src/socket_streamer_adapter.cc +++ b/src/components/media_manager/src/socket_streamer_adapter.cc @@ -149,7 +149,7 @@ bool SocketStreamerAdapter::SocketStreamer::Send( SDL_LOG_WARN("Couldn't send all the data to socket " << send_socket_fd_); } - SDL_LOG_INFO("Streamer::sent " << msg->data_size()); + SDL_LOG_TRACE("Streamer::sent " << msg->data_size()); return true; } diff --git a/src/components/media_manager/src/streamer_adapter.cc b/src/components/media_manager/src/streamer_adapter.cc index 808b9715af..ad61ac1f63 100644 --- a/src/components/media_manager/src/streamer_adapter.cc +++ b/src/components/media_manager/src/streamer_adapter.cc @@ -150,7 +150,7 @@ void StreamerAdapter::Streamer::threadMain() { static int32_t messages_for_session = 0; ++messages_for_session; - SDL_LOG_DEBUG("Handling map streaming message. This is " + SDL_LOG_TRACE("Handling map streaming message. This is " << messages_for_session << " message for " << adapter_->current_application_); std::set<MediaListenerPtr>::iterator it = diff --git a/src/components/media_manager/test/CMakeLists.txt b/src/components/media_manager/test/CMakeLists.txt index 265a62a0d8..1b74554fb1 100644 --- a/src/components/media_manager/test/CMakeLists.txt +++ b/src/components/media_manager/test/CMakeLists.txt @@ -69,6 +69,6 @@ endif() create_test("media_manager_test" "${SOURCES}" "${LIBRARIES}") -if(ENABLE_LOG) +if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX") target_link_libraries("media_manager_test" log4cxx -L${LOG4CXX_LIBS_DIRECTORY}) endif() diff --git a/src/components/media_manager/test/media_manager_impl_test.cc b/src/components/media_manager/test/media_manager_impl_test.cc index ab0a9cf494..8cca2ad995 100644 --- a/src/components/media_manager/test/media_manager_impl_test.cc +++ b/src/components/media_manager/test/media_manager_impl_test.cc @@ -279,21 +279,6 @@ TEST_F(MediaManagerImplTest, Init_Settings_ExpectFileValue) { InitMediaManagerFileServerType(); } -TEST_F(MediaManagerImplTest, PlayA2DPSource_WithCorrectA2DP_SUCCESS) { - // media_adapter_mock_ will be deleted in media_manager_impl (dtor) - MockMediaAdapter* media_adapter_mock = new MockMediaAdapter(); - media_manager_impl_->set_mock_a2dp_player(media_adapter_mock); - EXPECT_CALL(*media_adapter_mock, StartActivity(kApplicationKey)); - media_manager_impl_->PlayA2DPSource(kApplicationKey); -} - -TEST_F(MediaManagerImplTest, StopA2DPSource_WithCorrectA2DP_SUCCESS) { - MockMediaAdapter* media_adapter_mock = new MockMediaAdapter(); - media_manager_impl_->set_mock_a2dp_player(media_adapter_mock); - EXPECT_CALL(*media_adapter_mock, StopActivity(kApplicationKey)); - media_manager_impl_->StopA2DPSource(kApplicationKey); -} - TEST_F(MediaManagerImplTest, StartMicrophoneRecording_SourceFileIsWritable_ExpectTrue) { StartMicrophoneCheckHelper(); |