Merge branch 'mpeg2' into v2.17.xv2.17.16

1 files changed, 6 insertions, 6 deletions

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 7a6a2a4bf..ca69832a9 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -166,17 +166,17 @@ void
 Hints::check_unusual_container ()
 {
 	auto const film_container = film()->container()->id();
-	if (film_container != "185" && film_container != "239") {
+	if (film()->video_encoding() != VideoEncoding::MPEG2 && film_container != "185" && film_container != "239") {
 		hint (_("Your DCP uses an unusual container ratio.  This may cause problems on some projectors.  If possible, use Flat or Scope for the DCP container ratio."));
 	}
 }
 
 
 void
-Hints::check_high_j2k_bandwidth ()
+Hints::check_high_video_bit_rate()
 {
-	if (film()->j2k_bandwidth() >= 245000000) {
-		hint (_("A few projectors have problems playing back very high bit-rate DCPs.  It is a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is unlikely to have any visible effect on the image."));
+	if (film()->video_encoding() == VideoEncoding::JPEG2000 && film()->video_bit_rate(VideoEncoding::JPEG2000) >= 245000000) {
+		hint (_("A few projectors have problems playing back very high bit-rate DCPs.  It is a good idea to drop the video bit rate down to about 200Mbit/s; this is unlikely to have any visible effect on the image."));
 	}
 }
 
@@ -468,7 +468,7 @@ try
 	check_upmixers ();
 	check_incorrect_container ();
 	check_unusual_container ();
-	check_high_j2k_bandwidth ();
+	check_high_video_bit_rate();
 	check_frame_rate ();
 	check_4k_3d ();
 	check_speed_up ();
@@ -756,7 +756,7 @@ void
 Hints::check_8_or_16_audio_channels()
 {
 	auto const channels = film()->audio_channels();
-	if (channels != 8 && channels != 16) {
+	if (film()->video_encoding() != VideoEncoding::MPEG2 && channels != 8 && channels != 16) {
 		hint(String::compose(_("Your DCP has %1 audio channels, rather than 8 or 16.  This may cause some distributors to raise QC errors when they check your DCP.  To avoid this, set the DCP audio channels to 8 or 16."), channels));
 	}
 }