virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Merge commit '30a041887f89cd97c372ad6a516da6e012f2c88b'

Browse Source 
* commit '30a041887f89cd97c372ad6a516da6e012f2c88b':
  ismindex: Calculate the pts duration of trun atoms, not the dts duration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-03-19 14:00:32 +01:00
parent b5448e66b0 30a041887f
commit 5440d4b68b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/ismindex.c
View File

@@ -230,10 +230,12 @@ fail:
static int64_t read_trun_duration(AVIOContext *in, int default_duration, static int64_t read_trun_duration(AVIOContext *in, int default_duration,
int64_t end) int64_t end)
{ {
int64_t ret = 0; int64_t dts = 0;
int64_t pos; int64_t pos;
int flags, i; int flags, i;
int entries; int entries;
int64_t first_pts = 0;
int64_t max_pts = 0;
avio_r8(in); /* version */ avio_r8(in); /* version */
flags = avio_rb24(in); flags = avio_rb24(in);
if (default_duration <= 0 && !(flags & MOV_TRUN_SAMPLE_DURATION)) { if (default_duration <= 0 && !(flags & MOV_TRUN_SAMPLE_DURATION)) {
@@ -248,19 +250,23 @@ static int64_t read_trun_duration(AVIOContext *in, int default_duration,
pos = avio_tell(in); pos = avio_tell(in);
for (i = 0; i < entries && pos < end; i++) { for (i = 0; i < entries && pos < end; i++) {
int sample_duration = default_duration; int sample_duration = default_duration;
int64_t pts = dts;
if (flags & MOV_TRUN_SAMPLE_DURATION) sample_duration = avio_rb32(in); if (flags & MOV_TRUN_SAMPLE_DURATION) sample_duration = avio_rb32(in);
if (flags & MOV_TRUN_SAMPLE_SIZE) avio_rb32(in); if (flags & MOV_TRUN_SAMPLE_SIZE) avio_rb32(in);
if (flags & MOV_TRUN_SAMPLE_FLAGS) avio_rb32(in); if (flags & MOV_TRUN_SAMPLE_FLAGS) avio_rb32(in);
if (flags & MOV_TRUN_SAMPLE_CTS) avio_rb32(in); if (flags & MOV_TRUN_SAMPLE_CTS) pts += avio_rb32(in);
if (sample_duration < 0) { if (sample_duration < 0) {
fprintf(stderr, "Negative sample duration %d\n", sample_duration); fprintf(stderr, "Negative sample duration %d\n", sample_duration);
return -1; return -1;
} }
ret += sample_duration; if (i == 0)
first_pts = pts;
max_pts = FFMAX(max_pts, pts + sample_duration);
dts += sample_duration;
pos = avio_tell(in); pos = avio_tell(in);
} }
return ret; return max_pts - first_pts;
} }
static int64_t read_moof_duration(AVIOContext *in, int64_t offset) static int64_t read_moof_duration(AVIOContext *in, int64_t offset)