virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

add jp2 formater in image2 muxer

Browse Source 
Originally committed as revision 16664 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-01-18 01:48:14 +00:00
parent aa91562501
commit b4097b13d4
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavformat/img2.c
View File

@ -360,6 +360,29 @@ static int img_write_packet(AVFormatContext *s, AVPacket *pkt)
url_fclose(pb[1]); url_fclose(pb[1]);
url_fclose(pb[2]); url_fclose(pb[2]);
}else{ }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_buffer(pb[0], pkt->data, pkt->size);
} }
put_flush_packet(pb[0]); put_flush_packet(pb[0]);
@ -405,7 +428,7 @@ AVOutputFormat image2_muxer = {
"image2", "image2",
NULL_IF_CONFIG_SMALL("image2 sequence"), 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), sizeof(VideoData),
CODEC_ID_NONE, CODEC_ID_NONE,
CODEC_ID_MJPEG, CODEC_ID_MJPEG,