videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

demux: libmp4: rework edit list storage

pull/144/head
Francois Cartegnie 3 years ago
committed by Steve Lhomme
parent
90811de8f8
commit
3ef970a52a
3 changed files with 43 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      modules/demux/mp4/libmp4.c
  2. 14
      modules/demux/mp4/libmp4.h
  3. 51
      modules/demux/mp4/mp4.c

34
modules/demux/mp4/libmp4.c
View File

@ -3291,10 +3291,7 @@ static int MP4_ReadBox_stdp( stream_t *p_stream, MP4_Box_t *p_box )
static void MP4_FreeBox_elst( MP4_Box_t *p_box )
{
free( p_box->data.p_elst->i_segment_duration );
free( p_box->data.p_elst->i_media_time );
free( p_box->data.p_elst->i_media_rate_integer );
free( p_box->data.p_elst->i_media_rate_fraction );
free( p_box->data.p_elst->entries );
}
static int MP4_ReadBox_elst( stream_t *p_stream, MP4_Box_t *p_box )
@ -3302,6 +3299,7 @@ static int MP4_ReadBox_elst( stream_t *p_stream, MP4_Box_t *p_box )
uint32_t count;
MP4_READBOX_ENTER( MP4_Box_data_elst_t, MP4_FreeBox_elst );
MP4_Box_data_elst_t *p_elst = p_box->data.p_elst;
uint8_t i_version;
uint32_t dummy;
@ -3319,21 +3317,11 @@ static int MP4_ReadBox_elst( stream_t *p_stream, MP4_Box_t *p_box )
if( count > i_entries_max )
count = i_entries_max;
p_box->data.p_elst->i_segment_duration = vlc_alloc( count,
sizeof(uint64_t) );
p_box->data.p_elst->i_media_time = vlc_alloc( count, sizeof(int64_t) );
p_box->data.p_elst->i_media_rate_integer = vlc_alloc( count,
sizeof(uint16_t) );
p_box->data.p_elst->i_media_rate_fraction = vlc_alloc( count,
sizeof(uint16_t) );
if( p_box->data.p_elst->i_segment_duration == NULL
|| p_box->data.p_elst->i_media_time == NULL
|| p_box->data.p_elst->i_media_rate_integer == NULL
|| p_box->data.p_elst->i_media_rate_fraction == NULL )
{
p_elst->entries = vlc_alloc( count, sizeof(*p_elst->entries) );
if( !p_elst->entries )
MP4_READBOX_EXIT( 0 );
}
p_box->data.p_elst->i_entry_count = count;
p_elst->i_entry_count = count;
for( uint32_t i = 0; i < count; i++ )
{
@ -3357,15 +3345,15 @@ static int MP4_ReadBox_elst( stream_t *p_stream, MP4_Box_t *p_box )
media_time = u.s;
}
p_box->data.p_elst->i_segment_duration[i] = segment_duration;
p_box->data.p_elst->i_media_time[i] = media_time;
MP4_GET2BYTES( p_box->data.p_elst->i_media_rate_integer[i] );
MP4_GET2BYTES( p_box->data.p_elst->i_media_rate_fraction[i] );
p_elst->entries[i].i_segment_duration = segment_duration;
p_elst->entries[i].i_media_time = media_time;
MP4_GET2BYTES( p_elst->entries[i].i_media_rate_integer );
MP4_GET2BYTES( p_elst->entries[i].i_media_rate_fraction );
}
#ifdef MP4_VERBOSE
msg_Dbg( p_stream, "read box: \"elst\" entry-count %" PRIu32,
p_box->data.p_elst->i_entry_count );
p_elst->i_entry_count );
#endif
MP4_READBOX_EXIT( 1 );
}

14
modules/demux/mp4/libmp4.h
View File

@ -984,15 +984,19 @@ typedef struct MP4_Box_data_stdp_s
} MP4_Box_data_stdp_t;
typedef struct
{
uint64_t i_segment_duration; /* movie timescale */
int64_t i_media_time; /* media(track) timescale */
uint16_t i_media_rate_integer;
uint16_t i_media_rate_fraction;
} MP4_Box_data_elst_entry_t;
typedef struct MP4_Box_data_elst_s
{
uint32_t i_entry_count;
uint64_t *i_segment_duration; /* movie timescale */
int64_t *i_media_time; /* media(track) timescale */
uint16_t *i_media_rate_integer;
uint16_t *i_media_rate_fraction;
MP4_Box_data_elst_entry_t *entries;
} MP4_Box_data_elst_t;

51
modules/demux/mp4/mp4.c
View File

@ -551,15 +551,15 @@ static vlc_tick_t MP4_TrackGetDTSPTS( demux_t *p_demux, const mp4_track_t *p_tra
if( p_track->p_elst && p_track->BOXDATA(p_elst)->i_entry_count )
{
const MP4_Box_data_elst_t *elst = p_track->BOXDATA(p_elst);
const MP4_Box_data_elst_entry_t *edit = &elst->entries[p_track->i_elst];
/* convert to offset */
if( elst->i_media_time[p_track->i_elst] > 0 &&
( elst->i_media_rate_integer[p_track->i_elst] > 0 ||
elst->i_media_rate_fraction[p_track->i_elst] > 0 ) )
if( edit->i_media_time > 0 &&
( edit->i_media_rate_integer > 0 || edit->i_media_rate_fraction > 0 ) )
{
if( p_track->i_start_dts >= elst->i_media_time[p_track->i_elst] )
if( p_track->i_start_dts >= edit->i_media_time )
{
sdts -= elst->i_media_time[p_track->i_elst];
sdts -= edit->i_media_time;
}
}
}
@ -3315,7 +3315,8 @@ static int TrackTimeToSampleChunk( demux_t *p_demux, mp4_track_t *p_track,
MP4_TrackSetELST( p_demux, p_track, start );
if( p_track->p_elst && p_track->BOXDATA(p_elst)->i_entry_count > 0 )
{
MP4_Box_data_elst_t *elst = p_track->BOXDATA(p_elst);
const MP4_Box_data_elst_t *elst = p_track->BOXDATA(p_elst);
const MP4_Box_data_elst_entry_t *edit = &elst->entries[p_track->i_elst];
int64_t i_mvt= MP4_rescale_qtime( start, p_sys->i_timescale );
/* now calculate i_start for this elst */
@ -3330,11 +3331,10 @@ static int TrackTimeToSampleChunk( demux_t *p_demux, mp4_track_t *p_track,
/* to track time scale */
i_start = MP4_rescale_qtime( start, p_track->i_timescale );
/* add elst offset */
if( ( elst->i_media_rate_integer[p_track->i_elst] > 0 ||
elst->i_media_rate_fraction[p_track->i_elst] > 0 ) &&
elst->i_media_time[p_track->i_elst] > 0 )
if( ( edit->i_media_rate_integer > 0 || edit->i_media_rate_fraction > 0 ) &&
edit->i_media_time > 0 )
{
i_start += elst->i_media_time[p_track->i_elst];
i_start += edit->i_media_time;
}
msg_Dbg( p_demux, "elst (%d) gives %"PRId64"ms (movie)-> %"PRId64
@ -3670,14 +3670,15 @@ static void MP4_TrackSetup( demux_t *p_demux, mp4_track_t *p_track,
msg_Warn( p_demux, "elst box found" );
for( i = 0; i < elst->i_entry_count; i++ )
{
const MP4_Box_data_elst_entry_t *edit = &elst->entries[i];
msg_Dbg( p_demux, " - [%d] duration=%"PRId64"ms media time=%"PRId64
"ms) rate=%d.%d", i,
MP4_rescale( elst->i_segment_duration[i], p_sys->i_timescale, 1000 ),
elst->i_media_time[i] >= 0 ?
MP4_rescale( elst->i_media_time[i], p_track->i_timescale, 1000 ) :
MP4_rescale( edit->i_segment_duration, p_sys->i_timescale, 1000 ),
edit->i_media_time >= 0 ?
MP4_rescale( edit->i_media_time, p_track->i_timescale, 1000 ) :
INT64_C(-1),
elst->i_media_rate_integer[i],
elst->i_media_rate_fraction[i] );
edit->i_media_rate_integer,
edit->i_media_rate_fraction );
}
if( var_InheritBool( p_demux, CFG_PREFIX"editlist" ) )
@ -3778,12 +3779,12 @@ static void MP4_TrackSetup( demux_t *p_demux, mp4_track_t *p_track,
#define MAX_SELECTABLE (INT_MAX - ES_PRIORITY_SELECTABLE_MIN)
for ( uint32_t i=0; i<p_track->BOXDATA(p_elst)->i_entry_count; i++ )
{
if ( p_track->BOXDATA(p_elst)->i_media_time[i] >= 0 &&
p_track->BOXDATA(p_elst)->i_segment_duration[i] )
const MP4_Box_data_elst_entry_t *edit = &p_track->BOXDATA(p_elst)->entries[i];
if ( edit->i_media_time >= 0 && edit->i_segment_duration )
{
/* We do selection by inverting start time into priority.
The track with earliest edit will have the highest prio */
const int i_time = __MIN( MAX_SELECTABLE, p_track->BOXDATA(p_elst)->i_media_time[i] );
const int i_time = __MIN( MAX_SELECTABLE, edit->i_media_time );
p_track->fmt.i_priority = ES_PRIORITY_SELECTABLE_MIN + MAX_SELECTABLE - i_time;
break;
}
@ -4236,7 +4237,7 @@ static int MP4_TrackNextSample( demux_t *p_demux, mp4_track_t *p_track, uint32_t
p_sys->i_timescale );
if( p_track->i_elst < elst->i_entry_count &&
i_mvt >= p_track->i_elst_time +
elst->i_segment_duration[p_track->i_elst] )
elst->entries[p_track->i_elst].i_segment_duration )
{
MP4_TrackSetELST( p_demux, p_track,
MP4_TrackGetDTSPTS( p_demux, p_track, NULL ) );
@ -4262,7 +4263,7 @@ static void MP4_TrackSetELST( demux_t *p_demux, mp4_track_t *tk,
for( tk->i_elst = 0; tk->i_elst < elst->i_entry_count; tk->i_elst++ )
{
uint64_t i_dur = elst->i_segment_duration[tk->i_elst];
uint64_t i_dur = elst->entries[tk->i_elst].i_segment_duration;
if( tk->i_elst_time <= i_mvt
&& i_mvt < (int64_t)(tk->i_elst_time + i_dur) )
@ -4276,20 +4277,14 @@ static void MP4_TrackSetELST( demux_t *p_demux, mp4_track_t *tk,
{
/* msg_Dbg( p_demux, "invalid number of entry in elst" ); */
tk->i_elst = elst->i_entry_count - 1;
tk->i_elst_time -= elst->i_segment_duration[tk->i_elst];
}
if( elst->i_media_time[tk->i_elst] < 0 )
{
/* track offset */
tk->i_elst_time += elst->i_segment_duration[tk->i_elst];
tk->i_elst_time -= elst->entries[tk->i_elst].i_segment_duration;
}
if( i_elst_last != tk->i_elst )
{
msg_Warn( p_demux, "elst old=%d new=%"PRIu32, i_elst_last, tk->i_elst );
if( i_elst_last < elst->i_entry_count &&
elst->i_media_time[i_elst_last] >= 0 )
elst->entries[i_elst_last].i_media_time >= 0 )
tk->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY;
}
}

Write Preview
Loading…
Cancel
Save