diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-09-15 01:00:33 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-27 13:41:46 +0200 |
| commit | 9bfa07293928c371d59db2091ba2b7e715ce5994 (patch) | |
| tree | f73bc4c69e13d19c934b0ee798ebfa4a68e46597 /src/lib/player_video.cc | |
| parent | c59981ce92898f6be6987f10ebb29161e36e6766 (diff) | |
Various alignment adjustments.
Diffstat (limited to 'src/lib/player_video.cc')
| -rw-r--r-- | src/lib/player_video.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 0a6ce0d99..a687e7ea5 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -122,10 +122,10 @@ PlayerVideo::image (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoR } -shared_ptr<Image> +shared_ptr<const Image> PlayerVideo::raw_image () const { - return _in->image(_inter_size).image; + return _in->image(false, _inter_size).image; } @@ -144,7 +144,7 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, V _image_out_size = _out_size; _image_fade = _fade; - auto prox = _in->image (_inter_size); + auto prox = _in->image (true, _inter_size); _error = prox.error; auto total_crop = _crop; @@ -184,7 +184,7 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, V ); if (_text) { - _image->alpha_blend (Image::ensure_aligned (_text->image), _text->position); + _image->alpha_blend (Image::ensure_aligned(_text->image, true), _text->position); } if (_fade) { @@ -300,7 +300,7 @@ PlayerVideo::keep_xyz_or_rgb (AVPixelFormat p) void PlayerVideo::prepare (function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast, bool proxy_only) { - _in->prepare (_inter_size); + _in->prepare (aligned, _inter_size); boost::mutex::scoped_lock lm (_mutex); if (!_image && !proxy_only) { make_image (pixel_format, video_range, aligned, fast); |