From c856ed24976679b6d69b2dcd3df9352c70cb68e0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 23 Apr 2021 23:29:00 +0200 Subject: [PATCH] Add Piece::resampled_audio_frame_rate(). --- src/lib/piece.cc | 9 +++++++++ src/lib/piece.h | 2 ++ src/lib/player.cc | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/lib/piece.cc b/src/lib/piece.cc index dd6a8ff23..2a4f01268 100644 --- a/src/lib/piece.cc +++ b/src/lib/piece.cc @@ -147,3 +147,12 @@ Piece::player_video (ContentVideo video, shared_ptr film, dcp::Size false ); } + + +int +Piece::resampled_audio_frame_rate (shared_ptr film) const +{ + DCPOMATIC_ASSERT (content->audio); + return content->audio->resampled_frame_rate (film); +} + diff --git a/src/lib/piece.h b/src/lib/piece.h index 5997e0fd6..04159e58f 100644 --- a/src/lib/piece.h +++ b/src/lib/piece.h @@ -60,6 +60,8 @@ public: std::shared_ptr player_video (ContentVideo video, std::shared_ptr film, dcp::Size container_size) const; + int resampled_audio_frame_rate (std::shared_ptr film) const; + std::shared_ptr content; std::shared_ptr decoder; boost::optional ignore_video; diff --git a/src/lib/player.cc b/src/lib/player.cc index e1a86e227..451a0018a 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -872,7 +872,7 @@ Player::audio (weak_ptr wp, AudioStreamPtr stream, ContentAudio content_a auto content = piece->content->audio; DCPOMATIC_ASSERT (content); - int const rfr = content->resampled_frame_rate (_film); + int const rfr = piece->resampled_audio_frame_rate (_film); /* Compute time in the DCP */ auto time = piece->resampled_audio_to_dcp (content_audio.frame, _film); -- 2.30.2