generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

asfenc: remember send time and offset of the index entries

Browse Source 
Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Vladimir Pantelic 2013-09-19 17:50:37 +02:00 committed by Anton Khirnov
parent 1eb9328030
commit 09f3c937ed
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/asf.h
View File

@ -78,6 +78,8 @@ typedef struct ASFMainHeader {
typedef struct ASFIndex { typedef struct ASFIndex {
uint32_t packet_number; uint32_t packet_number;
uint16_t packet_count; uint16_t packet_count;
uint64_t send_time;
uint64_t offset;
} ASFIndex; } ASFIndex;
extern const ff_asf_guid ff_asf_header; extern const ff_asf_guid ff_asf_header;

4
libavformat/asfenc.c
View File

@ -762,12 +762,14 @@ static void put_frame(AVFormatContext *s, ASFStream *stream, AVStream *avst,
static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
AVIOContext *pb = s->pb;
ASFStream *stream; ASFStream *stream;
int64_t duration; int64_t duration;
AVCodecContext *codec; AVCodecContext *codec;
int64_t packet_st, pts; int64_t packet_st, pts;
int start_sec, i; int start_sec, i;
int flags = pkt->flags; int flags = pkt->flags;
uint64_t offset = avio_tell(pb);
codec = s->streams[pkt->stream_index]->codec; codec = s->streams[pkt->stream_index]->codec;
stream = &asf->streams[pkt->stream_index]; stream = &asf->streams[pkt->stream_index];
@ -802,6 +804,8 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
// store // store
asf->index_ptr[i].packet_number = (uint32_t)packet_st; asf->index_ptr[i].packet_number = (uint32_t)packet_st;
asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets - packet_st); asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets - packet_st);
asf->index_ptr[i].send_time = start_sec * INT64_C(10000000);
asf->index_ptr[i].offset = offset;
asf->maximum_packet = FFMAX(asf->maximum_packet, asf->maximum_packet = FFMAX(asf->maximum_packet,
(uint16_t)(asf->nb_packets - packet_st)); (uint16_t)(asf->nb_packets - packet_st));
} }