MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* static allocation for audio packets. This will make it a little bit

Browse Source 
faster and easier to follow.

   * misc. fixes for problems with seeking

Originally committed as revision 3590 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roman Shaposhnik 2004-10-13 00:03:00 +00:00
parent b3bfb29980
commit 664f583665
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avidec.c
View File

@ -735,6 +735,8 @@ static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp
ast->frame_offset);
#endif
}
if (avi->dv_demux)
dv_flush_audio_packets(avi->dv_demux);
/* do the seek */
pos += avi->movi_list;
url_fseek(&s->pb, pos, SEEK_SET);

48
libavformat/dv.c
View File

@ -32,6 +32,7 @@ struct DVDemuxContext {
AVStream* vst;
AVStream* ast[2];
AVPacket audio_pkt[2];
uint8_t audio_buf[2][8192];
int ach;
int frames;
uint64_t abytes;
@ -544,7 +545,7 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame)
as_pack = dv_extract_pack(frame, dv_audio_source);
if (!as_pack || !sys) { /* No audio ? */
c->ach = 0;
return -1;
return 0;
}
smpls = as_pack[1] & 0x3f; /* samples in this frame - min. samples */
@ -561,6 +562,12 @@ static int dv_extract_audio_info(DVDemuxContext* c, uint8_t* frame)
av_set_pts_info(c->ast[i], 64, 1, 30000);
c->ast[i]->codec.codec_type = CODEC_TYPE_AUDIO;
c->ast[i]->codec.codec_id = CODEC_ID_PCM_S16LE;
av_init_packet(&c->audio_pkt[i]);
c->audio_pkt[i].size = 0;
c->audio_pkt[i].data = c->audio_buf[i];
c->audio_pkt[i].stream_index = c->ast[i]->index;
c->audio_pkt[i].flags |= PKT_FLAG_KEY;
}
c->ast[i]->codec.sample_rate = dv_audio_frequency[freq];
c->ast[i]->codec.channels = 2;
@ -744,9 +751,7 @@ DVDemuxContext* dv_init_demux(AVFormatContext *s)
c->ach = 0;
c->frames = 0;
c->abytes = 0;
c->audio_pkt[0].size = 0;
c->audio_pkt[1].size = 0;
c->vst->codec.codec_type = CODEC_TYPE_VIDEO;
c->vst->codec.codec_id = CODEC_ID_DVVIDEO;
c->vst->codec.bit_rate = 25000000;
@ -755,12 +760,6 @@ DVDemuxContext* dv_init_demux(AVFormatContext *s)
return c;
}
static void __destruct_pkt(struct AVPacket *pkt)
{
pkt->data = NULL; pkt->size = 0;
return;
}
int dv_get_packet(DVDemuxContext *c, AVPacket *pkt)
{
int size = -1;
@ -790,21 +789,16 @@ int dv_produce_packet(DVDemuxContext *c, AVPacket *pkt,
/* Queueing audio packet */
/* FIXME: in case of no audio/bad audio we have to do something */
size = dv_extract_audio_info(c, buf);
c->audio_pkt[0].data = c->audio_pkt[1].data = NULL;
for (i=0; i<c->ach; i++) {
if (av_new_packet(&c->audio_pkt[i], size) < 0)
return AVERROR_NOMEM;
c->audio_pkt[i].stream_index = c->ast[i]->index;
c->audio_pkt[i].pts = c->abytes * 30000*8 / c->ast[i]->codec.bit_rate;
c->audio_pkt[i].flags |= PKT_FLAG_KEY;
c->audio_pkt[i].size = size;
c->audio_pkt[i].pts = c->abytes * 30000*8 / c->ast[i]->codec.bit_rate;
}
dv_extract_audio(buf, c->audio_pkt[0].data, c->audio_pkt[1].data);
dv_extract_audio(buf, c->audio_buf[0], c->audio_buf[1]);
c->abytes += size;
/* Now it's time to return video packet */
size = dv_extract_video_info(c, buf);
av_init_packet(pkt);
pkt->destruct = __destruct_pkt;
pkt->data = buf;
pkt->size = size;
pkt->flags |= PKT_FLAG_KEY;
@ -844,6 +838,11 @@ static int64_t dv_frame_offset(AVFormatContext *s, DVDemuxContext *c,
return offset;
}
void dv_flush_audio_packets(DVDemuxContext *c)
{
c->audio_pkt[0].size = c->audio_pkt[1].size = 0;
}
/************************************************************
* Implementation of the easiest DV storage of all -- raw DV.
************************************************************/
@ -898,21 +897,16 @@ static int dv_read_seek(AVFormatContext *s, int stream_index,
{
RawDVContext *r = s->priv_data;
DVDemuxContext *c = r->dv_demux;
int i;
int64_t offset= dv_frame_offset(s, c, timestamp, flags);
const DVprofile* sys = dv_codec_profile(&c->vst->codec);
c->frames= offset / sys->frame_size;
c->abytes= av_rescale(c->frames,
if (c->ach)
c->abytes= av_rescale(c->frames,
c->ast[0]->codec.bit_rate * (int64_t)sys->frame_rate_base,
8*sys->frame_rate);
for (i=0; i<c->ach; i++) {
if (c->ast[i] && c->audio_pkt[i].size) {
av_free_packet(&c->audio_pkt[i]);
c->audio_pkt[i].size = 0;
}
}
dv_flush_audio_packets(c);
return url_fseek(&s->pb, offset, SEEK_SET);
}

1
libavformat/dv.h
View File

@ -27,6 +27,7 @@ typedef struct DVDemuxContext DVDemuxContext;
DVDemuxContext* dv_init_demux(AVFormatContext* s);
int dv_get_packet(DVDemuxContext*, AVPacket *);
int dv_produce_packet(DVDemuxContext*, AVPacket*, uint8_t*, int);
void dv_flush_audio_packets(DVDemuxContext*);
typedef struct DVMuxContext DVMuxContext;
DVMuxContext* dv_init_mux(AVFormatContext* s);