diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 16:55:37 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 16:55:37 +0400 |
commit | 1fd323f31e535fc533bb50486fe9d794969b630b (patch) | |
tree | a71c97eb38ff1f39e897f909189fd0d317d3b2b8 /libavcodec/ljpegenc.c | |
parent | fb98ca575d64452dba55a60c4ddf571163f0ca81 (diff) | |
parent | fa4476815d0d27996eb199452f2cdbfccdd244a5 (diff) |
Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'
* commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5':
ljpegenc: split bgr encoding into a separate function
Conflicts:
libavcodec/ljpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ljpegenc.c')
-rw-r--r-- | libavcodec/ljpegenc.c | 115 |
1 files changed, 64 insertions, 51 deletions
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 7fa5e8ee36..4a015964b3 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -57,6 +57,67 @@ typedef struct LJpegEncContext { uint16_t (*scratch)[4]; } LJpegEncContext; +static int ljpeg_encode_bgr(AVCodecContext *avctx, PutBitContext *pb, + const AVFrame *frame) +{ + LJpegEncContext *s = avctx->priv_data; + const int width = frame->width; + const int height = frame->height; + const int linesize = frame->linesize[0]; + uint16_t (*buffer)[4] = s->scratch; + const int predictor = avctx->prediction_method+1; + int left[3], top[3], topleft[3]; + int x, y, i; + + for (i = 0; i < 3; i++) + buffer[0][i] = 1 << (9 - 1); + + for (y = 0; y < height; y++) { + const int modified_predictor = y ? predictor : 1; + uint8_t *ptr = frame->data[0] + (linesize * y); + + if (pb->buf_end - pb->buf - (put_bits_count(pb) >> 3) < width * 3 * 4) { + av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n"); + return -1; + } + + for (i = 0; i < 3; i++) + top[i]= left[i]= topleft[i]= buffer[0][i]; + + for (x = 0; x < width; x++) { + if(avctx->pix_fmt == AV_PIX_FMT_BGR24){ + buffer[x][1] = ptr[3 * x + 0] - ptr[3 * x + 1] + 0x100; + buffer[x][2] = ptr[3 * x + 2] - ptr[3 * x + 1] + 0x100; + buffer[x][0] = (ptr[3 * x + 0] + 2 * ptr[3 * x + 1] + ptr[3 * x + 2]) >> 2; + }else{ + buffer[x][1] = ptr[4 * x + 0] - ptr[4 * x + 1] + 0x100; + buffer[x][2] = ptr[4 * x + 2] - ptr[4 * x + 1] + 0x100; + buffer[x][0] = (ptr[4 * x + 0] + 2 * ptr[4 * x + 1] + ptr[4 * x + 2]) >> 2; + } + + for (i = 0; i < 3; i++) { + int pred, diff; + + PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); + + topleft[i] = top[i]; + top[i] = buffer[x+1][i]; + + left[i] = buffer[x][i]; + + diff = ((left[i] - pred + 0x100) & 0x1FF) - 0x100; + + if (i == 0) + ff_mjpeg_encode_dc(pb, diff, s->huff_size_dc_luminance, s->huff_code_dc_luminance); //FIXME ugly + else + ff_mjpeg_encode_dc(pb, diff, s->huff_size_dc_chrominance, s->huff_code_dc_chrominance); + } + } + } + + return 0; +} + static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *pict, int *got_packet) { @@ -92,57 +153,9 @@ static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, if( avctx->pix_fmt == AV_PIX_FMT_BGR0 || avctx->pix_fmt == AV_PIX_FMT_BGRA || avctx->pix_fmt == AV_PIX_FMT_BGR24){ - int x, y, i; - const int linesize = pict->linesize[0]; - uint16_t (*buffer)[4] = s->scratch; - int left[3], top[3], topleft[3]; - - for(i=0; i<3; i++){ - buffer[0][i]= 1 << (9 - 1); - } - - for(y = 0; y < height; y++) { - const int modified_predictor= y ? predictor : 1; - uint8_t *ptr = pict->data[0] + (linesize * y); - - if(pb.buf_end - pb.buf - (put_bits_count(&pb) >> 3) < width * 3 * 4) { - av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n"); - return -1; - } - - for(i=0; i<3; i++){ - top[i]= left[i]= topleft[i]= buffer[0][i]; - } - for(x = 0; x < width; x++) { - if(avctx->pix_fmt == AV_PIX_FMT_BGR24){ - buffer[x][1] = ptr[3 * x + 0] - ptr[3 * x + 1] + 0x100; - buffer[x][2] = ptr[3 * x + 2] - ptr[3 * x + 1] + 0x100; - buffer[x][0] = (ptr[3 * x + 0] + 2 * ptr[3 * x + 1] + ptr[3 * x + 2]) >> 2; - }else{ - buffer[x][1] = ptr[4 * x + 0] - ptr[4 * x + 1] + 0x100; - buffer[x][2] = ptr[4 * x + 2] - ptr[4 * x + 1] + 0x100; - buffer[x][0] = (ptr[4 * x + 0] + 2 * ptr[4 * x + 1] + ptr[4 * x + 2]) >> 2; - } - - for(i=0;i<3;i++) { - int pred, diff; - - PREDICT(pred, topleft[i], top[i], left[i], modified_predictor); - - topleft[i]= top[i]; - top[i]= buffer[x+1][i]; - - left[i]= buffer[x][i]; - - diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100; - - if(i==0) - ff_mjpeg_encode_dc(&pb, diff, s->huff_size_dc_luminance, s->huff_code_dc_luminance); //FIXME ugly - else - ff_mjpeg_encode_dc(&pb, diff, s->huff_size_dc_chrominance, s->huff_code_dc_chrominance); - } - } - } + ret = ljpeg_encode_bgr(avctx, &pb, pict); + if (ret < 0) + return ret; }else{ int mb_x, mb_y, i; |