diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-14 16:26:15 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-14 21:55:13 +0200 |
commit | bb850480e1796fcbf1f76c2c5748b717e7056d80 (patch) | |
tree | ba75111080af3915609bb07989f42064b66cfd83 /libavcodec/mjpegenc.c | |
parent | ddece75bc8d70e3cedbf2361778e867d1e1676a7 (diff) | |
download | ffmpeg-streaming-bb850480e1796fcbf1f76c2c5748b717e7056d80.zip ffmpeg-streaming-bb850480e1796fcbf1f76c2c5748b717e7056d80.tar.gz |
mjpegenc: support slice multithreading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegenc.c')
-rw-r--r-- | libavcodec/mjpegenc.c | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 7eb4a52..34c9d7a 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -137,6 +137,12 @@ static void jpeg_table_header(MpegEncContext *s) } #endif + if(s->avctx->active_thread_type & FF_THREAD_SLICE){ + put_marker(p, DRI); + put_bits(p, 16, 4); + put_bits(p, 16, s->mb_width); + } + /* huffman table */ put_marker(p, DHT); flush_put_bits(p); @@ -202,11 +208,12 @@ static void jpeg_put_comments(MpegEncContext *s) void ff_mjpeg_encode_picture_header(MpegEncContext *s) { const int lossless= s->avctx->codec_id != CODEC_ID_MJPEG; + int i; put_marker(&s->pb, SOI); // hack for AMV mjpeg format - if(s->avctx->codec_id == CODEC_ID_AMV) return; + if(s->avctx->codec_id == CODEC_ID_AMV) goto end; jpeg_put_comments(s); @@ -284,6 +291,11 @@ void ff_mjpeg_encode_picture_header(MpegEncContext *s) } put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */ + +end: + s->esc_pos = put_bits_count(&s->pb) >> 3; + for(i=1; i<s->slice_context_count; i++) + s->thread_context[i]->esc_pos = 0; } static void escape_FF(MpegEncContext *s, int start) @@ -339,21 +351,30 @@ static void escape_FF(MpegEncContext *s, int start) } } -void ff_mjpeg_encode_stuffing(PutBitContext * pbc) +void ff_mjpeg_encode_stuffing(MpegEncContext *s) { - int length; + int length, i; + PutBitContext *pbc = &s->pb; + int mb_y = s->mb_y - !s->mb_x; length= (-put_bits_count(pbc))&7; if(length) put_bits(pbc, length, (1<<length)-1); + + flush_put_bits(&s->pb); + escape_FF(s, s->esc_pos); + + if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height) + put_marker(pbc, RST0 + (mb_y&7)); + s->esc_pos = put_bits_count(pbc) >> 3; + + for(i=0; i<3; i++) + s->last_dc[i] = 128 << s->intra_dc_precision; } void ff_mjpeg_encode_picture_trailer(MpegEncContext *s) { - ff_mjpeg_encode_stuffing(&s->pb); - flush_put_bits(&s->pb); assert((s->header_bits&7)==0); - escape_FF(s, s->header_bits>>3); put_marker(&s->pb, EOI); } @@ -485,6 +506,7 @@ AVCodec ff_mjpeg_encoder = { .init = ff_MPV_encode_init, .encode2 = ff_MPV_encode_picture, .close = ff_MPV_encode_end, + .capabilities = CODEC_CAP_SLICE_THREADS, .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUVJ420P, PIX_FMT_YUVJ422P, PIX_FMT_NONE }, |