mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-28 12:32:17 +02:00
Split out the MDPR chunk reading into its own function.
Patch by Ronald S. Bultje: rsbultje gmail com Original thread:[FFmpeg-devel] [PATCH 1/6] rmdec.c: ff_rm_read_mdpr_codecdata() Date: 11/05/2007 09:21 PM Originally committed as revision 10934 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje
Benoit Fouet
parent
62b3415258
commit
ff1463dc37
@ -188,6 +188,75 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVStream *st,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st)
|
||||||
|
{
|
||||||
|
ByteIOContext *pb = &s->pb;
|
||||||
|
unsigned int v;
|
||||||
|
int codec_data_size, size, res = -1;
|
||||||
|
int64_t codec_pos;
|
||||||
|
|
||||||
|
codec_data_size = get_be32(pb);
|
||||||
|
codec_pos = url_ftell(pb);
|
||||||
|
v = get_be32(pb);
|
||||||
|
if (v == MKTAG(0xfd, 'a', 'r', '.')) {
|
||||||
|
/* ra type header */
|
||||||
|
if (rm_read_audio_stream_info(s, st, 0))
|
||||||
|
return -1;
|
||||||
|
} else {
|
||||||
|
int fps, fps2;
|
||||||
|
if (get_le32(pb) != MKTAG('V', 'I', 'D', 'O')) {
|
||||||
|
fail1:
|
||||||
|
av_log(st->codec, AV_LOG_ERROR, "Unsupported video codec\n");
|
||||||
|
goto skip;
|
||||||
|
}
|
||||||
|
st->codec->codec_tag = get_le32(pb);
|
||||||
|
// av_log(NULL, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
|
||||||
|
if ( st->codec->codec_tag != MKTAG('R', 'V', '1', '0')
|
||||||
|
&& st->codec->codec_tag != MKTAG('R', 'V', '2', '0')
|
||||||
|
&& st->codec->codec_tag != MKTAG('R', 'V', '3', '0')
|
||||||
|
&& st->codec->codec_tag != MKTAG('R', 'V', '4', '0'))
|
||||||
|
goto fail1;
|
||||||
|
st->codec->width = get_be16(pb);
|
||||||
|
st->codec->height = get_be16(pb);
|
||||||
|
st->codec->time_base.num= 1;
|
||||||
|
fps= get_be16(pb);
|
||||||
|
st->codec->codec_type = CODEC_TYPE_VIDEO;
|
||||||
|
get_be32(pb);
|
||||||
|
fps2= get_be16(pb);
|
||||||
|
get_be16(pb);
|
||||||
|
|
||||||
|
st->codec->extradata_size= codec_data_size - (url_ftell(pb) - codec_pos);
|
||||||
|
|
||||||
|
if(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){
|
||||||
|
//check is redundant as get_buffer() will catch this
|
||||||
|
av_log(s, AV_LOG_ERROR, "st->codec->extradata_size too large\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
|
||||||
|
get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
|
||||||
|
|
||||||
|
// av_log(NULL, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
|
||||||
|
st->codec->time_base.den = fps * st->codec->time_base.num;
|
||||||
|
switch(((uint8_t*)st->codec->extradata)[4]>>4){
|
||||||
|
case 1: st->codec->codec_id = CODEC_ID_RV10; break;
|
||||||
|
case 2: st->codec->codec_id = CODEC_ID_RV20; break;
|
||||||
|
case 3: st->codec->codec_id = CODEC_ID_RV30; break;
|
||||||
|
case 4: st->codec->codec_id = CODEC_ID_RV40; break;
|
||||||
|
default: goto fail1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
res = 0;
|
||||||
|
skip:
|
||||||
|
/* skip codec info */
|
||||||
|
size = url_ftell(pb) - codec_pos;
|
||||||
|
url_fskip(pb, codec_data_size - size);
|
||||||
|
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap)
|
static int rm_read_header_old(AVFormatContext *s, AVFormatParameters *ap)
|
||||||
{
|
{
|
||||||
RMContext *rm = s->priv_data;
|
RMContext *rm = s->priv_data;
|
||||||
@ -205,9 +274,8 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
|||||||
RMContext *rm = s->priv_data;
|
RMContext *rm = s->priv_data;
|
||||||
AVStream *st;
|
AVStream *st;
|
||||||
ByteIOContext *pb = &s->pb;
|
ByteIOContext *pb = &s->pb;
|
||||||
unsigned int tag, v;
|
unsigned int tag;
|
||||||
int tag_size, size, codec_data_size, i;
|
int tag_size, i;
|
||||||
int64_t codec_pos;
|
|
||||||
unsigned int start_time, duration;
|
unsigned int start_time, duration;
|
||||||
char buf[128];
|
char buf[128];
|
||||||
int flags = 0;
|
int flags = 0;
|
||||||
@ -279,63 +347,10 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap)
|
|||||||
st->duration = duration;
|
st->duration = duration;
|
||||||
get_str8(pb, buf, sizeof(buf)); /* desc */
|
get_str8(pb, buf, sizeof(buf)); /* desc */
|
||||||
get_str8(pb, buf, sizeof(buf)); /* mimetype */
|
get_str8(pb, buf, sizeof(buf)); /* mimetype */
|
||||||
codec_data_size = get_be32(pb);
|
|
||||||
codec_pos = url_ftell(pb);
|
|
||||||
st->codec->codec_type = CODEC_TYPE_DATA;
|
st->codec->codec_type = CODEC_TYPE_DATA;
|
||||||
av_set_pts_info(st, 64, 1, 1000);
|
av_set_pts_info(st, 64, 1, 1000);
|
||||||
|
if (ff_rm_read_mdpr_codecdata(s, st) < 0)
|
||||||
v = get_be32(pb);
|
return -1;
|
||||||
if (v == MKTAG(0xfd, 'a', 'r', '.')) {
|
|
||||||
/* ra type header */
|
|
||||||
if (rm_read_audio_stream_info(s, st, 0))
|
|
||||||
return -1;
|
|
||||||
} else {
|
|
||||||
int fps, fps2;
|
|
||||||
if (get_le32(pb) != MKTAG('V', 'I', 'D', 'O')) {
|
|
||||||
fail1:
|
|
||||||
av_log(st->codec, AV_LOG_ERROR, "Unsupported video codec\n");
|
|
||||||
goto skip;
|
|
||||||
}
|
|
||||||
st->codec->codec_tag = get_le32(pb);
|
|
||||||
// av_log(NULL, AV_LOG_DEBUG, "%X %X\n", st->codec->codec_tag, MKTAG('R', 'V', '2', '0'));
|
|
||||||
if ( st->codec->codec_tag != MKTAG('R', 'V', '1', '0')
|
|
||||||
&& st->codec->codec_tag != MKTAG('R', 'V', '2', '0')
|
|
||||||
&& st->codec->codec_tag != MKTAG('R', 'V', '3', '0')
|
|
||||||
&& st->codec->codec_tag != MKTAG('R', 'V', '4', '0'))
|
|
||||||
goto fail1;
|
|
||||||
st->codec->width = get_be16(pb);
|
|
||||||
st->codec->height = get_be16(pb);
|
|
||||||
st->codec->time_base.num= 1;
|
|
||||||
fps= get_be16(pb);
|
|
||||||
st->codec->codec_type = CODEC_TYPE_VIDEO;
|
|
||||||
get_be32(pb);
|
|
||||||
fps2= get_be16(pb);
|
|
||||||
get_be16(pb);
|
|
||||||
|
|
||||||
st->codec->extradata_size= codec_data_size - (url_ftell(pb) - codec_pos);
|
|
||||||
|
|
||||||
if(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){
|
|
||||||
//check is redundant as get_buffer() will catch this
|
|
||||||
av_log(s, AV_LOG_ERROR, "st->codec->extradata_size too large\n");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
st->codec->extradata= av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
|
|
||||||
get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
|
|
||||||
|
|
||||||
// av_log(NULL, AV_LOG_DEBUG, "fps= %d fps2= %d\n", fps, fps2);
|
|
||||||
st->codec->time_base.den = fps * st->codec->time_base.num;
|
|
||||||
switch(((uint8_t*)st->codec->extradata)[4]>>4){
|
|
||||||
case 1: st->codec->codec_id = CODEC_ID_RV10; break;
|
|
||||||
case 2: st->codec->codec_id = CODEC_ID_RV20; break;
|
|
||||||
case 3: st->codec->codec_id = CODEC_ID_RV30; break;
|
|
||||||
case 4: st->codec->codec_id = CODEC_ID_RV40; break;
|
|
||||||
default: goto fail1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
skip:
|
|
||||||
/* skip codec info */
|
|
||||||
size = url_ftell(pb) - codec_pos;
|
|
||||||
url_fskip(pb, codec_data_size - size);
|
|
||||||
break;
|
break;
|
||||||
case MKTAG('D', 'A', 'T', 'A'):
|
case MKTAG('D', 'A', 'T', 'A'):
|
||||||
goto header_end;
|
goto header_end;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user