According to the PES packet definition defined in Table 2-17 of ISO_IEC_13818-1
specification, some fields like PTS/DTS or pes_extension could only appears if
the stream_id meets the condition:
if (stream_id != 0xBC && // program_stream_map
stream_id != 0xBE && // padding_stream
stream_id != 0xBF && // private_stream_2
stream_id != 0xF0 && // ECM
stream_id != 0xF1 && // EMM
stream_id != 0xFF && // program_stream_directory
stream_id != 0xF2 && // DSMCC_stream
stream_id != 0xF8) // ITU-T Rec. H.222.1 type E stream
And the following stream_id types don't have fields like PTS/DTS:
else if ( stream_id == program_stream_map
|| stream_id == private_stream_2
|| stream_id == ECM
|| stream_id == EMM
|| stream_id == program_stream_directory
|| stream_id == DSMCC_stream
|| stream_id == ITU-T Rec. H.222.1 type E stream ) {
for (i = 0; i < PES_packet_length; i++) {
PES_packet_data_byte
}
}
Current implementation skipped the check of stream_id causing some kind of
streams like private_stream_2 to be incorrectly written with actually a
private_stream_1-like PES header with PTS/DTS field. For example, Japan DTV
transmits news and alerts through ARIB superimpose that utilizes
private_stream_2 still could not be remuxed correctly for now.
This patch set fixes the remuxing for private_stream_2 and
other stream_id types.
Signed-off-by: zheng qian <xqq@xqq.im>
Signed-off-by: Marton Balint <cus@passwd.hu>
pts = dts = AV_NOPTS_VALUE;
header_len = 0;
pts = dts = AV_NOPTS_VALUE;
header_len = 0;
+
+ if (stream_id != STREAM_ID_PROGRAM_STREAM_MAP &&
+ stream_id != STREAM_ID_PADDING_STREAM &&
+ stream_id != STREAM_ID_PRIVATE_STREAM_2 &&
+ stream_id != STREAM_ID_ECM_STREAM &&
+ stream_id != STREAM_ID_EMM_STREAM &&
+ stream_id != STREAM_ID_PROGRAM_STREAM_DIRECTORY &&
+ stream_id != STREAM_ID_DSMCC_STREAM &&
+ stream_id != STREAM_ID_TYPE_E_STREAM) {
+
flags = 0;
if (pts != AV_NOPTS_VALUE) {
header_len += 5;
flags = 0;
if (pts != AV_NOPTS_VALUE) {
header_len += 5;
memset(q, 0xff, pes_header_stuffing_bytes);
q += pes_header_stuffing_bytes;
}
memset(q, 0xff, pes_header_stuffing_bytes);
q += pes_header_stuffing_bytes;
}
+ } else {
+ len = payload_size;
+ *q++ = len >> 8;
+ *q++ = len;
+ }
is_start = 0;
}
/* header size */
is_start = 0;
}
/* header size */