[mediaplayer] reduce log messages in CQ tests
This CL reduces the number of alarming log messages that appear when
running mediaplayer_tests. Some TODOs have been added to provide
another way (inspection?) to report the issues induced by the tests.
TEST: fx run-test mediaplayer_tests
MTWN-291 #done
Change-Id: I74939b325e5fa99de0dd3b4f5cce06b0d507e5c7
diff --git a/src/media/playback/mediaplayer/ffmpeg/ffmpeg_audio_decoder.cc b/src/media/playback/mediaplayer/ffmpeg/ffmpeg_audio_decoder.cc
index 1924a03..723ccf8 100644
--- a/src/media/playback/mediaplayer/ffmpeg/ffmpeg_audio_decoder.cc
+++ b/src/media/playback/mediaplayer/ffmpeg/ffmpeg_audio_decoder.cc
@@ -74,7 +74,7 @@
: AllocatePayloadBuffer(buffer_size);
if (!buffer) {
- FXL_LOG(ERROR) << "Ran out of memory for decoded audio, dropping packet.";
+ // TODO(dalesat): Record/report packet drop.
return -1;
}
@@ -157,8 +157,7 @@
// buffer for the interleaved frames, which we get from the stage.
auto new_payload_buffer = AllocatePayloadBuffer(payload_size);
if (!new_payload_buffer) {
- FXL_LOG(ERROR) << "Ran out of memory for decoded, interleaved audio, "
- "dropping packet.";
+ // TODO(dalesat): Record/report packet drop.
return nullptr;
}
diff --git a/src/media/playback/mediaplayer/fidl/fidl_audio_renderer.cc b/src/media/playback/mediaplayer/fidl/fidl_audio_renderer.cc
index 98c5a809..58061c2 100644
--- a/src/media/playback/mediaplayer/fidl/fidl_audio_renderer.cc
+++ b/src/media/playback/mediaplayer/fidl/fidl_audio_renderer.cc
@@ -15,7 +15,6 @@
constexpr int64_t kDefaultMinLeadTime = ZX_MSEC(100);
constexpr int64_t kTargetLeadTimeDeltaNs = ZX_MSEC(10);
-constexpr int64_t kWarnThresholdNs = ZX_MSEC(500);
} // namespace
@@ -368,17 +367,6 @@
if (last_supplied_pts_ns_ == Packet::kNoPts ||
presentation_time_ns + target_lead_time_ns_ > last_supplied_pts_ns_) {
// We need more packets to meet lead time commitments.
- if (last_departed_pts_ns_ != Packet::kNoPts &&
- last_supplied_pts_ns_ - last_departed_pts_ns_ > kWarnThresholdNs) {
- FXL_LOG(WARNING) << "Audio renderer holding too much content:";
- FXL_LOG(WARNING) << " total content "
- << AsNs(last_supplied_pts_ns_ - last_departed_pts_ns_);
- FXL_LOG(WARNING) << " arrivals lead pts by "
- << AsNs(last_supplied_pts_ns_ - presentation_time_ns);
- FXL_LOG(WARNING) << " departures trail pts by "
- << AsNs(presentation_time_ns - last_departed_pts_ns_);
- }
-
return true;
}
diff --git a/src/media/playback/mediaplayer/graph/nodes/input.cc b/src/media/playback/mediaplayer/graph/nodes/input.cc
index 5aaa1dd..006f39d 100644
--- a/src/media/playback/mediaplayer/graph/nodes/input.cc
+++ b/src/media/playback/mediaplayer/graph/nodes/input.cc
@@ -103,7 +103,7 @@
if (!copy_destination_buffer) {
// We just drop the packet, so there will be a glitch.
- FXL_LOG(WARNING) << "Allocator starved copying payload.";
+ // TODO(dalesat): Record/report packet drop.
// We needed a packet and couldn't produce one, so we still need one.
state_.store(State::kNeedsPacket);
diff --git a/src/media/playback/mediaplayer/graph/payloads/vmo_payload_allocator.cc b/src/media/playback/mediaplayer/graph/payloads/vmo_payload_allocator.cc
index f8fe3ef..e355a4e 100644
--- a/src/media/playback/mediaplayer/graph/payloads/vmo_payload_allocator.cc
+++ b/src/media/playback/mediaplayer/graph/payloads/vmo_payload_allocator.cc
@@ -55,7 +55,6 @@
vmo_index = (vmo_index + 1) % payload_vmos_.size();
if (vmo_index == suggested_allocation_vmo_) {
// Payload memory exhausted.
- FXL_LOG(ERROR) << "Couldn't allocate buffer of size " << size << ".";
return nullptr;
}
}
