Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

memleak fix

Browse source 
multiple stream seeking (yes i know seeking is still broken)
related cleanup

Originally committed as revision 2701 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-01-14 14:45:53 +00:00
parent 38376f00fd
commit 580fb5e72c
1 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
libavformat/asf.c
View file

@ -20,6 +20,9 @@
#include "avi.h" #include "avi.h"
#include "mpegaudio.h" #include "mpegaudio.h"
#undef NDEBUG
#include <assert.h>
#define PACKET_SIZE 3200 #define PACKET_SIZE 3200
#define PACKET_HEADER_SIZE 12 #define PACKET_HEADER_SIZE 12
#define FRAME_HEADER_SIZE 17 #define FRAME_HEADER_SIZE 17
@ -1288,6 +1291,13 @@ static int asf_read_close(AVFormatContext *s)
return 0; return 0;
} }
static int64_t asf_align(AVFormatContext *s, int64_t pos){
ASFContext *asf = s->priv_data;
assert(pos >= 0);
return pos/ asf->packet_size * asf->packet_size;
}
// Added to support seeking after packets have been read // Added to support seeking after packets have been read
// If information is not reset, read_packet fails due to // If information is not reset, read_packet fails due to
// leftover information from previous reads // leftover information from previous reads
@ -1318,22 +1328,30 @@ static void asf_reset_header(AVFormatContext *s)
asf->packet_time_start = 0; asf->packet_time_start = 0;
} }
static int64_t asf_read_pts(AVFormatContext *s, int64_t pos) static int64_t asf_read_pts(AVFormatContext *s, int64_t *ppos, int stream_index)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
int64_t seek_pos; int64_t pos= *ppos;
int64_t pts;
// ensure we are on the byte boundry // ensure we are on the packet boundry
if (pos > asf->packet_size) assert(pos % asf->packet_size == 0);
seek_pos = s->data_offset + ((pos / asf->packet_size) * asf->packet_size);
else seek_pos = pos;
url_fseek(&s->pb, seek_pos, SEEK_SET); url_fseek(&s->pb, pos + s->data_offset, SEEK_SET);
do{
pos= url_ftell(&s->pb) - s->data_offset;
asf_reset_header(s); asf_reset_header(s);
if (av_read_frame(s, pkt) < 0) if (av_read_frame(s, pkt) < 0)
return AV_NOPTS_VALUE; return AV_NOPTS_VALUE;
return pkt->pts; pts= pkt->pts;
av_free_packet(pkt);
}while(pkt->stream_index != stream_index);
*ppos= pos;
return pts;
} }
static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts) static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts)
@ -1341,37 +1359,32 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts)
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
AVStream *st; AVStream *st;
AVPacket pkt1, *pkt; AVPacket pkt1, *pkt;
int block_align, byte_rate; int block_align;
int64_t pos; int64_t pos;
int64_t pos_min, pos_max, pts_min, pts_max, cur_pts; int64_t pos_min, pos_max, pts_min, pts_max, cur_pts;
pkt = &pkt1; pkt = &pkt1;
// Currently we only support single stream files like WMA
if (s->nb_streams > 1) return -1;
// Validate pts // Validate pts
if (pts < 0) if (pts < 0)
pts = 0; pts = 0;
// Acquire the specified stream
// If no stream is specified, use the only one we work with
if (stream_index == -1) if (stream_index == -1)
st = s->streams[0]; stream_index= av_find_default_stream_index(s);
else st = s->streams[stream_index];
st = s->streams[stream_index];
// ASF files have fixed block sizes, store this to determine offset // ASF files have fixed block sizes, store this to determine offset
block_align = asf->packet_size; block_align = asf->packet_size;
byte_rate = st->codec.bit_rate / 8; if (block_align <= 0)
if (block_align <= 0 || byte_rate <= 0)
return -1; return -1;
pos_min = 0; pos_min = 0;
pts_min = asf_read_pts(s, s->data_offset); pts_min = asf_read_pts(s, &pos_min, stream_index);
if (pts_min == AV_NOPTS_VALUE) return -1; if (pts_min == AV_NOPTS_VALUE) return -1;
pos_max = url_filesize(url_fileno(&s->pb)) - 1; pos_max = asf_align(s, url_filesize(url_fileno(&s->pb)) - 1 - s->data_offset); //FIXME wrong
pts_max = pts_min + s->duration; pts_max = pts_min + s->duration;
while (pos_min <= pos_max) { while (pos_min <= pos_max) {
@ -1387,10 +1400,11 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts)
pos = (int64_t)((double)(pos_max - pos_min) * pos = (int64_t)((double)(pos_max - pos_min) *
(double)(pts - pts_min) / (double)(pts - pts_min) /
(double)(pts_max - pts_min)) + pos_min; (double)(pts_max - pts_min)) + pos_min;
pos= asf_align(s, pos);
} }
// read the next timestamp // read the next timestamp
cur_pts = asf_read_pts(s, pos); cur_pts = asf_read_pts(s, &pos, stream_index);
/* check if we are lucky */ /* check if we are lucky */
if (pts == cur_pts) { if (pts == cur_pts) {
@ -1399,14 +1413,14 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts)
return -1; return -1;
} else if (pts < cur_pts) { } else if (pts < cur_pts) {
pos_max = pos; pos_max = pos;
pts_max = asf_read_pts(s, pos_max); pts_max = asf_read_pts(s, &pos_max, stream_index); //FIXME wrong, must do backward search, or change this somehow
if (pts >= pts_max) { if (pts >= pts_max) {
pos = pos_max; pos = pos_max;
goto found; goto found;
} }
} else { } else {
pos_min = pos + asf->packet_size; pos_min = pos + asf->packet_size;
pts_min = asf_read_pts(s, pos_min); pts_min = asf_read_pts(s, &pos_min, stream_index);
if (pts <= pts_min) { if (pts <= pts_min) {
goto found; goto found;
} }
@ -1414,8 +1428,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts)
} }
pos = pos_min; pos = pos_min;
found: found:
pos = s->data_offset + ((pos / block_align) * block_align); url_fseek(&s->pb, pos + s->data_offset, SEEK_SET);
url_fseek(&s->pb, pos, SEEK_SET);
asf_reset_header(s); asf_reset_header(s);
return 0; return 0;
} }