Add my name to copyright & author as requested by the original author.

[ffmpeg] / libavformat / img2.c

diff --git a/libavformat/img2.c b/libavformat/img2.c
index 962265e4c19819addc0933da45ddb09d4c06bfe5..113f431a48256352ba539a55ca78e3b8bd0a21fc 100644 (file)
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -1,6 +1,6 @@
 /*
  * Image format
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
  * Copyright (c) 2004 Michael Niedermayer
  *
  * This file is part of FFmpeg.
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "libavutil/avstring.h"
 #include "avformat.h"
 #include <strings.h>
@@ -45,6 +46,7 @@ static const IdStrMap img_tags[] = {
     { CODEC_ID_PNG       , "png"},
     { CODEC_ID_PNG       , "mng"},
     { CODEC_ID_PPM       , "ppm"},
+    { CODEC_ID_PPM       , "pnm"},
     { CODEC_ID_PGM       , "pgm"},
     { CODEC_ID_PGMYUV    , "pgmyuv"},
     { CODEC_ID_PBM       , "pbm"},
@@ -69,6 +71,7 @@ static const IdStrMap img_tags[] = {
     { CODEC_ID_SUNRAST   , "im8"},
     { CODEC_ID_SUNRAST   , "im24"},
     { CODEC_ID_SUNRAST   , "sunras"},
+    { CODEC_ID_JPEG2000  , "jp2"},
     { CODEC_ID_NONE      , NULL}
 };
 
@@ -303,7 +306,7 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
     }
 }
 
-#if defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER)
+#if CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER
 /******************************************************/
 /* image output */
 
@@ -357,6 +360,29 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
         url_fclose(pb[1]);
         url_fclose(pb[2]);
     }else{
+        if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){
+            AVStream *st = s->streams[0];
+            if(st->codec->extradata_size > 8 &&
+               AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){
+                if(pkt->size < 8 || AV_RL32(pkt->data+4) != MKTAG('j','p','2','c'))
+                    goto error;
+                put_be32(pb[0], 12);
+                put_tag (pb[0], "jP  ");
+                put_be32(pb[0], 0x0D0A870A); // signature
+                put_be32(pb[0], 20);
+                put_tag (pb[0], "ftyp");
+                put_tag (pb[0], "jp2 ");
+                put_be32(pb[0], 0);
+                put_tag (pb[0], "jp2 ");
+                put_buffer(pb[0], st->codec->extradata, st->codec->extradata_size);
+            }else if(pkt->size < 8 ||
+                     (!st->codec->extradata_size &&
+                      AV_RL32(pkt->data+4) != MKTAG('j','P',' ',' '))){ // signature
+            error:
+                av_log(s, AV_LOG_ERROR, "malformated jpeg2000 codestream\n");
+                return -1;
+            }
+        }
         put_buffer(pb[0], pkt->data, pkt->size);
     }
     put_flush_packet(pb[0]);
@@ -368,10 +394,10 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
     return 0;
 }
 
-#endif /* defined(CONFIG_IMAGE2_MUXER) || defined(CONFIG_IMAGE2PIPE_MUXER) */
+#endif /* CONFIG_IMAGE2_MUXER || CONFIG_IMAGE2PIPE_MUXER */
 
 /* input */
-#ifdef CONFIG_IMAGE2_DEMUXER
+#if CONFIG_IMAGE2_DEMUXER
 AVInputFormat image2_demuxer = {
     "image2",
     NULL_IF_CONFIG_SMALL("image2 sequence"),
@@ -385,7 +411,7 @@ AVInputFormat image2_demuxer = {
     AVFMT_NOFILE,
 };
 #endif
-#ifdef CONFIG_IMAGE2PIPE_DEMUXER
+#if CONFIG_IMAGE2PIPE_DEMUXER
 AVInputFormat image2pipe_demuxer = {
     "image2pipe",
     NULL_IF_CONFIG_SMALL("piped image2 sequence"),
@@ -397,12 +423,12 @@ AVInputFormat image2pipe_demuxer = {
 #endif
 
 /* output */
-#ifdef CONFIG_IMAGE2_MUXER
+#if CONFIG_IMAGE2_MUXER
 AVOutputFormat image2_muxer = {
     "image2",
     NULL_IF_CONFIG_SMALL("image2 sequence"),
     "",
-    "bmp,jpeg,jpg,ljpg,pam,pbm,pgm,pgmyuv,png,ppm,sgi,tif,tiff",
+    "bmp,jpeg,jpg,ljpg,pam,pbm,pgm,pgmyuv,png,ppm,sgi,tif,tiff,jp2",
     sizeof(VideoData),
     CODEC_ID_NONE,
     CODEC_ID_MJPEG,
@@ -412,7 +438,7 @@ AVOutputFormat image2_muxer = {
     .flags= AVFMT_NOTIMESTAMPS | AVFMT_NOFILE
 };
 #endif
-#ifdef CONFIG_IMAGE2PIPE_MUXER
+#if CONFIG_IMAGE2PIPE_MUXER
 AVOutputFormat image2pipe_muxer = {
     "image2pipe",
     NULL_IF_CONFIG_SMALL("piped image2 sequence"),