* Based on http://wiki.multimedia.cx/index.php?title=Smacker
*/
+#include <inttypes.h>
+
#include "libavutil/bswap.h"
#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
smk->pad = avio_rl32(pb);
/* setup data */
if(smk->frames > 0xFFFFFF) {
- av_log(s, AV_LOG_ERROR, "Too many frames: %i\n", smk->frames);
+ av_log(s, AV_LOG_ERROR, "Too many frames: %"PRIu32"\n", smk->frames);
return -1;
}
smk->frm_size = av_malloc(smk->frames * 4);
if (!st)
return -1;
smk->videoindex = st->index;
- st->codec->width = smk->width;
- st->codec->height = smk->height;
- st->codec->pix_fmt = AV_PIX_FMT_PAL8;
- st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
- st->codec->codec_id = AV_CODEC_ID_SMACKVIDEO;
- st->codec->codec_tag = smk->magic;
+ st->codecpar->width = smk->width;
+ st->codecpar->height = smk->height;
+ st->codecpar->format = AV_PIX_FMT_PAL8;
+ st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+ st->codecpar->codec_id = AV_CODEC_ID_SMACKVIDEO;
+ st->codecpar->codec_tag = smk->magic;
/* Smacker uses 100000 as internal timebase */
if(smk->pts_inc < 0)
smk->pts_inc = -smk->pts_inc;
if (smk->rates[i]) {
ast[i] = avformat_new_stream(s, NULL);
smk->indexes[i] = ast[i]->index;
- ast[i]->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+ ast[i]->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
if (smk->aflags[i] & SMK_AUD_BINKAUD) {
- ast[i]->codec->codec_id = AV_CODEC_ID_BINKAUDIO_RDFT;
+ ast[i]->codecpar->codec_id = AV_CODEC_ID_BINKAUDIO_RDFT;
} else if (smk->aflags[i] & SMK_AUD_USEDCT) {
- ast[i]->codec->codec_id = AV_CODEC_ID_BINKAUDIO_DCT;
+ ast[i]->codecpar->codec_id = AV_CODEC_ID_BINKAUDIO_DCT;
} else if (smk->aflags[i] & SMK_AUD_PACKED){
- ast[i]->codec->codec_id = AV_CODEC_ID_SMACKAUDIO;
- ast[i]->codec->codec_tag = MKTAG('S', 'M', 'K', 'A');
+ ast[i]->codecpar->codec_id = AV_CODEC_ID_SMACKAUDIO;
+ ast[i]->codecpar->codec_tag = MKTAG('S', 'M', 'K', 'A');
} else {
- ast[i]->codec->codec_id = AV_CODEC_ID_PCM_U8;
+ ast[i]->codecpar->codec_id = AV_CODEC_ID_PCM_U8;
}
if (smk->aflags[i] & SMK_AUD_STEREO) {
- ast[i]->codec->channels = 2;
- ast[i]->codec->channel_layout = AV_CH_LAYOUT_STEREO;
+ ast[i]->codecpar->channels = 2;
+ ast[i]->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
} else {
- ast[i]->codec->channels = 1;
- ast[i]->codec->channel_layout = AV_CH_LAYOUT_MONO;
+ ast[i]->codecpar->channels = 1;
+ ast[i]->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
}
- ast[i]->codec->sample_rate = smk->rates[i];
- ast[i]->codec->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8;
- if(ast[i]->codec->bits_per_coded_sample == 16 && ast[i]->codec->codec_id == AV_CODEC_ID_PCM_U8)
- ast[i]->codec->codec_id = AV_CODEC_ID_PCM_S16LE;
- avpriv_set_pts_info(ast[i], 64, 1, ast[i]->codec->sample_rate
- * ast[i]->codec->channels * ast[i]->codec->bits_per_coded_sample / 8);
+ ast[i]->codecpar->sample_rate = smk->rates[i];
+ ast[i]->codecpar->bits_per_coded_sample = (smk->aflags[i] & SMK_AUD_16BITS) ? 16 : 8;
+ if(ast[i]->codecpar->bits_per_coded_sample == 16 && ast[i]->codecpar->codec_id == AV_CODEC_ID_PCM_U8)
+ ast[i]->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE;
+ avpriv_set_pts_info(ast[i], 64, 1, ast[i]->codecpar->sample_rate
+ * ast[i]->codecpar->channels * ast[i]->codecpar->bits_per_coded_sample / 8);
}
}
/* load trees to extradata, they will be unpacked by decoder */
- st->codec->extradata = av_mallocz(smk->treesize + 16 +
- FF_INPUT_BUFFER_PADDING_SIZE);
- st->codec->extradata_size = smk->treesize + 16;
- if(!st->codec->extradata){
- av_log(s, AV_LOG_ERROR, "Cannot allocate %i bytes of extradata\n", smk->treesize + 16);
+ st->codecpar->extradata = av_mallocz(smk->treesize + 16 +
+ AV_INPUT_BUFFER_PADDING_SIZE);
+ st->codecpar->extradata_size = smk->treesize + 16;
+ if (!st->codecpar->extradata) {
+ av_log(s, AV_LOG_ERROR,
+ "Cannot allocate %"PRIu32" bytes of extradata\n",
+ smk->treesize + 16);
av_free(smk->frm_size);
av_free(smk->frm_flags);
return -1;
}
- ret = avio_read(pb, st->codec->extradata + 16, st->codec->extradata_size - 16);
- if(ret != st->codec->extradata_size - 16){
+ ret = avio_read(pb, st->codecpar->extradata + 16, st->codecpar->extradata_size - 16);
+ if(ret != st->codecpar->extradata_size - 16){
av_free(smk->frm_size);
av_free(smk->frm_flags);
return AVERROR(EIO);
}
- ((int32_t*)st->codec->extradata)[0] = av_le2ne32(smk->mmap_size);
- ((int32_t*)st->codec->extradata)[1] = av_le2ne32(smk->mclr_size);
- ((int32_t*)st->codec->extradata)[2] = av_le2ne32(smk->full_size);
- ((int32_t*)st->codec->extradata)[3] = av_le2ne32(smk->type_size);
+ ((int32_t*)st->codecpar->extradata)[0] = av_le2ne32(smk->mmap_size);
+ ((int32_t*)st->codecpar->extradata)[1] = av_le2ne32(smk->mclr_size);
+ ((int32_t*)st->codecpar->extradata)[2] = av_le2ne32(smk->full_size);
+ ((int32_t*)st->codecpar->extradata)[3] = av_le2ne32(smk->type_size);
smk->curstream = -1;
smk->nextpos = avio_tell(pb);
for(i = 0; i < 7; i++) {
if(flags & 1) {
uint32_t size;
- uint8_t *tmpbuf;
+ int err;
size = avio_rl32(s->pb) - 4;
if (!size || size > frame_size) {
frame_size -= size;
frame_size -= 4;
smk->curstream++;
- tmpbuf = av_realloc(smk->bufs[smk->curstream], size);
- if (!tmpbuf)
- return AVERROR(ENOMEM);
- smk->bufs[smk->curstream] = tmpbuf;
+ if ((err = av_reallocp(&smk->bufs[smk->curstream], size)) < 0) {
+ smk->buf_sizes[smk->curstream] = 0;
+ return err;
+ }
smk->buf_sizes[smk->curstream] = size;
ret = avio_read(s->pb, smk->bufs[smk->curstream], size);
if(ret != size)
}
flags >>= 1;
}
- if (frame_size < 0)
+ if (frame_size < 0 || frame_size >= INT_MAX/2)
return AVERROR_INVALIDDATA;
if (av_new_packet(pkt, frame_size + 769))
return AVERROR(ENOMEM);
smk->cur_frame++;
smk->nextpos = avio_tell(s->pb);
} else {
+ if (smk->stream_id[smk->curstream] < 0)
+ return AVERROR_INVALIDDATA;
if (av_new_packet(pkt, smk->buf_sizes[smk->curstream]))
return AVERROR(ENOMEM);
memcpy(pkt->data, smk->bufs[smk->curstream], smk->buf_sizes[smk->curstream]);
projects / ffmpeg / blobdiff