summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-11-15 20:47:42 +0100
committerCarl Hetherington <cth@carlh.net>2020-11-16 01:40:36 +0100
commitb057363e69b77119137c0c8b07402828096e03aa (patch)
tree3389d557c0cd8626fd574e51cadd5b17ef8b63f8 /src/wx
parentc241da6c6db16ed5d73b2f349d69006cba12cf3f (diff)
Make sure we use limited ("video") range data when exporting.
Our export formats all currently use limited range but we weren't making sure data fed to the encoders was limited range. Should fix #1832.
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/film_viewer.cc1
-rw-r--r--src/wx/gl_video_view.cc2
-rw-r--r--src/wx/simple_video_view.cc2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 20cbb434c..9561c32b5 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -219,6 +219,7 @@ FilmViewer::recreate_butler ()
Config::instance()->audio_mapping(_audio_channels),
_audio_channels,
bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+ VIDEO_RANGE_FULL,
false,
true
)
diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 38270a7b7..08b62dee4 100644
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -325,7 +325,7 @@ GLVideoView::set_image_and_draw ()
{
shared_ptr<PlayerVideo> pv = player_video().first;
if (pv) {
- set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
+ set_image (pv->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true));
draw (pv->inter_position(), pv->inter_size());
_viewer->image_changed (pv);
}
diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 2e79deee8..dd1296ed6 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -254,7 +254,7 @@ SimpleVideoView::update ()
_state_timer.set ("get image");
set_image (
- player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true)
+ player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), VIDEO_RANGE_FULL, false, true)
);
_state_timer.set ("ImageChanged");