diff options
author | John Stebbins <[email protected]> | 2015-08-25 09:49:36 -0700 |
---|---|---|
committer | John Stebbins <[email protected]> | 2015-09-24 13:01:44 -0700 |
commit | 2f912311718e522b2fb5e2a06446fe84a4247025 (patch) | |
tree | 3edc8e0bf2940bf455e42c0d697c60b5995995e2 /libhb/demuxmpeg.c | |
parent | f122f66319ba45d607cfa89ba8f5fcfa5fc44840 (diff) |
libhb: add hb_buffer_list
This brings together several independent implementations of a simple
buffer list manager.
Diffstat (limited to 'libhb/demuxmpeg.c')
-rw-r--r-- | libhb/demuxmpeg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libhb/demuxmpeg.c b/libhb/demuxmpeg.c index f370caf04..cbc1c3f98 100644 --- a/libhb/demuxmpeg.c +++ b/libhb/demuxmpeg.c @@ -71,7 +71,7 @@ static inline void restore_chap( hb_psdemux_t *state, hb_buffer_t *buf ) /* Basic MPEG demuxer */ -void hb_demux_dvd_ps( hb_buffer_t * buf, hb_list_t * list_es, hb_psdemux_t* state ) +void hb_demux_dvd_ps( hb_buffer_t * buf, hb_buffer_list_t * list_es, hb_psdemux_t* state ) { hb_buffer_t * buf_es; int pos = 0; @@ -232,7 +232,7 @@ void hb_demux_dvd_ps( hb_buffer_t * buf, hb_list_t * list_es, hb_psdemux_t* stat } memcpy( buf_es->data, d + pos, pes_packet_end - pos ); - hb_list_add( list_es, buf_es ); + hb_buffer_list_append(list_es, buf_es); pos = pes_packet_end; } @@ -248,7 +248,7 @@ void hb_demux_dvd_ps( hb_buffer_t * buf, hb_list_t * list_es, hb_psdemux_t* stat // stripped off and buf has all the info gleaned from them: id is set, // start contains the pts (if any), renderOffset contains the dts (if any) // and stop contains the pcr (if it changed). -void hb_demux_mpeg(hb_buffer_t *buf, hb_list_t *list_es, +void hb_demux_mpeg(hb_buffer_t *buf, hb_buffer_list_t *list_es, hb_psdemux_t *state, int tolerance) { while ( buf ) @@ -342,19 +342,19 @@ void hb_demux_mpeg(hb_buffer_t *buf, hb_list_t *list_es, hb_buffer_t *tmp = buf->next; buf->next = NULL; - hb_list_add( list_es, buf ); + hb_buffer_list_append(list_es, buf); buf = tmp; } } -void hb_demux_ts(hb_buffer_t *buf, hb_list_t *list_es, hb_psdemux_t *state) +void hb_demux_ts(hb_buffer_t *buf, hb_buffer_list_t *list_es, hb_psdemux_t *state) { // Distance between PCRs in TS is up to 100ms, but we have seen // streams that exceed this, so allow up to 300ms. hb_demux_mpeg(buf, list_es, state, 300); } -void hb_demux_ps(hb_buffer_t *buf, hb_list_t *list_es, hb_psdemux_t *state) +void hb_demux_ps(hb_buffer_t *buf, hb_buffer_list_t *list_es, hb_psdemux_t *state) { // Distance between SCRs in PS is up to 700ms hb_demux_mpeg(buf, list_es, state, 700); @@ -363,7 +363,7 @@ void hb_demux_ps(hb_buffer_t *buf, hb_list_t *list_es, hb_psdemux_t *state) // "null" demuxer (makes a copy of input buf & returns it in list) // used when the reader for some format includes its own demuxer. // for example, ffmpeg. -void hb_demux_null( hb_buffer_t * buf, hb_list_t * list_es, hb_psdemux_t* state ) +void hb_demux_null( hb_buffer_t * buf, hb_buffer_list_t * list_es, hb_psdemux_t* state ) { while ( buf ) { @@ -388,7 +388,7 @@ void hb_demux_null( hb_buffer_t * buf, hb_list_t * list_es, hb_psdemux_t* state hb_buffer_t *tmp = buf->next; buf->next = NULL; - hb_list_add( list_es, buf ); + hb_buffer_list_append(list_es, buf); buf = tmp; } } |