diff --git a/modules/audio_coding/neteq/tools/neteq_event_log_input.cc b/modules/audio_coding/neteq/tools/neteq_event_log_input.cc index 60fd897dfb..c1ef1ccc14 100644 --- a/modules/audio_coding/neteq/tools/neteq_event_log_input.cc +++ b/modules/audio_coding/neteq/tools/neteq_event_log_input.cc @@ -22,15 +22,23 @@ namespace test { NetEqEventLogInput* NetEqEventLogInput::CreateFromFile( const std::string& file_name, absl::optional ssrc_filter) { - return new NetEqEventLogInput( - RtcEventLogSource::CreateFromFile(file_name, ssrc_filter)); + auto event_log_src = + RtcEventLogSource::CreateFromFile(file_name, ssrc_filter); + if (!event_log_src) { + return nullptr; + } + return new NetEqEventLogInput(std::move(event_log_src)); } NetEqEventLogInput* NetEqEventLogInput::CreateFromString( const std::string& file_contents, absl::optional ssrc_filter) { - return new NetEqEventLogInput( - RtcEventLogSource::CreateFromString(file_contents, ssrc_filter)); + auto event_log_src = + RtcEventLogSource::CreateFromString(file_contents, ssrc_filter); + if (!event_log_src) { + return nullptr; + } + return new NetEqEventLogInput(std::move(event_log_src)); } absl::optional NetEqEventLogInput::NextOutputEventTime() const { diff --git a/modules/audio_coding/neteq/tools/rtc_event_log_source.cc b/modules/audio_coding/neteq/tools/rtc_event_log_source.cc index fa9f2d955c..f0cc0a3dfc 100644 --- a/modules/audio_coding/neteq/tools/rtc_event_log_source.cc +++ b/modules/audio_coding/neteq/tools/rtc_event_log_source.cc @@ -41,8 +41,11 @@ std::unique_ptr RtcEventLogSource::CreateFromFile( absl::optional ssrc_filter) { auto source = std::unique_ptr(new RtcEventLogSource()); ParsedRtcEventLog parsed_log; - RTC_CHECK(parsed_log.ParseFile(file_name)); - RTC_CHECK(source->Initialize(parsed_log, ssrc_filter)); + if (!parsed_log.ParseFile(file_name) || + !source->Initialize(parsed_log, ssrc_filter)) { + std::cerr << "Error while parsing event log, skipping." << std::endl; + return nullptr; + } return source; } @@ -51,8 +54,11 @@ std::unique_ptr RtcEventLogSource::CreateFromString( absl::optional ssrc_filter) { auto source = std::unique_ptr(new RtcEventLogSource()); ParsedRtcEventLog parsed_log; - RTC_CHECK(parsed_log.ParseString(file_contents)); - RTC_CHECK(source->Initialize(parsed_log, ssrc_filter)); + if (!parsed_log.ParseString(file_contents) || + !source->Initialize(parsed_log, ssrc_filter)) { + std::cerr << "Error while parsing event log, skipping." << std::endl; + return nullptr; + } return source; }