diff options
| author | Sergey Lavrushkin <dualfal@gmail.com> | 2018-07-27 19:31:55 +0300 |
|---|---|---|
| committer | Pedro Arthur <bygrandao@gmail.com> | 2018-08-07 11:58:03 -0300 |
| commit | 4eb63efbdaea6d36ad94f1bb0dd129b7f7aaa899 (patch) | |
| tree | c33879607c8c16eacd64a1313c1b3a4a0946150d /libavfilter/vf_sr.c | |
| parent | 243ecadad5e5e83afdd518c067030e12ac457120 (diff) | |
| download | ffmpeg-4eb63efbdaea6d36ad94f1bb0dd129b7f7aaa899.tar.gz | |
libavfilter: Adds on the fly generation of default DNN models for tensorflow backend instead of storing binary model.
Signed-off-by: Pedro Arthur <bygrandao@gmail.com>
Diffstat (limited to 'libavfilter/vf_sr.c')
| -rw-r--r-- | libavfilter/vf_sr.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c index 2107e5a4c8..f3ca9a09a8 100644 --- a/libavfilter/vf_sr.c +++ b/libavfilter/vf_sr.c @@ -162,26 +162,26 @@ static int config_props(AVFilterLink* inlink) switch (inlink->format){ case AV_PIX_FMT_YUV420P: - sws_src_h = (sws_src_h >> 1) + (sws_src_h % 2 != 0 ? 1 : 0); - sws_src_w = (sws_src_w >> 1) + (sws_src_w % 2 != 0 ? 1 : 0); - sws_dst_h = (sws_dst_h >> 1) + (sws_dst_h % 2 != 0 ? 1 : 0); - sws_dst_w = (sws_dst_w >> 1) + (sws_dst_w % 2 != 0 ? 1 : 0); + sws_src_h = AV_CEIL_RSHIFT(sws_src_h, 1); + sws_src_w = AV_CEIL_RSHIFT(sws_src_w, 1); + sws_dst_h = AV_CEIL_RSHIFT(sws_dst_h, 1); + sws_dst_w = AV_CEIL_RSHIFT(sws_dst_w, 1); break; case AV_PIX_FMT_YUV422P: - sws_src_w = (sws_src_w >> 1) + (sws_src_w % 2 != 0 ? 1 : 0); - sws_dst_w = (sws_dst_w >> 1) + (sws_dst_w % 2 != 0 ? 1 : 0); + sws_src_w = AV_CEIL_RSHIFT(sws_src_w, 1); + sws_dst_w = AV_CEIL_RSHIFT(sws_dst_w, 1); break; case AV_PIX_FMT_YUV444P: break; case AV_PIX_FMT_YUV410P: - sws_src_h = (sws_src_h >> 2) + (sws_src_h % 4 != 0 ? 1 : 0); - sws_src_w = (sws_src_w >> 2) + (sws_src_w % 4 != 0 ? 1 : 0); - sws_dst_h = (sws_dst_h >> 2) + (sws_dst_h % 4 != 0 ? 1 : 0); - sws_dst_w = (sws_dst_w >> 2) + (sws_dst_w % 4 != 0 ? 1 : 0); + sws_src_h = AV_CEIL_RSHIFT(sws_src_h, 2); + sws_src_w = AV_CEIL_RSHIFT(sws_src_w, 2); + sws_dst_h = AV_CEIL_RSHIFT(sws_dst_h, 2); + sws_dst_w = AV_CEIL_RSHIFT(sws_dst_w, 2); break; case AV_PIX_FMT_YUV411P: - sws_src_w = (sws_src_w >> 2) + (sws_src_w % 4 != 0 ? 1 : 0); - sws_dst_w = (sws_dst_w >> 2) + (sws_dst_w % 4 != 0 ? 1 : 0); + sws_src_w = AV_CEIL_RSHIFT(sws_src_w, 2); + sws_dst_w = AV_CEIL_RSHIFT(sws_dst_w, 2); break; default: av_log(context, AV_LOG_ERROR, "could not create SwsContext for input pixel format"); |