summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-04-23 23:29:00 +0200
committerCarl Hetherington <cth@carlh.net>2021-05-07 09:29:58 +0200
commitc856ed24976679b6d69b2dcd3df9352c70cb68e0 (patch)
treee52f42f3a38a6454638a91f2e362c2b17c9dfcf3
parent7a5aa3912705bf7713da068e1143e4ca0b3d37a5 (diff)
Add Piece::resampled_audio_frame_rate().
-rw-r--r--src/lib/piece.cc9
-rw-r--r--src/lib/piece.h2
-rw-r--r--src/lib/player.cc2
3 files changed, 12 insertions, 1 deletions
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<const Film> film, dcp::Size
false
);
}
+
+
+int
+Piece::resampled_audio_frame_rate (shared_ptr<const Film> 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<PlayerVideo> player_video (ContentVideo video, std::shared_ptr<const Film> film, dcp::Size container_size) const;
+ int resampled_audio_frame_rate (std::shared_ptr<const Film> film) const;
+
std::shared_ptr<Content> content;
std::shared_ptr<Decoder> decoder;
boost::optional<dcpomatic::DCPTimePeriod> 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<Piece> 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);