RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

skip invalid audio samples in gxf packets 

Originally committed as revision 15408 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-09-24 23:31:04 +00:00
parent 60c9b24df0
commit 99f296b304
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/gxf.c
View File

@ -415,8 +415,9 @@ static int gxf_packet(AVFormatContext *s, AVPacket *pkt) {
pkt_type_t pkt_type; pkt_type_t pkt_type;
int pkt_len; int pkt_len;
while (!url_feof(pb)) { while (!url_feof(pb)) {
AVStream *st;
int track_type, track_id, ret; int track_type, track_id, ret;
int field_nr; int field_nr, field_info, skip = 0;
int stream_index; int stream_index;
if (!parse_packet_header(pb, &pkt_type, &pkt_len)) { if (!parse_packet_header(pb, &pkt_type, &pkt_len)) {
if (!url_feof(pb)) if (!url_feof(pb))
@ -441,15 +442,27 @@ static int gxf_packet(AVFormatContext *s, AVPacket *pkt) {
stream_index = get_sindex(s, track_id, track_type); stream_index = get_sindex(s, track_id, track_type);
if (stream_index < 0) if (stream_index < 0)
return stream_index; return stream_index;
st = s->streams[stream_index];
field_nr = get_be32(pb); field_nr = get_be32(pb);
get_be32(pb); // field information field_info = get_be32(pb);
get_be32(pb); // "timeline" field number get_be32(pb); // "timeline" field number
get_byte(pb); // flags get_byte(pb); // flags
get_byte(pb); // reserved get_byte(pb); // reserved
// NOTE: there is also data length information in the if (st->codec->codec_id == CODEC_ID_PCM_S24LE ||
// field information, it might be better to take this into account st->codec->codec_id == CODEC_ID_PCM_S16LE) {
// as well. int first = field_info >> 16;
int last = field_info & 0xffff; // last is exclusive
int bps = av_get_bits_per_sample(st->codec->codec_id)>>3;
if (first <= last && last*bps <= pkt_len) {
url_fskip(pb, first*bps);
skip = pkt_len - last*bps;
pkt_len = (last-first)*bps;
} else
av_log(s, AV_LOG_ERROR, "invalid first and last sample values\n");
}
ret = av_get_packet(pb, pkt, pkt_len); ret = av_get_packet(pb, pkt, pkt_len);
if (skip)
url_fskip(pb, skip);
pkt->stream_index = stream_index; pkt->stream_index = stream_index;
pkt->dts = field_nr; pkt->dts = field_nr;
return ret; return ret;