xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify starting and ending clusters

Browse Source 
Originally committed as revision 22199 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad 2010-03-04 08:53:08 +00:00
parent 7a2a484081
commit 30f06a58a0
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/matroskaenc.c
View File

@ -725,14 +725,6 @@ static int mkv_write_header(AVFormatContext *s)
ret = mkv_write_chapters(s); ret = mkv_write_chapters(s);
if (ret < 0) return ret; if (ret < 0) return ret;
ret = mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb));
if (ret < 0) return ret;
mkv->cluster_pos = url_ftell(pb);
mkv->cluster = start_ebml_master(pb, MATROSKA_ID_CLUSTER, 0);
put_ebml_uint(pb, MATROSKA_ID_CLUSTERTIMECODE, 0);
mkv->cluster_pts = 0;
if (url_is_streamed(s->pb)) if (url_is_streamed(s->pb))
mkv_write_seekhead(pb, mkv->main_seekhead); mkv_write_seekhead(pb, mkv->main_seekhead);
@ -849,12 +841,7 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
int duration = pkt->duration; int duration = pkt->duration;
int ret; int ret;
// start a new cluster every 5 MB or 5 sec if (!mkv->cluster_pos) {
if (url_ftell(pb) > mkv->cluster_pos + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) {
av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64
" bytes, pts %" PRIu64 "\n", url_ftell(pb), pkt->pts);
end_ebml_master(pb, mkv->cluster);
ret = mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb)); ret = mkv_add_seekhead_entry(mkv->cluster_seekhead, MATROSKA_ID_CLUSTER, url_ftell(pb));
if (ret < 0) return ret; if (ret < 0) return ret;
@ -882,6 +869,14 @@ static int mkv_write_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) return ret; if (ret < 0) return ret;
} }
// start a new cluster every 5 MB or 5 sec
if (url_ftell(pb) > mkv->cluster_pos + 5*1024*1024 || pkt->pts > mkv->cluster_pts + 5000) {
av_log(s, AV_LOG_DEBUG, "Starting new cluster at offset %" PRIu64
" bytes, pts %" PRIu64 "\n", url_ftell(pb), pkt->pts);
end_ebml_master(pb, mkv->cluster);
mkv->cluster_pos = 0;
}
mkv->duration = FFMAX(mkv->duration, pkt->pts + duration); mkv->duration = FFMAX(mkv->duration, pkt->pts + duration);
return 0; return 0;
} }

4
tests/ref/acodec/pcm
View File

@ -22,11 +22,11 @@ stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
1058444 ./tests/data/acodec/pcm_s16le.wav 1058444 ./tests/data/acodec/pcm_s16le.wav
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444 stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
2f3e0884e96b984436b1d01200d68871 *./tests/data/acodec/pcm_s16be.mkv 33c64392615a70aa1132b6f87215b8a9 *./tests/data/acodec/pcm_s16be.mkv
1060705 ./tests/data/acodec/pcm_s16be.mkv 1060705 ./tests/data/acodec/pcm_s16be.mkv
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444 stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444
c98158732635effefffa006251b9a6c9 *./tests/data/acodec/pcm_s16le.mkv ff09423d5ead01dee128b5875682de2a *./tests/data/acodec/pcm_s16le.mkv
1060705 ./tests/data/acodec/pcm_s16le.mkv 1060705 ./tests/data/acodec/pcm_s16le.mkv
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.acodec.out.wav
stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444 stddev: 0.00 PSNR:999.99 bytes: 1058444/ 1058444