courtesy of Konstantin Shishkov Originally committed as revision 3529 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -1,6 +1,8 @@ | |||
version <next> | |||
- TechSmith Camtasia (TSCC) video decoder | |||
- IBM Ultimotion (ULTI) video decoder | |||
- Sierra Online audio file demuxer and decoder | |||
- Apple QuickDraw (qdrw) video decoder | |||
version 0.4.9-pre1: | |||
@@ -676,6 +676,8 @@ library: | |||
@tab .fli/.flc files | |||
@item Sierra VMD @tab @tab X | |||
@tab used in Sierra CD-ROM games | |||
@item Sierra Online @tab @tab X | |||
@tab .sol files used in Sierra Online games | |||
@item Matroska @tab @tab X | |||
@end multitable | |||
@@ -742,6 +744,7 @@ following image formats are supported: | |||
@item Apple Animation @tab @tab X @tab fourcc: 'rle ' | |||
@item Apple Graphics @tab @tab X @tab fourcc: 'smc ' | |||
@item Apple Video @tab @tab X @tab fourcc: rpza | |||
@item Apple QuickDraw @tab @tab X @tab fourcc: qdrw | |||
@item Cinepak @tab @tab X | |||
@item Microsoft RLE @tab @tab X | |||
@item Microsoft Video-1 @tab @tab X | |||
@@ -812,6 +815,8 @@ solutions. | |||
@tab used in various Interplay computer games | |||
@item Xan DPCM @tab @tab X | |||
@tab used in Origin's Wing Commander IV AVI files | |||
@item Sierra Online DPCM @tab @tab X | |||
@tab used in Sierra Online game audio files | |||
@item Apple MACE 3 @tab @tab X | |||
@item Apple MACE 6 @tab @tab X | |||
@item FLAC @tab @tab X | |||
@@ -20,7 +20,8 @@ OBJS= common.o utils.o mem.o allcodecs.o \ | |||
roqvideo.o dpcm.o interplayvideo.o xan.o rpza.o cinepak.o msrle.o \ | |||
msvideo1.o vqavideo.o idcinvideo.o adx.o rational.o faandct.o 8bps.o \ | |||
smc.o parser.o flicvideo.o truemotion1.o vmdav.o lcl.o qtrle.o g726.o \ | |||
flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o | |||
flac.o vp3dsp.o integer.o snow.o tscc.o sonic.o ulti.o h264idct.o \ | |||
qdrw.o | |||
ifeq ($(AMR_NB),yes) | |||
ifeq ($(AMR_NB_FIXED),yes) | |||
@@ -108,6 +108,7 @@ void avcodec_register_all(void) | |||
register_avcodec(&indeo3_decoder); | |||
register_avcodec(&tscc_decoder); | |||
register_avcodec(&ulti_decoder); | |||
register_avcodec(&qdraw_decoder); | |||
#ifdef CONFIG_FAAD | |||
register_avcodec(&aac_decoder); | |||
register_avcodec(&mpeg4aac_decoder); | |||
@@ -169,6 +170,7 @@ void avcodec_register_all(void) | |||
register_avcodec(&roq_dpcm_decoder); | |||
register_avcodec(&interplay_dpcm_decoder); | |||
register_avcodec(&xan_dpcm_decoder); | |||
register_avcodec(&sol_dpcm_decoder); | |||
register_avcodec(&qtrle_decoder); | |||
register_avcodec(&flac_decoder); | |||
#endif /* CONFIG_DECODERS */ | |||
@@ -103,6 +103,7 @@ enum CodecID { | |||
CODEC_ID_SNOW, | |||
CODEC_ID_TSCC, | |||
CODEC_ID_ULTI, | |||
CODEC_ID_QDRAW, | |||
/* various pcm "codecs" */ | |||
CODEC_ID_PCM_S16LE, | |||
@@ -140,6 +141,7 @@ enum CodecID { | |||
CODEC_ID_ROQ_DPCM, | |||
CODEC_ID_INTERPLAY_DPCM, | |||
CODEC_ID_XAN_DPCM, | |||
CODEC_ID_SOL_DPCM, | |||
CODEC_ID_FLAC, | |||
@@ -1878,11 +1880,13 @@ extern AVCodec ra_288_decoder; | |||
extern AVCodec roq_dpcm_decoder; | |||
extern AVCodec interplay_dpcm_decoder; | |||
extern AVCodec xan_dpcm_decoder; | |||
extern AVCodec sol_dpcm_decoder; | |||
extern AVCodec sonic_decoder; | |||
extern AVCodec qtrle_decoder; | |||
extern AVCodec flac_decoder; | |||
extern AVCodec tscc_decoder; | |||
extern AVCodec ulti_decoder; | |||
extern AVCodec qdraw_decoder; | |||
/* pcm codecs */ | |||
#define PCM_CODEC(id, name) \ | |||
@@ -24,6 +24,7 @@ | |||
* Xan DPCM decoder by Mario Brito (mbrito@student.dei.uc.pt) | |||
* for more information on the specific data formats, visit: | |||
* http://www.pcisys.net/~melanson/codecs/simpleaudio.html | |||
* SOL DPCMs implemented by Konstantin Shishkov | |||
* | |||
* Note about using the Xan DPCM decoder: Xan DPCM is used in AVI files | |||
* found in the Wing Commander IV computer game. These AVI files contain | |||
@@ -39,6 +40,8 @@ | |||
typedef struct DPCMContext { | |||
int channels; | |||
short roq_square_array[256]; | |||
long sample[2];//for SOL_DPCM | |||
int *sol_table;//for SOL_DPCM | |||
} DPCMContext; | |||
#define SATURATE_S16(x) if (x < -32768) x = -32768; \ | |||
@@ -81,6 +84,32 @@ static int interplay_delta_table[] = { | |||
}; | |||
static int sol_table_old[16] = | |||
{ 0x0, 0x1, 0x2 , 0x3, 0x6, 0xA, 0xF, 0x15, | |||
-0x15, -0xF, -0xA, -0x6, -0x3, -0x2, -0x1, 0x0}; | |||
static int sol_table_new[16] = | |||
{ 0x0, 0x1, 0x2, 0x3, 0x6, 0xA, 0xF, 0x15, | |||
0x0, -0x1, -0x2, -0x3, -0x6, -0xA, -0xF, -0x15}; | |||
static int sol_table_16[128] = { | |||
0x000, 0x008, 0x010, 0x020, 0x030, 0x040, 0x050, 0x060, 0x070, 0x080, | |||
0x090, 0x0A0, 0x0B0, 0x0C0, 0x0D0, 0x0E0, 0x0F0, 0x100, 0x110, 0x120, | |||
0x130, 0x140, 0x150, 0x160, 0x170, 0x180, 0x190, 0x1A0, 0x1B0, 0x1C0, | |||
0x1D0, 0x1E0, 0x1F0, 0x200, 0x208, 0x210, 0x218, 0x220, 0x228, 0x230, | |||
0x238, 0x240, 0x248, 0x250, 0x258, 0x260, 0x268, 0x270, 0x278, 0x280, | |||
0x288, 0x290, 0x298, 0x2A0, 0x2A8, 0x2B0, 0x2B8, 0x2C0, 0x2C8, 0x2D0, | |||
0x2D8, 0x2E0, 0x2E8, 0x2F0, 0x2F8, 0x300, 0x308, 0x310, 0x318, 0x320, | |||
0x328, 0x330, 0x338, 0x340, 0x348, 0x350, 0x358, 0x360, 0x368, 0x370, | |||
0x378, 0x380, 0x388, 0x390, 0x398, 0x3A0, 0x3A8, 0x3B0, 0x3B8, 0x3C0, | |||
0x3C8, 0x3D0, 0x3D8, 0x3E0, 0x3E8, 0x3F0, 0x3F8, 0x400, 0x440, 0x480, | |||
0x4C0, 0x500, 0x540, 0x580, 0x5C0, 0x600, 0x640, 0x680, 0x6C0, 0x700, | |||
0x740, 0x780, 0x7C0, 0x800, 0x900, 0xA00, 0xB00, 0xC00, 0xD00, 0xE00, | |||
0xF00, 0x1000, 0x1400, 0x1800, 0x1C00, 0x2000, 0x3000, 0x4000 | |||
}; | |||
static int dpcm_decode_init(AVCodecContext *avctx) | |||
{ | |||
DPCMContext *s = avctx->priv_data; | |||
@@ -88,6 +117,7 @@ static int dpcm_decode_init(AVCodecContext *avctx) | |||
short square; | |||
s->channels = avctx->channels; | |||
s->sample[0] = s->sample[1] = 0; | |||
switch(avctx->codec->id) { | |||
@@ -100,6 +130,26 @@ static int dpcm_decode_init(AVCodecContext *avctx) | |||
} | |||
break; | |||
case CODEC_ID_SOL_DPCM: | |||
switch(avctx->codec_tag){ | |||
case 1: | |||
s->sol_table=sol_table_old; | |||
s->sample[0] = s->sample[1] = 0x80; | |||
break; | |||
case 2: | |||
s->sol_table=sol_table_new; | |||
s->sample[0] = s->sample[1] = 0x80; | |||
break; | |||
case 3: | |||
s->sol_table=sol_table_16; | |||
break; | |||
default: | |||
av_log(avctx, AV_LOG_ERROR, "Unknown SOL subcodec\n"); | |||
return -1; | |||
} | |||
break; | |||
default: | |||
break; | |||
} | |||
@@ -203,6 +253,35 @@ static int dpcm_decode_frame(AVCodecContext *avctx, | |||
channel_number ^= s->channels - 1; | |||
} | |||
break; | |||
case CODEC_ID_SOL_DPCM: | |||
in = 0; | |||
if (avctx->codec_tag != 3) { | |||
while (in < buf_size) { | |||
int n1, n2; | |||
n1 = (buf[in] >> 4) & 0xF; | |||
n2 = buf[in++] & 0xF; | |||
s->sample[0] += s->sol_table[n1]; | |||
if (s->sample[0] < 0) s->sample[0] = 0; | |||
if (s->sample[0] > 255) s->sample[0] = 255; | |||
output_samples[out++] = (s->sample[0] - 128) << 8; | |||
s->sample[s->channels - 1] += s->sol_table[n2]; | |||
if (s->sample[s->channels - 1] < 0) s->sample[s->channels - 1] = 0; | |||
if (s->sample[s->channels - 1] > 255) s->sample[s->channels - 1] = 255; | |||
output_samples[out++] = (s->sample[s->channels - 1] - 128) << 8; | |||
} | |||
} else { | |||
while (in < buf_size) { | |||
int n; | |||
n = buf[in++]; | |||
if (n & 0x80) s->sample[channel_number] -= s->sol_table[n & 0x7F]; | |||
else s->sample[channel_number] += s->sol_table[n & 0x7F]; | |||
SATURATE_S16(s->sample[channel_number]); | |||
output_samples[out++] = s->sample[channel_number]; | |||
/* toggle channel */ | |||
channel_number ^= s->channels - 1; | |||
} | |||
} | |||
break; | |||
} | |||
*data_size = out * sizeof(short); | |||
@@ -241,3 +320,14 @@ AVCodec xan_dpcm_decoder = { | |||
NULL, | |||
dpcm_decode_frame, | |||
}; | |||
AVCodec sol_dpcm_decoder = { | |||
"sol_dpcm", | |||
CODEC_TYPE_AUDIO, | |||
CODEC_ID_SOL_DPCM, | |||
sizeof(DPCMContext), | |||
dpcm_decode_init, | |||
NULL, | |||
NULL, | |||
dpcm_decode_frame, | |||
}; |
@@ -0,0 +1,153 @@ | |||
/* | |||
* QuickDraw (qdrw) codec | |||
* Copyright (c) 2004 Konstantin Shishkov | |||
* | |||
* This library is free software; you can redistribute it and/or | |||
* modify it under the terms of the GNU Lesser General Public | |||
* License as published by the Free Software Foundation; either | |||
* version 2 of the License, or (at your option) any later version. | |||
* | |||
* This library is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* Lesser General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Lesser General Public | |||
* License along with this library; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
* | |||
*/ | |||
/** | |||
* @file qdrw.c | |||
* Apple QuickDraw codec. | |||
*/ | |||
#include "avcodec.h" | |||
#include "mpegvideo.h" | |||
typedef struct QdrawContext{ | |||
AVCodecContext *avctx; | |||
AVFrame pic; | |||
uint8_t palette[256*3]; | |||
} QdrawContext; | |||
static int decode_frame(AVCodecContext *avctx, | |||
void *data, int *data_size, | |||
uint8_t *buf, int buf_size) | |||
{ | |||
QdrawContext * const a = avctx->priv_data; | |||
AVFrame * const p= (AVFrame*)&a->pic; | |||
uint8_t* outdata; | |||
int colors; | |||
int i; | |||
/* special case for last picture */ | |||
if (buf_size == 0) { | |||
return 0; | |||
} | |||
if(p->data[0]) | |||
avctx->release_buffer(avctx, p); | |||
p->reference= 0; | |||
if(avctx->get_buffer(avctx, p) < 0){ | |||
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); | |||
return -1; | |||
} | |||
p->pict_type= I_TYPE; | |||
p->key_frame= 1; | |||
outdata = a->pic.data[0]; | |||
buf += 0x68; /* jump to palette */ | |||
colors = BE_32(buf); | |||
buf += 4; | |||
if(colors < 0 || colors > 256) { | |||
av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors); | |||
return -1; | |||
} | |||
for (i = 0; i <= colors; i++) { | |||
int idx; | |||
idx = BE_16(buf); /* color index */ | |||
buf += 2; | |||
a->palette[idx * 3 + 0] = *buf++; | |||
buf++; | |||
a->palette[idx * 3 + 1] = *buf++; | |||
buf++; | |||
a->palette[idx * 3 + 2] = *buf++; | |||
buf++; | |||
} | |||
if (colors) | |||
a->pic.palette_has_changed = 1; | |||
buf += 18; /* skip unneeded data */ | |||
for (i = 0; i < avctx->height; i++) { | |||
int size, left, code, pix; | |||
uint8_t *next; | |||
uint8_t *out; | |||
int tsize = 0; | |||
/* decode line */ | |||
out = outdata; | |||
size = BE_16(buf); /* size of packed line */ | |||
buf += 2; | |||
left = size; | |||
next = buf + size; | |||
while (left > 0) { | |||
code = *buf++; | |||
if (code & 0x80 ) { /* run */ | |||
int i; | |||
pix = *buf++; | |||
for (i = 0; i < 257 - code; i++) { | |||
*out++ = a->palette[pix * 3 + 0]; | |||
*out++ = a->palette[pix * 3 + 1]; | |||
*out++ = a->palette[pix * 3 + 2]; | |||
} | |||
tsize += 257 - code; | |||
left -= 2; | |||
} else { /* copy */ | |||
int i, pix; | |||
for (i = 0; i <= code; i++) { | |||
pix = *buf++; | |||
*out++ = a->palette[pix * 3 + 0]; | |||
*out++ = a->palette[pix * 3 + 1]; | |||
*out++ = a->palette[pix * 3 + 2]; | |||
} | |||
left -= 2 + code; | |||
tsize += code + 1; | |||
} | |||
} | |||
buf = next; | |||
outdata += a->pic.linesize[0]; | |||
} | |||
*data_size = sizeof(AVFrame); | |||
*(AVFrame*)data = a->pic; | |||
return buf_size; | |||
} | |||
static int decode_init(AVCodecContext *avctx){ | |||
// QdrawContext * const a = avctx->priv_data; | |||
avctx->pix_fmt= PIX_FMT_RGB24; | |||
return 0; | |||
} | |||
AVCodec qdraw_decoder = { | |||
"qdraw", | |||
CODEC_TYPE_VIDEO, | |||
CODEC_ID_QDRAW, | |||
sizeof(QdrawContext), | |||
decode_init, | |||
NULL, | |||
NULL, | |||
decode_frame, | |||
CODEC_CAP_DR1, | |||
}; |
@@ -16,7 +16,7 @@ OBJS+=mpeg.o mpegts.o mpegtsenc.o ffm.o crc.o img.o img2.o raw.o rm.o \ | |||
avienc.o avidec.o wav.o swf.o au.o gif.o mov.o mpjpeg.o dv.o \ | |||
yuv4mpeg.o 4xm.o flvenc.o flvdec.o movenc.o psxstr.o idroq.o ipmovie.o \ | |||
nut.o wc3movie.o mp3.o westwood.o segafilm.o idcin.o flic.o \ | |||
sierravmd.o matroska.o | |||
sierravmd.o matroska.o sol.o | |||
ifeq ($(CONFIG_RISKY),yes) | |||
OBJS+= asf.o | |||
@@ -98,6 +98,7 @@ void av_register_all(void) | |||
nut_init(); | |||
matroska_init(); | |||
sol_init(); | |||
#ifdef CONFIG_ENCODERS | |||
/* image formats */ | |||
@@ -487,6 +487,9 @@ int vmd_init(void); | |||
/* matroska.c */ | |||
int matroska_init(void); | |||
/* sol.c */ | |||
int sol_init(void); | |||
#include "rtp.h" | |||
#include "rtsp.h" | |||
@@ -115,6 +115,7 @@ static const CodecTag mov_video_tags[] = { | |||
{ CODEC_ID_8BPS, MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */ | |||
{ CODEC_ID_SMC, MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */ | |||
{ CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */ | |||
{ CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */ | |||
{ CODEC_ID_NONE, 0 }, | |||
}; | |||
@@ -0,0 +1,166 @@ | |||
/* | |||
* Sierra SOL decoder | |||
* Copyright Konstantin Shishkov. | |||
* | |||
* This library is free software; you can redistribute it and/or | |||
* modify it under the terms of the GNU Lesser General Public | |||
* License as published by the Free Software Foundation; either | |||
* version 2 of the License, or (at your option) any later version. | |||
* | |||
* This library is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
* Lesser General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Lesser General Public | |||
* License along with this library; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
*/ | |||
/* | |||
* Based on documents from Game Audio Player and own research | |||
*/ | |||
#include "avformat.h" | |||
#include "avi.h" | |||
#include "bswap.h" | |||
/* if we don't know the size in advance */ | |||
#define AU_UNKOWN_SIZE ((uint32_t)(~0)) | |||
static int sol_probe(AVProbeData *p) | |||
{ | |||
/* check file header */ | |||
uint16_t magic; | |||
if (p->buf_size <= 14) | |||
return 0; | |||
magic=le2me_16(*((uint16_t*)p->buf)); | |||
if ((magic == 0x0B8D || magic == 0x0C0D || magic == 0x0C8D) && | |||
p->buf[2] == 'S' && p->buf[3] == 'O' && | |||
p->buf[4] == 'L' && p->buf[5] == 0) | |||
return AVPROBE_SCORE_MAX; | |||
else | |||
return 0; | |||
} | |||
#define SOL_DPCM 1 | |||
#define SOL_16BIT 4 | |||
#define SOL_STEREO 16 | |||
static int sol_codec_id(int magic, int type) | |||
{ | |||
if (magic == 0x0B8D) | |||
{ | |||
if (type & SOL_DPCM) return CODEC_ID_SOL_DPCM; | |||
else return CODEC_ID_PCM_U8; | |||
} | |||
if (type & SOL_DPCM) | |||
{ | |||
if (type & SOL_16BIT) return CODEC_ID_SOL_DPCM; | |||
else if (magic == 0x0C8D) return CODEC_ID_SOL_DPCM; | |||
else return CODEC_ID_SOL_DPCM; | |||
} | |||
if (type & SOL_16BIT) return CODEC_ID_PCM_S16LE; | |||
return CODEC_ID_PCM_U8; | |||
} | |||
static int sol_codec_type(int magic, int type) | |||
{ | |||
if (magic == 0x0B8D) return 1;//SOL_DPCM_OLD; | |||
if (type & SOL_DPCM) | |||
{ | |||
if (type & SOL_16BIT) return 3;//SOL_DPCM_NEW16; | |||
else if (magic == 0x0C8D) return 1;//SOL_DPCM_OLD; | |||
else return 2;//SOL_DPCM_NEW8; | |||
} | |||
return -1; | |||
} | |||
static int sol_channels(int magic, int type) | |||
{ | |||
if (magic == 0x0B8D || !(type & SOL_STEREO)) return 1; | |||
return 2; | |||
} | |||
static int sol_read_header(AVFormatContext *s, | |||
AVFormatParameters *ap) | |||
{ | |||
int size; | |||
unsigned int magic,tag; | |||
ByteIOContext *pb = &s->pb; | |||
unsigned int id, codec, channels, rate, type; | |||
AVStream *st; | |||
/* check ".snd" header */ | |||
magic = get_le16(pb); | |||
tag = get_le32(pb); | |||
if (tag != MKTAG('S', 'O', 'L', 0)) | |||
return -1; | |||
rate = get_le16(pb); | |||
type = get_byte(pb); | |||
size = get_le32(pb); | |||
if (magic != 0x0B8D) | |||
get_byte(pb); /* newer SOLs contain padding byte */ | |||
codec = sol_codec_id(magic, type); | |||
channels = sol_channels(magic, type); | |||
if (codec == CODEC_ID_SOL_DPCM) | |||
id = sol_codec_type(magic, type); | |||
else id = 0; | |||
/* now we are ready: build format streams */ | |||
st = av_new_stream(s, 0); | |||
if (!st) | |||
return -1; | |||
st->codec.codec_type = CODEC_TYPE_AUDIO; | |||
st->codec.codec_tag = id; | |||
st->codec.codec_id = codec; | |||
st->codec.channels = channels; | |||
st->codec.sample_rate = rate; | |||
return 0; | |||
} | |||
#define MAX_SIZE 4096 | |||
static int sol_read_packet(AVFormatContext *s, | |||
AVPacket *pkt) | |||
{ | |||
int ret; | |||
if (url_feof(&s->pb)) | |||
return -EIO; | |||
if (av_new_packet(pkt, MAX_SIZE)) | |||
return -EIO; | |||
pkt->stream_index = 0; | |||
ret = get_buffer(&s->pb, pkt->data, pkt->size); | |||
if (ret < 0) | |||
av_free_packet(pkt); | |||
/* note: we need to modify the packet size here to handle the last | |||
packet */ | |||
pkt->size = ret; | |||
return 0; | |||
} | |||
static int sol_read_close(AVFormatContext *s) | |||
{ | |||
return 0; | |||
} | |||
static AVInputFormat sol_iformat = { | |||
"sol", | |||
"Sierra SOL Format", | |||
0, | |||
sol_probe, | |||
sol_read_header, | |||
sol_read_packet, | |||
sol_read_close, | |||
pcm_read_seek, | |||
}; | |||
int sol_init(void) | |||
{ | |||
av_register_input_format(&sol_iformat); | |||
return 0; | |||
} |