[FFmpeg-cvslog] rtpenc_jpeg: handle case of picture dimensions not dividing by 8
ffmpeg | branch: release/2.6 | Andrey Utkin andrey.krieger.ut...@gmail.com | Sat Apr 11 00:54:10 2015 +0300| [4c2a1e673bfd269af9ab5c21483b5b6ec0d14063] | committer: Michael Niedermayer rtpenc_jpeg: handle case of picture dimensions not dividing by 8 This fixes the calculation of the number of needed blocks to make sure that ALL pixels are represented by the result. Reviewed-by: Thomas Volkert si...@gmx.net Signed-off-by: Michael Niedermayer michae...@gmx.at (cherry picked from commit 7f64a7503b19b39f1251e4380987034c569bebf5) Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c2a1e673bfd269af9ab5c21483b5b6ec0d14063 --- libavformat/rtpenc_jpeg.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index 2e13e17..7ee26c4 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -40,8 +40,8 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) s-timestamp = s-cur_timestamp; /* convert video pixel dimensions from pixels to blocks */ -w = s1-streams[0]-codec-width 3; -h = s1-streams[0]-codec-height 3; +w = FF_CEIL_RSHIFT(s1-streams[0]-codec-width, 3); +h = FF_CEIL_RSHIFT(s1-streams[0]-codec-height, 3); /* get the pixel format type or fail */ if (s1-streams[0]-codec-pix_fmt == AV_PIX_FMT_YUVJ422P || ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] rtpenc_jpeg: Handle case of picture dimensions not dividing by 8
ffmpeg | branch: release/2.2 | Andrey Utkin andrey.krieger.ut...@gmail.com |
Sat Apr 11 00:54:10 2015 +0300| [1f1686615c20982a68b2d8db3ff109834a260d27] |
committer: Reinhard Tartler
rtpenc_jpeg: Handle case of picture dimensions not dividing by 8
This fixes the calculation of the number of needed blocks to make
sure that ALL pixels are represented by the result.
Signed-off-by: Martin Storsjö mar...@martin.st
(cherry picked from commit 4415d0f3bbaeb287327ef101ae98d727a69d9af1)
Signed-off-by: Reinhard Tartler siret...@tauware.de
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f1686615c20982a68b2d8db3ff109834a260d27
---
libavformat/rtpenc_jpeg.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c
index 04df658..0ceb091 100644
--- a/libavformat/rtpenc_jpeg.c
+++ b/libavformat/rtpenc_jpeg.c
@@ -40,8 +40,8 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t
*buf, int size)
s-timestamp = s-cur_timestamp;
/* convert video pixel dimensions from pixels to blocks */
-w = s1-streams[0]-codec-width 3;
-h = s1-streams[0]-codec-height 3;
+w = (s1-streams[0]-codec-width + 7) 3;
+h = (s1-streams[0]-codec-height + 7) 3;
/* check if pixel format is not the normal 420 case */
if (s1-streams[0]-codec-pix_fmt == AV_PIX_FMT_YUVJ422P) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] rtpenc_jpeg: handle case of picture dimensions not dividing by 8
ffmpeg | branch: release/2.5 | Andrey Utkin andrey.krieger.ut...@gmail.com | Sat Apr 11 00:54:10 2015 +0300| [3d65a272dab66329effd628533bcbbc67af73bf8] | committer: Michael Niedermayer rtpenc_jpeg: handle case of picture dimensions not dividing by 8 This fixes the calculation of the number of needed blocks to make sure that ALL pixels are represented by the result. Reviewed-by: Thomas Volkert si...@gmx.net Signed-off-by: Michael Niedermayer michae...@gmx.at (cherry picked from commit 7f64a7503b19b39f1251e4380987034c569bebf5) Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d65a272dab66329effd628533bcbbc67af73bf8 --- libavformat/rtpenc_jpeg.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index 2e13e17..7ee26c4 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -40,8 +40,8 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) s-timestamp = s-cur_timestamp; /* convert video pixel dimensions from pixels to blocks */ -w = s1-streams[0]-codec-width 3; -h = s1-streams[0]-codec-height 3; +w = FF_CEIL_RSHIFT(s1-streams[0]-codec-width, 3); +h = FF_CEIL_RSHIFT(s1-streams[0]-codec-height, 3); /* get the pixel format type or fail */ if (s1-streams[0]-codec-pix_fmt == AV_PIX_FMT_YUVJ422P || ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] rtpenc_jpeg: Handle case of picture dimensions not dividing by 8
ffmpeg | branch: release/2.4 | Andrey Utkin andrey.krieger.ut...@gmail.com | Sat Apr 11 00:54:10 2015 +0300| [4415d0f3bbaeb287327ef101ae98d727a69d9af1] | committer: Vittorio Giovara rtpenc_jpeg: Handle case of picture dimensions not dividing by 8 This fixes the calculation of the number of needed blocks to make sure that ALL pixels are represented by the result. Signed-off-by: Martin Storsjö mar...@martin.st http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4415d0f3bbaeb287327ef101ae98d727a69d9af1 --- libavformat/rtpenc_jpeg.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index 9d0915b..b8c880a 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -40,8 +40,8 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) s-timestamp = s-cur_timestamp; /* convert video pixel dimensions from pixels to blocks */ -w = s1-streams[0]-codec-width 3; -h = s1-streams[0]-codec-height 3; +w = (s1-streams[0]-codec-width + 7) 3; +h = (s1-streams[0]-codec-height + 7) 3; /* get the pixel format type or fail */ if (s1-streams[0]-codec-pix_fmt == AV_PIX_FMT_YUVJ422P || ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] rtpenc_jpeg: Handle case of picture dimensions not dividing by 8
ffmpeg | branch: master | Andrey Utkin andrey.krieger.ut...@gmail.com | Sat Apr 11 00:54:10 2015 +0300| [1bd2646a6da808f6f9881525771db098c54bc3d2] | committer: Martin Storsjö rtpenc_jpeg: Handle case of picture dimensions not dividing by 8 This fixes the calculation of the number of needed blocks to make sure that ALL pixels are represented by the result. Signed-off-by: Martin Storsjö mar...@martin.st http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1bd2646a6da808f6f9881525771db098c54bc3d2 --- libavformat/rtpenc_jpeg.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index 9d0915b..b8c880a 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -40,8 +40,8 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) s-timestamp = s-cur_timestamp; /* convert video pixel dimensions from pixels to blocks */ -w = s1-streams[0]-codec-width 3; -h = s1-streams[0]-codec-height 3; +w = (s1-streams[0]-codec-width + 7) 3; +h = (s1-streams[0]-codec-height + 7) 3; /* get the pixel format type or fail */ if (s1-streams[0]-codec-pix_fmt == AV_PIX_FMT_YUVJ422P || ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] rtpenc_jpeg: handle case of picture dimensions not dividing by 8
ffmpeg | branch: master | Andrey Utkin andrey.krieger.ut...@gmail.com | Sat Apr 11 00:54:10 2015 +0300| [7f64a7503b19b39f1251e4380987034c569bebf5] | committer: Michael Niedermayer rtpenc_jpeg: handle case of picture dimensions not dividing by 8 This fixes the calculation of the number of needed blocks to make sure that ALL pixels are represented by the result. Reviewed-by: Thomas Volkert si...@gmx.net Signed-off-by: Michael Niedermayer michae...@gmx.at http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f64a7503b19b39f1251e4380987034c569bebf5 --- libavformat/rtpenc_jpeg.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index c353329..9a20cbc 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -40,8 +40,8 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) s-timestamp = s-cur_timestamp; /* convert video pixel dimensions from pixels to blocks */ -w = s1-streams[0]-codec-width 3; -h = s1-streams[0]-codec-height 3; +w = FF_CEIL_RSHIFT(s1-streams[0]-codec-width, 3); +h = FF_CEIL_RSHIFT(s1-streams[0]-codec-height, 3); /* get the pixel format type or fail */ if (s1-streams[0]-codec-pix_fmt == AV_PIX_FMT_YUVJ422P || ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
