Rename aac.c to aacdec.c.

[ffmpeg] / libavcodec / libopenjpeg.c

diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c
index 8717f67048b071db2c32502d38f9b42919b856d2..0956da9c36d4a57ad2c4cc81dd64fca510ac8894 100644 (file)
--- a/libavcodec/libopenjpeg.c
+++ b/libavcodec/libopenjpeg.c
@@ -20,7 +20,7 @@
  */
 
 /**
-* @file libavcodec/libopenjpeg.c
+* @file
 * JPEG 2000 decoder using libopenjpeg
 */
 
@@ -39,12 +39,12 @@ typedef struct {
 
 static int check_image_attributes(opj_image_t *image)
 {
-    return(image->comps[0].dx == image->comps[1].dx &&
+    return image->comps[0].dx == image->comps[1].dx &&
            image->comps[1].dx == image->comps[2].dx &&
            image->comps[0].dy == image->comps[1].dy &&
            image->comps[1].dy == image->comps[2].dy &&
            image->comps[0].prec == image->comps[1].prec &&
-           image->comps[1].prec == image->comps[2].prec);
+           image->comps[1].prec == image->comps[2].prec;
 }
 
 static av_cold int libopenjpeg_decode_init(AVCodecContext *avctx)
@@ -78,9 +78,13 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
     if((AV_RB32(buf) == 12) &&
        (AV_RB32(buf + 4) == JP2_SIG_TYPE) &&
        (AV_RB32(buf + 8) == JP2_SIG_VALUE)) {
-         dec = opj_create_decompress(CODEC_JP2);
+        dec = opj_create_decompress(CODEC_JP2);
     } else {
-         dec = opj_create_decompress(CODEC_J2K);
+        // If the AVPacket contains a jp2c box, then skip to
+        // the starting byte of the codestream.
+        if (AV_RB32(buf + 4) == AV_RB32("jp2c"))
+            buf += 8;
+        dec = opj_create_decompress(CODEC_J2K);
     }
 
     if(!dec) {
@@ -127,7 +131,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
                  }
                  break;
         case 4:  has_alpha = 1;
-                 avctx->pix_fmt = PIX_FMT_RGB32;
+                 avctx->pix_fmt = PIX_FMT_RGBA;
                  break;
         default: av_log(avctx, AV_LOG_ERROR, "%d components unsupported.\n", image->numcomps);
                  goto done;
@@ -181,7 +185,7 @@ static av_cold int libopenjpeg_decode_close(AVCodecContext *avctx)
 
 AVCodec libopenjpeg_decoder = {
     "libopenjpeg",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_JPEG2000,
     sizeof(LibOpenJPEGContext),
     libopenjpeg_decode_init,