Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-28 13:57:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MPEG TS: re-factor to simplify control flow & "send to packetizer" logic

Browse Source
This commit is contained in:
Moritz Bunkus 2015-12-30 21:41:05 +01:00
parent 6f38c01263
commit 2251fff1db
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/input/r_mpeg_ts.cpp
View File

@ -643,7 +643,6 @@ mpeg_ts_reader_c::mpeg_ts_reader_c(const track_info_c &ti,
, m_global_timecode_offset{}
, m_stream_timecode{timestamp_c::ns(0)}
, m_probing{true}
, track_buffer_ready(-1)
, file_done{}
, m_packet_sent_to_packetizer{}
, m_dont_use_audio_pts{ "mpeg_ts|mpeg_ts_dont_use_audio_pts"}
@ -1239,8 +1238,7 @@ mpeg_ts_reader_c::parse_packet(unsigned char *buf) {
probe_packet_complete(track);
else
// PES completed, set track to quicly send it to the rightpacketizer
track_buffer_ready = tidx;
track->send_to_packetizer();
return true;
}
@ -1611,8 +1609,6 @@ mpeg_ts_reader_c::read(generic_packetizer_c *requested_ptzr,
unsigned char buf[TS_MAX_PACKET_SIZE + 1];
track_buffer_ready = -1;
if (file_done)
return flush_packetizers();
@ -1628,11 +1624,6 @@ mpeg_ts_reader_c::read(generic_packetizer_c *requested_ptzr,
parse_packet(buf);
if (track_buffer_ready != -1) { // ES buffer ready
tracks[track_buffer_ready]->send_to_packetizer();
track_buffer_ready = -1;
}
if (m_packet_sent_to_packetizer)
return FILE_STATUS_MOREDATA;
}

1
src/input/r_mpeg_ts.h
View File

@ -396,7 +396,6 @@ protected:
timestamp_c m_global_timecode_offset, m_stream_timecode;
bool m_probing;
int track_buffer_ready;
bool file_done, m_packet_sent_to_packetizer;