har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In ogg muxer, use dyn buffer to compute crc of the page, fix muxing with pipe

Browse Source 
when page buffer is bigger than default buffer size. Max page is 65k.

Originally committed as revision 24242 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2010-07-14 23:21:18 +00:00
parent 4563de772c
commit 22fe18c1c0
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libavformat/oggenc.c
View File

@ -63,36 +63,50 @@ typedef struct {
OGGPageList *page_list; OGGPageList *page_list;
} OGGContext; } OGGContext;
static void ogg_update_checksum(AVFormatContext *s, int64_t crc_offset) static void ogg_update_checksum(AVFormatContext *s, ByteIOContext *pb, int64_t crc_offset)
{ {
int64_t pos = url_ftell(s->pb); int64_t pos = url_ftell(pb);
uint32_t checksum = get_checksum(s->pb); uint32_t checksum = get_checksum(pb);
url_fseek(s->pb, crc_offset, SEEK_SET); url_fseek(pb, crc_offset, SEEK_SET);
put_be32(s->pb, checksum); put_be32(pb, checksum);
url_fseek(s->pb, pos, SEEK_SET); url_fseek(pb, pos, SEEK_SET);
} }
static void ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags) static int ogg_write_page(AVFormatContext *s, OGGPage *page, int extra_flags)
{ {
OGGStreamContext *oggstream = s->streams[page->stream_index]->priv_data; OGGStreamContext *oggstream = s->streams[page->stream_index]->priv_data;
ByteIOContext *pb;
int64_t crc_offset; int64_t crc_offset;
int ret, size;
uint8_t *buf;
init_checksum(s->pb, ff_crc04C11DB7_update, 0); ret = url_open_dyn_buf(&pb);
put_tag(s->pb, "OggS"); if (ret < 0)
put_byte(s->pb, 0); return ret;
put_byte(s->pb, page->flags | extra_flags); init_checksum(pb, ff_crc04C11DB7_update, 0);
put_le64(s->pb, page->granule); put_tag(pb, "OggS");
put_le32(s->pb, oggstream->serial_num); put_byte(pb, 0);
put_le32(s->pb, oggstream->page_counter++); put_byte(pb, page->flags | extra_flags);
crc_offset = url_ftell(s->pb); put_le64(pb, page->granule);
put_le32(s->pb, 0); // crc put_le32(pb, oggstream->serial_num);
put_byte(s->pb, page->segments_count); put_le32(pb, oggstream->page_counter++);
put_buffer(s->pb, page->segments, page->segments_count); crc_offset = url_ftell(pb);
put_buffer(s->pb, page->data, page->size); put_le32(pb, 0); // crc
put_byte(pb, page->segments_count);
put_buffer(pb, page->segments, page->segments_count);
put_buffer(pb, page->data, page->size);
ogg_update_checksum(s, crc_offset); ogg_update_checksum(s, pb, crc_offset);
put_flush_packet(pb);
size = url_close_dyn_buf(pb, &buf);
if (size < 0)
return size;
put_buffer(s->pb, buf, size);
put_flush_packet(s->pb); put_flush_packet(s->pb);
oggstream->page_count--; oggstream->page_count--;
return 0;
} }
static int64_t ogg_granule_to_timestamp(OGGStreamContext *oggstream, OGGPage *page) static int64_t ogg_granule_to_timestamp(OGGStreamContext *oggstream, OGGPage *page)