summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libhb/deblock.c3
-rw-r--r--libhb/decavcodec.c4
-rw-r--r--libhb/decmpeg2.c2
-rw-r--r--libhb/decomb.c5
-rw-r--r--libhb/deinterlace.c5
-rw-r--r--libhb/denoise.c3
-rw-r--r--libhb/detelecine.c3
-rw-r--r--libhb/encavcodec.c2
-rw-r--r--libhb/enctheora.c8
-rw-r--r--libhb/encx264.c10
-rw-r--r--libhb/encxvid.c2
-rw-r--r--libhb/internal.h15
-rw-r--r--libhb/render.c8
13 files changed, 41 insertions, 29 deletions
diff --git a/libhb/deblock.c b/libhb/deblock.c
index dbc669031..f549fbbb5 100644
--- a/libhb/deblock.c
+++ b/libhb/deblock.c
@@ -405,8 +405,7 @@ hb_filter_private_t * hb_deblock_init( int pix_fmt,
pv->pp7_src = (uint8_t*)malloc( pv->pp7_temp_stride*(h+8)*sizeof(uint8_t) );
- int buf_size = 3 * width * height / 2;
- pv->buf_out = hb_buffer_init( buf_size );
+ pv->buf_out = hb_video_buffer_init( width, height );
return pv;
}
diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index e215aef9f..81ea4996b 100644
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -426,7 +426,7 @@ static hb_buffer_t *copy_frame( hb_work_private_t *pv, AVFrame *frame )
w = pv->job->title->width;
h = pv->job->title->height;
}
- hb_buffer_t *buf = hb_buffer_init( w * h * 3 / 2 );
+ hb_buffer_t *buf = hb_video_buffer_init( w, h );
uint8_t *dst = buf->data;
if ( context->pix_fmt != PIX_FMT_YUV420P || w != context->width ||
@@ -449,7 +449,7 @@ static hb_buffer_t *copy_frame( hb_work_private_t *pv, AVFrame *frame )
else
{
dst = copy_plane( dst, frame->data[0], w, frame->linesize[0], h );
- w >>= 1; h >>= 1;
+ w = (w + 1) >> 1; h = (h + 1) >> 1;
dst = copy_plane( dst, frame->data[1], w, frame->linesize[1], h );
dst = copy_plane( dst, frame->data[2], w, frame->linesize[2], h );
}
diff --git a/libhb/decmpeg2.c b/libhb/decmpeg2.c
index e0387dd64..eae00919c 100644
--- a/libhb/decmpeg2.c
+++ b/libhb/decmpeg2.c
@@ -75,7 +75,7 @@ static hb_buffer_t *hb_copy_frame( hb_job_t *job, int width, int height,
dst_h = job->title->height;
}
int dst_wh = dst_w * dst_h;
- hb_buffer_t *buf = hb_buffer_init( dst_wh + ( dst_wh >> 1 ) );
+ hb_buffer_t *buf = hb_video_buffer_init( dst_w, dst_h );
if ( dst_w != width || dst_h != height )
{
diff --git a/libhb/decomb.c b/libhb/decomb.c
index e83f0d5a6..2194f5633 100644
--- a/libhb/decomb.c
+++ b/libhb/decomb.c
@@ -1113,9 +1113,8 @@ hb_filter_private_t * hb_decomb_init( int pix_fmt,
pv->width[1] = pv->width[2] = width >> 1;
pv->height[1] = pv->height[2] = height >> 1;
- int buf_size = 3 * width * height / 2;
- pv->buf_out[0] = hb_buffer_init( buf_size );
- pv->buf_out[1] = hb_buffer_init( buf_size );
+ pv->buf_out[0] = hb_video_buffer_init( width, height );
+ pv->buf_out[1] = hb_video_buffer_init( width, height );
pv->buf_settings = hb_buffer_init( 0 );
pv->yadif_deinterlaced_frames = 0;
diff --git a/libhb/deinterlace.c b/libhb/deinterlace.c
index 9e4c33eb4..b6b10fe43 100644
--- a/libhb/deinterlace.c
+++ b/libhb/deinterlace.c
@@ -531,9 +531,8 @@ hb_filter_private_t * hb_deinterlace_init( int pix_fmt,
pv->width[1] = pv->width[2] = width >> 1;
pv->height[1] = pv->height[2] = height >> 1;
- int buf_size = 3 * width * height / 2;
- pv->buf_out[0] = hb_buffer_init( buf_size );
- pv->buf_out[1] = hb_buffer_init( buf_size );
+ pv->buf_out[0] = hb_video_buffer_init( width, height );
+ pv->buf_out[1] = hb_video_buffer_init( width, height );
pv->buf_settings = hb_buffer_init( 0 );
pv->yadif_ready = 0;
diff --git a/libhb/denoise.c b/libhb/denoise.c
index 6d335fcdc..39139124e 100644
--- a/libhb/denoise.c
+++ b/libhb/denoise.c
@@ -368,8 +368,7 @@ hb_filter_private_t * hb_denoise_init( int pix_fmt,
hqdn3d_precalc_coef( pv->hqdn3d_coef[2], spatial_chroma );
hqdn3d_precalc_coef( pv->hqdn3d_coef[3], temporal_chroma );
- int buf_size = 3 * width * height / 2;
- pv->buf_out = hb_buffer_init( buf_size );
+ pv->buf_out = hb_video_buffer_init( width, height );
return pv;
}
diff --git a/libhb/detelecine.c b/libhb/detelecine.c
index d3757cb69..92d279d6f 100644
--- a/libhb/detelecine.c
+++ b/libhb/detelecine.c
@@ -829,8 +829,7 @@ hb_filter_private_t * hb_detelecine_init( int pix_fmt,
pv->width[1] = pv->width[2] = width >> 1;
pv->height[1] = pv->height[2] = height >> 1;
- int buf_size = 3 * width * height / 2;
- pv->buf_out = hb_buffer_init( buf_size );
+ pv->buf_out = hb_video_buffer_init( width, height );
struct pullup_context * ctx;
pv->pullup_ctx = ctx = pullup_alloc_context();
diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
index d3decd7d1..d22d30d3d 100644
--- a/libhb/encavcodec.c
+++ b/libhb/encavcodec.c
@@ -237,7 +237,7 @@ int encavcodecWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
frame->quality = pv->context->global_quality;
/* Should be way too large */
- buf = hb_buffer_init( 3 * job->width * job->height / 2 );
+ buf = hb_video_buffer_init( job->width, job->height );
buf->size = avcodec_encode_video( pv->context, buf->data, buf->alloc,
frame );
buf->start = in->start;
diff --git a/libhb/enctheora.c b/libhb/enctheora.c
index 274887f9f..c2df9d9a6 100644
--- a/libhb/enctheora.c
+++ b/libhb/enctheora.c
@@ -142,13 +142,13 @@ int enctheoraWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
yuv.y_height = job->height;
yuv.y_stride = job->width;
- yuv.uv_width = job->width / 2;
- yuv.uv_height = job->height / 2;
- yuv.uv_stride = job->width / 2;
+ yuv.uv_width = (job->width + 1) / 2;
+ yuv.uv_height = (job->height + 1) / 2;
+ yuv.uv_stride = yuv.uv_width;
yuv.y = in->data;
yuv.u = in->data + job->width * job->height;
- yuv.v = in->data + job->width * job->height * 5/4;
+ yuv.v = in->data + yuv.uv_width * yuv.uv_height;
theora_encode_YUVin(&pv->theora, &yuv);
diff --git a/libhb/encx264.c b/libhb/encx264.c
index e2d90cd31..97de03e8e 100644
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -312,6 +312,7 @@ int encx264Init( hb_work_object_t * w, hb_job_t * job )
x264_picture_alloc( &pv->pic_in, X264_CSP_I420,
job->width, job->height );
+ pv->pic_in.img.i_stride[2] = pv->pic_in.img.i_stride[1] = ( ( job->width + 1 ) >> 1 );
pv->x264_allocated_pic = pv->pic_in.img.plane[0];
if (job->areBframes)
@@ -391,7 +392,7 @@ static hb_buffer_t *nal_encode( hb_work_object_t *w, x264_picture_t *pic_out,
hb_job_t *job = pv->job;
/* Should be way too large */
- buf = hb_buffer_init( 3 * job->width * job->height / 2 );
+ buf = hb_video_buffer_init( job->width, job->height );
buf->size = 0;
buf->frametype = 0;
@@ -505,17 +506,18 @@ static hb_buffer_t *x264_encode( hb_work_object_t *w, hb_buffer_t *in )
/* Point x264 at our current buffers Y(UV) data. */
pv->pic_in.img.plane[0] = in->data;
+ int uvsize = ( (job->width + 1) >> 1 ) * ( (job->height + 1) >> 1 );
if( job->grayscale )
{
/* XXX x264 has currently no option for grayscale encoding */
- memset( pv->pic_in.img.plane[1], 0x80, job->width * job->height / 4 );
- memset( pv->pic_in.img.plane[2], 0x80, job->width * job->height / 4 );
+ memset( pv->pic_in.img.plane[1], 0x80, uvsize );
+ memset( pv->pic_in.img.plane[2], 0x80, uvsize );
}
else
{
/* Point x264 at our buffers (Y)UV data */
pv->pic_in.img.plane[1] = in->data + job->width * job->height;
- pv->pic_in.img.plane[2] = in->data + 5 * job->width * job->height / 4;
+ pv->pic_in.img.plane[2] = pv->pic_in.img.plane[1] + uvsize;
}
if( in->new_chap && job->chapter_markers )
{
diff --git a/libhb/encxvid.c b/libhb/encxvid.c
index 18961dc28..cb4ca01fe 100644
--- a/libhb/encxvid.c
+++ b/libhb/encxvid.c
@@ -158,7 +158,7 @@ int encxvidWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
}
/* Should be way too large */
- buf = hb_buffer_init( 3 * job->width * job->height / 2 );
+ buf = hb_video_buffer_init( job->width, job->height );
buf->start = in->start;
buf->stop = in->stop;
diff --git a/libhb/internal.h b/libhb/internal.h
index a8f5edfd9..3ae1dad79 100644
--- a/libhb/internal.h
+++ b/libhb/internal.h
@@ -96,6 +96,21 @@ void hb_fifo_push( hb_fifo_t *, hb_buffer_t * );
void hb_fifo_push_head( hb_fifo_t *, hb_buffer_t * );
void hb_fifo_close( hb_fifo_t ** );
+// this routine gets a buffer for an uncompressed YUV420 video frame
+// with dimensions width x height.
+static inline hb_buffer_t * hb_video_buffer_init( int width, int height )
+{
+ // Y requires w x h bytes. U & V each require (w+1)/2 x
+ // (h+1)/2 bytes (the "+1" is to round up). We shift rather
+ // than divide by 2 since the compiler can't know these ints
+ // are positive so it generates very expensive integer divides
+ // if we do "/2". The code here matches the calculation for
+ // PIX_FMT_YUV420P in ffmpeg's avpicture_fill() which is required
+ // for most of HB's filters to work right.
+ return hb_buffer_init( width * height + ( ( width+1 ) >> 1 ) *
+ ( ( height+1 ) >> 1 ) * 2 );
+}
+
/***********************************************************************
* Threads: update.c, scan.c, work.c, reader.c, muxcommon.c
**********************************************************************/
diff --git a/libhb/render.c b/libhb/render.c
index 7900ba2ae..5ca6a4c8d 100644
--- a/libhb/render.c
+++ b/libhb/render.c
@@ -55,13 +55,13 @@ hb_work_object_t hb_render =
*/
static uint8_t *getU(uint8_t *data, int width, int height, int x, int y)
{
- return(&data[(((y/2) * (width/2)) + (x/2)) + (width*height)]);
+ return(&data[(y>>1) * ((width+1)>>1) + (x>>1) + width*height]);
}
static uint8_t *getV(uint8_t *data, int width, int height, int x, int y)
{
- return(&data[(((y/2) * (width/2)) + (x/2)) + (width*height) +
- (width*height)/4]);
+ int w2 = (width+1) >> 1, h2 = (height+1) >> 1;
+ return(&data[(y>>1) * w2 + (x>>1) + width*height + w2*h2]);
}
static void ApplySub( hb_job_t * job, hb_buffer_t * buf,
@@ -248,7 +248,7 @@ int renderWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
}
/* Setup render buffer */
- hb_buffer_t * buf_render = hb_buffer_init( 3 * job->width * job->height / 2 );
+ hb_buffer_t * buf_render = hb_video_buffer_init( job->width, job->height );
/* Apply filters */
if( job->filters )
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 18:09:06 +0000