forked from FFmpeg/FFmpeg
cosmetics: indentation fix
patch by Marco Gerards, mgerards xs4all nl Originally committed as revision 8680 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Marco Gerards
Diego Biurrun
parent
ac5565d88c
commit
90f2a1a03c
2 changed files with 87 additions and 91 deletions
|
|
@ -1317,7 +1317,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case CODEC_ID_ADPCM_THP:
|
case CODEC_ID_ADPCM_THP:
|
||||||
{
|
{
|
||||||
int table[2][16];
|
int table[2][16];
|
||||||
unsigned int samplecnt;
|
unsigned int samplecnt;
|
||||||
int prev[2][2];
|
int prev[2][2];
|
||||||
|
|
@ -1375,7 +1375,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
|
||||||
increased exactly one time too often. */
|
increased exactly one time too often. */
|
||||||
samples -= st;
|
samples -= st;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
||||||
|
|
@ -56,87 +56,85 @@ static int thp_probe(AVProbeData *p)
|
||||||
static int thp_read_header(AVFormatContext *s,
|
static int thp_read_header(AVFormatContext *s,
|
||||||
AVFormatParameters *ap)
|
AVFormatParameters *ap)
|
||||||
{
|
{
|
||||||
ThpDemuxContext *thp = s->priv_data;
|
ThpDemuxContext *thp = s->priv_data;
|
||||||
AVStream *st;
|
AVStream *st;
|
||||||
ByteIOContext *pb = &s->pb;
|
ByteIOContext *pb = &s->pb;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* Read the file header. */
|
/* Read the file header. */
|
||||||
|
get_be32(pb); /* Skip Magic. */
|
||||||
|
thp->version = get_be32(pb);
|
||||||
|
|
||||||
get_be32(pb); /* Skip Magic. */
|
get_be32(pb); /* Max buf size. */
|
||||||
thp->version = get_be32(pb);
|
get_be32(pb); /* Max samples. */
|
||||||
|
|
||||||
get_be32(pb); /* Max buf size. */
|
thp->fps = av_d2q(av_int2flt(get_be32(pb)), INT_MAX);
|
||||||
get_be32(pb); /* Max samples. */
|
thp->framecnt = get_be32(pb);
|
||||||
|
thp->first_framesz = get_be32(pb);
|
||||||
|
get_be32(pb); /* Data size. */
|
||||||
|
|
||||||
thp->fps = av_d2q(av_int2flt(get_be32(pb)), INT_MAX);
|
thp->compoff = get_be32(pb);
|
||||||
thp->framecnt = get_be32(pb);
|
get_be32(pb); /* offsetDataOffset. */
|
||||||
thp->first_framesz = get_be32(pb);
|
thp->first_frame = get_be32(pb);
|
||||||
get_be32(pb); /* Data size. */
|
thp->last_frame = get_be32(pb);
|
||||||
|
|
||||||
thp->compoff = get_be32(pb);
|
thp->next_framesz = thp->first_framesz;
|
||||||
get_be32(pb); /* offsetDataOffset. */
|
thp->next_frame = thp->first_frame;
|
||||||
thp->first_frame = get_be32(pb);
|
|
||||||
thp->last_frame = get_be32(pb);
|
|
||||||
|
|
||||||
thp->next_framesz = thp->first_framesz;
|
/* Read the component structure. */
|
||||||
thp->next_frame = thp->first_frame;
|
url_fseek (pb, thp->compoff, SEEK_SET);
|
||||||
|
thp->compcount = get_be32(pb);
|
||||||
|
|
||||||
/* Read the component structure. */
|
/* Read the list of component types. */
|
||||||
url_fseek (pb, thp->compoff, SEEK_SET);
|
get_buffer(pb, thp->components, 16);
|
||||||
thp->compcount = get_be32(pb);
|
|
||||||
|
|
||||||
/* Read the list of component types. */
|
for (i = 0; i < thp->compcount; i++) {
|
||||||
get_buffer(pb, thp->components, 16);
|
if (thp->components[i] == 0) {
|
||||||
|
if (thp->vst != 0)
|
||||||
|
break;
|
||||||
|
|
||||||
for (i = 0; i < thp->compcount; i++) {
|
/* Video component. */
|
||||||
if (thp->components[i] == 0) {
|
st = av_new_stream(s, 0);
|
||||||
if (thp->vst != 0)
|
if (!st)
|
||||||
break;
|
return AVERROR_NOMEM;
|
||||||
|
|
||||||
/* Video component. */
|
/* The denominator and numerator are switched because 1/fps
|
||||||
st = av_new_stream(s, 0);
|
is required. */
|
||||||
if (!st)
|
av_set_pts_info(st, 64, thp->fps.den, thp->fps.num);
|
||||||
return AVERROR_NOMEM;
|
st->codec->codec_type = CODEC_TYPE_VIDEO;
|
||||||
|
st->codec->codec_id = CODEC_ID_THP;
|
||||||
|
st->codec->codec_tag = 0; /* no fourcc */
|
||||||
|
st->codec->width = get_be32(pb);
|
||||||
|
st->codec->height = get_be32(pb);
|
||||||
|
st->codec->sample_rate = av_q2d(thp->fps);
|
||||||
|
thp->vst = st;
|
||||||
|
thp->video_stream_index = st->index;
|
||||||
|
|
||||||
/* The denominator and numerator are switched because 1/fps
|
if (thp->version == 0x11000)
|
||||||
is required. */
|
get_be32(pb); /* Unknown. */
|
||||||
av_set_pts_info(st, 64, thp->fps.den, thp->fps.num);
|
} else if (thp->components[i] == 1) {
|
||||||
st->codec->codec_type = CODEC_TYPE_VIDEO;
|
if (thp->has_audio != 0)
|
||||||
st->codec->codec_id = CODEC_ID_THP;
|
break;
|
||||||
st->codec->codec_tag = 0; /* no fourcc */
|
|
||||||
st->codec->width = get_be32(pb);
|
|
||||||
st->codec->height = get_be32(pb);
|
|
||||||
st->codec->sample_rate = av_q2d(thp->fps);
|
|
||||||
thp->vst = st;
|
|
||||||
thp->video_stream_index = st->index;
|
|
||||||
|
|
||||||
if (thp->version == 0x11000)
|
/* Audio component. */
|
||||||
get_be32(pb); /* Unknown. */
|
st = av_new_stream(s, 0);
|
||||||
|
if (!st)
|
||||||
|
return AVERROR_NOMEM;
|
||||||
|
|
||||||
|
st->codec->codec_type = CODEC_TYPE_AUDIO;
|
||||||
|
st->codec->codec_id = CODEC_ID_ADPCM_THP;
|
||||||
|
st->codec->codec_tag = 0; /* no fourcc */
|
||||||
|
st->codec->channels = get_be32(pb); /* numChannels. */
|
||||||
|
st->codec->sample_rate = get_be32(pb); /* Frequency. */
|
||||||
|
|
||||||
|
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
|
||||||
|
|
||||||
|
thp->audio_stream_index = st->index;
|
||||||
|
thp->has_audio = 1;
|
||||||
}
|
}
|
||||||
else if (thp->components[i] == 1) {
|
|
||||||
if (thp->has_audio != 0)
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* Audio component. */
|
|
||||||
st = av_new_stream(s, 0);
|
|
||||||
if (!st)
|
|
||||||
return AVERROR_NOMEM;
|
|
||||||
|
|
||||||
st->codec->codec_type = CODEC_TYPE_AUDIO;
|
|
||||||
st->codec->codec_id = CODEC_ID_ADPCM_THP;
|
|
||||||
st->codec->codec_tag = 0; /* no fourcc */
|
|
||||||
st->codec->channels = get_be32(pb); /* numChannels. */
|
|
||||||
st->codec->sample_rate = get_be32(pb); /* Frequency. */
|
|
||||||
|
|
||||||
av_set_pts_info(st, 64, 1, st->codec->sample_rate);
|
|
||||||
|
|
||||||
thp->audio_stream_index = st->index;
|
|
||||||
thp->has_audio = 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int thp_read_packet(AVFormatContext *s,
|
static int thp_read_packet(AVFormatContext *s,
|
||||||
|
|
@ -148,36 +146,34 @@ static int thp_read_packet(AVFormatContext *s,
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (thp->audiosize == 0) {
|
if (thp->audiosize == 0) {
|
||||||
|
/* Terminate when last frame is reached. */
|
||||||
|
if (thp->frame >= thp->framecnt)
|
||||||
|
return AVERROR_IO;
|
||||||
|
|
||||||
/* Terminate when last frame is reached. */
|
url_fseek(pb, thp->next_frame, SEEK_SET);
|
||||||
if (thp->frame >= thp->framecnt)
|
|
||||||
return AVERROR_IO;
|
|
||||||
|
|
||||||
url_fseek(pb, thp->next_frame, SEEK_SET);
|
/* Locate the next frame and read out its size. */
|
||||||
|
thp->next_frame += thp->next_framesz;
|
||||||
/* Locate the next frame and read out its size. */
|
thp->next_framesz = get_be32(pb);
|
||||||
thp->next_frame += thp->next_framesz;
|
|
||||||
thp->next_framesz = get_be32(pb);
|
|
||||||
|
|
||||||
get_be32(pb); /* Previous total size. */
|
get_be32(pb); /* Previous total size. */
|
||||||
size = get_be32(pb); /* Total size of this frame. */
|
size = get_be32(pb); /* Total size of this frame. */
|
||||||
|
|
||||||
/* Store the audiosize so the next time this function is called,
|
/* Store the audiosize so the next time this function is called,
|
||||||
the audio can be read. */
|
the audio can be read. */
|
||||||
if (thp->has_audio)
|
if (thp->has_audio)
|
||||||
thp->audiosize = get_be32(pb); /* Audio size. */
|
thp->audiosize = get_be32(pb); /* Audio size. */
|
||||||
else
|
else
|
||||||
thp->frame++;
|
thp->frame++;
|
||||||
|
|
||||||
ret = av_get_packet(pb, pkt, size);
|
ret = av_get_packet(pb, pkt, size);
|
||||||
if (ret != size) {
|
if (ret != size) {
|
||||||
av_free_packet(pkt);
|
av_free_packet(pkt);
|
||||||
return AVERROR_IO;
|
return AVERROR_IO;
|
||||||
}
|
}
|
||||||
|
|
||||||
pkt->stream_index = thp->video_stream_index;
|
pkt->stream_index = thp->video_stream_index;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
ret = av_get_packet(pb, pkt, thp->audiosize);
|
ret = av_get_packet(pb, pkt, thp->audiosize);
|
||||||
if (ret != thp->audiosize) {
|
if (ret != thp->audiosize) {
|
||||||
av_free_packet(pkt);
|
av_free_packet(pkt);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue