Merge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 13:01:54 +0000 (14:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 13:01:54 +0000 (14:01 +0100)
* commit 'b73a8922d818c7f909855557718d4c3bfacbd92d':
  ljpegenc: split yuv encoding into a separate function

Conflicts:
libavcodec/ljpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/ljpegenc.c

@@@ -150,82 -230,12 +237,14 @@@ static int ljpeg_encode_frame(AVCodecCo
  
      header_bits = put_bits_count(&pb);
  
 -    if (avctx->pix_fmt == AV_PIX_FMT_BGR24)
 +    if(    avctx->pix_fmt == AV_PIX_FMT_BGR0
 +        || avctx->pix_fmt == AV_PIX_FMT_BGRA
-         || avctx->pix_fmt == AV_PIX_FMT_BGR24){
++        || avctx->pix_fmt == AV_PIX_FMT_BGR24)
          ret = ljpeg_encode_bgr(avctx, &pb, pict);
-         if (ret < 0)
-             return ret;
-     }else{
-         int mb_x, mb_y, i;
-         for(mb_y = 0; mb_y < mb_height; mb_y++) {
-             if (pb.buf_end - pb.buf - (put_bits_count(&pb) >> 3) <
-                 mb_width * 4 * 3 * s->hsample[0] * s->vsample[0]) {
-                 av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
-                 return -1;
-             }
-             for(mb_x = 0; mb_x < mb_width; mb_x++) {
-                 if(mb_x==0 || mb_y==0){
-                     for(i=0;i<3;i++) {
-                         uint8_t *ptr;
-                         int x, y, h, v, linesize;
-                         h = s->hsample[i];
-                         v = s->vsample[i];
-                         linesize = pict->linesize[i];
-                         for(y=0; y<v; y++){
-                             for(x=0; x<h; x++){
-                                 int pred;
-                                 ptr = pict->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
-                                 if(y==0 && mb_y==0){
-                                     if(x==0 && mb_x==0){
-                                         pred= 128;
-                                     }else{
-                                         pred= ptr[-1];
-                                     }
-                                 }else{
-                                     if(x==0 && mb_x==0){
-                                         pred= ptr[-linesize];
-                                     }else{
-                                         PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
-                                     }
-                                 }
-                                 if(i==0)
-                                     ff_mjpeg_encode_dc(&pb, *ptr - pred, s->huff_size_dc_luminance, s->huff_code_dc_luminance); //FIXME ugly
-                                 else
-                                     ff_mjpeg_encode_dc(&pb, *ptr - pred, s->huff_size_dc_chrominance, s->huff_code_dc_chrominance);
-                             }
-                         }
-                     }
-                 }else{
-                     for(i=0;i<3;i++) {
-                         uint8_t *ptr;
-                         int x, y, h, v, linesize;
-                         h = s->hsample[i];
-                         v = s->vsample[i];
-                         linesize = pict->linesize[i];
-                         for(y=0; y<v; y++){
-                             for(x=0; x<h; x++){
-                                 int pred;
-                                 ptr = pict->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
-                                 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
-                                 if(i==0)
-                                     ff_mjpeg_encode_dc(&pb, *ptr - pred, s->huff_size_dc_luminance, s->huff_code_dc_luminance); //FIXME ugly
-                                 else
-                                     ff_mjpeg_encode_dc(&pb, *ptr - pred, s->huff_size_dc_chrominance, s->huff_code_dc_chrominance);
-                             }
-                         }
-                     }
-                 }
-             }
-         }
-     }
+     else
+         ret = ljpeg_encode_yuv(avctx, &pb, pict);
+     if (ret < 0)
+         return ret;
  
      emms_c();