aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-23 12:35:10 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-23 12:35:10 +0200
commitb04b021005508e190ad02b66106c2c611b404a72 (patch)
treea82dcb03f05755ff42f795f9def66587b24eed8c
parent157fa73992ab30b32160034e115aac21808084e2 (diff)
parentae5a8dca675ee544178225256893e679b750cb63 (diff)
downloadffmpeg-b04b021005508e190ad02b66106c2c611b404a72.tar.gz
Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'
* commit 'ae5a8dca675ee544178225256893e679b750cb63': hap: Fix slice size computation Conflicts: libavcodec/hapdec.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/hap.h2
-rw-r--r--libavcodec/hapdec.c26
2 files changed, 18 insertions, 10 deletions
diff --git a/libavcodec/hap.h b/libavcodec/hap.h
index 893b4c5f92..e334ba837e 100644
--- a/libavcodec/hap.h
+++ b/libavcodec/hap.h
@@ -77,7 +77,7 @@ typedef struct HapContext {
size_t max_snappy; /* Maximum compressed size for snappy buffer */
- int slice_size; /* Optimal slice size */
+ int slice_count; /* Number of slices for threaded operations */
/* Pointer to the selected compress or decompress function */
int (*tex_fun)(uint8_t *dst, ptrdiff_t stride, const uint8_t *block);
diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c
index c05d4c0227..eb779e6906 100644
--- a/libavcodec/hapdec.c
+++ b/libavcodec/hapdec.c
@@ -271,14 +271,23 @@ static int decompress_texture_thread(AVCodecContext *avctx, void *arg,
AVFrame *frame = arg;
const uint8_t *d = ctx->tex_data;
int w_block = avctx->coded_width / TEXTURE_BLOCK_W;
+ int h_block = avctx->coded_height / TEXTURE_BLOCK_H;
int x, y;
int start_slice, end_slice;
+ int base_blocks_per_slice = h_block / ctx->slice_count;
+ int remainder_blocks = h_block % ctx->slice_count;
- start_slice = slice * ctx->slice_size;
- end_slice = FFMIN(start_slice + ctx->slice_size, avctx->coded_height);
+ /* When the frame height (in blocks) doesn't divide evenly between the
+ * number of slices, spread the remaining blocks evenly between the first
+ * operations */
+ start_slice = slice * base_blocks_per_slice;
+ /* Add any extra blocks (one per slice) that have been added before this slice */
+ start_slice += FFMIN(slice, remainder_blocks);
- start_slice /= TEXTURE_BLOCK_H;
- end_slice /= TEXTURE_BLOCK_H;
+ end_slice = start_slice + base_blocks_per_slice;
+ /* Add an extra block if there are still remainder blocks to be accounted for */
+ if (slice < remainder_blocks)
+ end_slice++;
for (y = start_slice; y < end_slice; y++) {
uint8_t *p = frame->data[0] + y * frame->linesize[0] * TEXTURE_BLOCK_H;
@@ -298,10 +307,6 @@ static int hap_decode(AVCodecContext *avctx, void *data,
HapContext *ctx = avctx->priv_data;
ThreadFrame tframe;
int ret, i;
- int slices = FFMIN(avctx->thread_count,
- avctx->coded_height / TEXTURE_BLOCK_H);
-
- ctx->slice_size = avctx->coded_height / slices;
bytestream2_init(&ctx->gbc, avpkt->data, avpkt->size);
@@ -340,7 +345,7 @@ static int hap_decode(AVCodecContext *avctx, void *data,
}
/* Use the decompress function on the texture, one block per thread */
- avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, slices);
+ avctx->execute2(avctx, decompress_texture_thread, tframe.f, NULL, ctx->slice_count);
/* Frame is ready to be output */
tframe.f->pict_type = AV_PICTURE_TYPE_I;
@@ -393,6 +398,9 @@ static av_cold int hap_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_DEBUG, "%s texture\n", texture_name);
+ ctx->slice_count = av_clip(avctx->thread_count, 1,
+ avctx->coded_height / TEXTURE_BLOCK_H);
+
return 0;
}