Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2 from steinwurf/upgrade-bnb-2
Upgrade bnb 3
  • Loading branch information
jpihl committed Oct 24, 2017
2 parents f89991d + 8b55684 commit d0f4878
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 81 deletions.
2 changes: 1 addition & 1 deletion NEWS.rst
Expand Up @@ -6,7 +6,7 @@ every change, see the Git log.

Latest
------
* tbd
* Major: Upgrade bnb to version 3.

1.0.0
-----
Expand Down
9 changes: 1 addition & 8 deletions resolve.json
Expand Up @@ -10,15 +10,8 @@
"name": "bnb",
"resolver": "git",
"method": "semver",
"major": 1,
"sources": ["github.com/steinwurf/bnb.git"]
},
{
"name": "bitter",
"resolver": "git",
"method": "semver",
"major": 3,
"sources": ["github.com/steinwurf/bitter.git"]
"sources": ["github.com/steinwurf/bnb.git"]
},
{
"name": "nalu",
Expand Down
44 changes: 22 additions & 22 deletions src/mts/adaptation_field.hpp
Expand Up @@ -30,22 +30,22 @@ class adaptation_field

adaptation_field
.read_bits<endian::u8, bitter::msb0, 1, 1, 1, 1, 1, 1, 1, 1>()
.read<0>(field->m_discontinuity_indicator)
.read<1>(field->m_random_access_indicator)
.read<2>(field->m_elementary_stream_priority_indicator)
.read<3>(field->m_pcr_flag)
.read<4>(field->m_opcr_flag)
.read<5>(field->m_splicing_point_flag)
.read<6>(field->m_transport_private_data_flag)
.read<7>(field->m_adaptation_field_extension_flag);
.get<0>(field->m_discontinuity_indicator)
.get<1>(field->m_random_access_indicator)
.get<2>(field->m_elementary_stream_priority_indicator)
.get<3>(field->m_pcr_flag)
.get<4>(field->m_opcr_flag)
.get<5>(field->m_splicing_point_flag)
.get<6>(field->m_transport_private_data_flag)
.get<7>(field->m_adaptation_field_extension_flag);

if (field->m_pcr_flag)
{
uint64_t pcr_base = 0;
uint16_t pcr_extension = 0;
adaptation_field.read_bits<endian::u48, bitter::msb0, 33, 6, 9>()
.read<0>(pcr_base)
.read<2>(pcr_extension);
.get<0>(pcr_base)
.get<2>(pcr_extension);
field->m_program_clock_reference = pcr_base * 300 + pcr_extension;
}

Expand All @@ -55,8 +55,8 @@ class adaptation_field
uint16_t opcr_extension = 0;

adaptation_field.read_bits<endian::u48, bitter::msb0, 33, 6, 9>()
.read<0>(opcr_base)
.read<2>(opcr_extension);
.get<0>(opcr_base)
.get<2>(opcr_extension);
field->m_original_program_clock_reference =
opcr_base * 300 + opcr_extension;
}
Expand Down Expand Up @@ -86,23 +86,23 @@ class adaptation_field

adaptation_field_extension
.read_bits<endian::u8, bitter::msb0, 1, 1, 1, 5>()
.read<0>(field->m_ltw_flag)
.read<1>(field->m_piecewise_rate_flag)
.read<2>(field->m_seamless_splice_flag);
.get<0>(field->m_ltw_flag)
.get<1>(field->m_piecewise_rate_flag)
.get<2>(field->m_seamless_splice_flag);

if (field->m_ltw_flag)
{
adaptation_field_extension
.read_bits<endian::u16, bitter::msb0, 1, 15>()
.read<0>(field->m_ltw_valid_flag)
.read<1>(field->m_ltw_offset);
.get<0>(field->m_ltw_valid_flag)
.get<1>(field->m_ltw_offset);
}

if (field->m_piecewise_rate_flag)
{
adaptation_field_extension
.read_bits<endian::u24, bitter::msb0, 2, 22>()
.read<1>(field->m_piecewise_rate);
.get<1>(field->m_piecewise_rate);
}

if (field->m_seamless_splice_flag)
Expand All @@ -113,10 +113,10 @@ class adaptation_field
uint16_t dts_next_au_14_0 = 0;
adaptation_field_extension
.read_bits<endian::u40, bitter::msb0, 4, 3, 1, 15, 1, 15, 1>()
.read<0>(field->m_splice_type)
.read<1>(dts_next_au_32_30)
.read<3>(dts_next_au_29_15)
.read<5>(dts_next_au_14_0);
.get<0>(field->m_splice_type)
.get<1>(dts_next_au_32_30)
.get<3>(dts_next_au_29_15)
.get<5>(dts_next_au_14_0);
field->m_dts_next_au = helper::read_timestamp(
dts_next_au_32_30,
dts_next_au_29_15,
Expand Down
10 changes: 5 additions & 5 deletions src/mts/pat.hpp
Expand Up @@ -58,15 +58,15 @@ class pat

uint16_t section_length = 0;
reader.read_bits<endian::u16, bitter::msb0, 1, 1, 2, 12>()
.read<0>(pat->m_section_syntax_indicator)
.read<3>(section_length);
.get<0>(pat->m_section_syntax_indicator)
.get<3>(section_length);

auto section_reader = reader.skip(section_length);

section_reader.read<endian::u16>(pat->m_transport_stream_id);
section_reader.read_bits<endian::u8, bitter::msb0, 2, 5, 1>()
.read<1>(pat->m_version_number)
.read<2>(pat->m_current_next_indicator);
.get<1>(pat->m_version_number)
.get<2>(pat->m_current_next_indicator);

section_reader.read<endian::u8>(pat->m_section_number);
section_reader.read<endian::u8>(pat->m_last_section_number);
Expand All @@ -79,7 +79,7 @@ class pat
auto program_reader = section_reader.skip(4);
program_reader.read<endian::u16>(program.m_program_number);
program_reader.read_bits<endian::u16, bitter::msb0, 3, 13>()
.read<1>(program.m_pid);
.get<1>(program.m_pid);
pat->m_program_entries.push_back(program);
}

Expand Down
54 changes: 27 additions & 27 deletions src/mts/pes.hpp
Expand Up @@ -54,22 +54,22 @@ class pes
{
packet_reader
.read_bits<endian::u8, bitter::msb0, 2, 2, 1, 1, 1, 1>()
.read<0>().expect_eq(0x02)
.read<1>(pes->m_scrambling_control)
.read<2>(pes->m_priority)
.read<3>(pes->m_data_alignment_indicator)
.read<4>(pes->m_copyright)
.read<5>(pes->m_original_or_copy);
.get<0>().expect_eq(0x02)
.get<1>(pes->m_scrambling_control)
.get<2>(pes->m_priority)
.get<3>(pes->m_data_alignment_indicator)
.get<4>(pes->m_copyright)
.get<5>(pes->m_original_or_copy);

packet_reader
.read_bits<endian::u8, bitter::msb0, 2, 1, 1, 1, 1, 1, 1>()
.read<0>(pes->m_pts_dts_flags).expect_ne(0x01)
.read<1>(pes->m_escr_flag)
.read<2>(pes->m_es_rate_flag)
.read<3>(pes->m_dsm_trick_mode_flag)
.read<4>(pes->m_additional_copy_info_flag)
.read<5>(pes->m_crc_flag)
.read<6>(pes->m_extension_flag);
.get<0>(pes->m_pts_dts_flags).expect_ne(0x01)
.get<1>(pes->m_escr_flag)
.get<2>(pes->m_es_rate_flag)
.get<3>(pes->m_dsm_trick_mode_flag)
.get<4>(pes->m_additional_copy_info_flag)
.get<5>(pes->m_crc_flag)
.get<6>(pes->m_extension_flag);

uint8_t header_data_length = 0;
packet_reader.read<endian::u8>(header_data_length);
Expand All @@ -83,9 +83,9 @@ class pes

header_reader
.read_bits<endian::u40, bitter::msb0, 4, 3, 1, 15, 1, 15, 1>()
.read<1>(ts_32_30)
.read<3>(ts_29_15)
.read<5>(ts_14_0);
.get<1>(ts_32_30)
.get<3>(ts_29_15)
.get<5>(ts_14_0);

pes->m_pts = helper::read_timestamp(ts_32_30, ts_29_15, ts_14_0);
}
Expand All @@ -97,9 +97,9 @@ class pes

header_reader
.read_bits<endian::u40, bitter::msb0, 4, 3, 1, 15, 1, 15, 1>()
.read<1>(ts_32_30)
.read<3>(ts_29_15)
.read<5>(ts_14_0);
.get<1>(ts_32_30)
.get<3>(ts_29_15)
.get<5>(ts_14_0);

pes->m_dts = helper::read_timestamp(ts_32_30, ts_29_15, ts_14_0);
}
Expand All @@ -113,10 +113,10 @@ class pes

header_reader
.read_bits<endian::u48, bitter::msb0, 2, 3, 1, 15, 1, 15, 1, 9, 1>()
.read<1>(escr_32_30)
.read<3>(escr_29_15)
.read<5>(escr_14_0)
.read<7>(escr_base);
.get<1>(escr_32_30)
.get<3>(escr_29_15)
.get<5>(escr_14_0)
.get<7>(escr_base);

pes->m_escr = helper::read_timestamp(
escr_32_30, escr_29_15, escr_14_0) * 300 + escr_base;
Expand All @@ -126,22 +126,22 @@ class pes
{
header_reader
.read_bits<endian::u24, bitter::msb0, 1, 22, 1>()
.read<1>(pes->m_es_rate);
.get<1>(pes->m_es_rate);
}

if (pes->m_dsm_trick_mode_flag)
{
header_reader
.read_bits<endian::u8, bitter::msb0, 3, 5>()
.read<0>(pes->m_trick_mode_control)
.read<1>(pes->m_trick_mode_data);
.get<0>(pes->m_trick_mode_control)
.get<1>(pes->m_trick_mode_data);
}

if (pes->m_additional_copy_info_flag)
{
header_reader
.read_bits<endian::u8, bitter::msb0, 1, 7>()
.read<1>(pes->m_additional_copy_info);
.get<1>(pes->m_additional_copy_info);
}

if (pes->m_crc_flag)
Expand Down
22 changes: 11 additions & 11 deletions src/mts/program.hpp
Expand Up @@ -39,12 +39,12 @@ class program
reader.read<endian::u8>(stream_entry->m_type);

reader.read_bits<endian::u16, bitter::msb0, 3, 13>()
.read<1>(stream_entry->m_pid);
.get<1>(stream_entry->m_pid);

uint16_t es_info_length = 0;
reader.read_bits<endian::u16, bitter::msb0, 4, 2, 10>()
.read<1>().expect_eq(0x00)
.read<2>(es_info_length);
.get<1>().expect_eq(0x00)
.get<2>(es_info_length);

auto es_info_reader = reader.skip(es_info_length);

Expand Down Expand Up @@ -105,27 +105,27 @@ class program

uint16_t section_length = 0;
reader.read_bits<endian::u16, bitter::msb0, 1, 1, 2, 2, 10>()
.read<0>(program->m_section_syntax_indicator)
.read<3>().expect_eq(0x00)
.read<4>(section_length);
.get<0>(program->m_section_syntax_indicator)
.get<3>().expect_eq(0x00)
.get<4>(section_length);

auto section_reader = reader.skip(section_length);

section_reader.read<endian::u16>(program->m_program_number);

section_reader.read_bits<endian::u8, bitter::msb0, 2, 5, 1>()
.read<1>(program->m_version_number)
.read<2>(program->m_current_next_indicator);
.get<1>(program->m_version_number)
.get<2>(program->m_current_next_indicator);

section_reader.read<endian::u8>(program->m_section_number);
section_reader.read<endian::u8>(program->m_last_section_number);

section_reader.read_bits<endian::u16, bitter::msb0, 3, 13>()
.read<1>(program->m_pcr_pid);
.get<1>(program->m_pcr_pid);

section_reader.read_bits<endian::u16, bitter::msb0, 4, 2, 10>()
.read<1>().expect_eq(0x00)
.read<2>(program->m_program_info_length);
.get<1>().expect_eq(0x00)
.get<2>(program->m_program_info_length);

auto program_info = section_reader.skip(program->m_program_info_length);
program->m_program_info_data = program_info.data();
Expand Down
14 changes: 7 additions & 7 deletions src/mts/ts_packet.hpp
Expand Up @@ -28,14 +28,14 @@ class ts_packet
reader.read<endian::u8>().expect_eq(0x47); // sýnc byte

reader.read_bits<endian::u16, bitter::msb0, 1, 1, 1, 13>()
.read<0>(ts_packet->m_transport_error_indicator).expect_eq(false)
.read<1>(ts_packet->m_payload_unit_start_indicator)
.read<2>(ts_packet->m_transport_priority)
.read<3>(ts_packet->m_pid);
.get<0>(ts_packet->m_transport_error_indicator).expect_eq(false)
.get<1>(ts_packet->m_payload_unit_start_indicator)
.get<2>(ts_packet->m_transport_priority)
.get<3>(ts_packet->m_pid);
reader.read_bits<endian::u8, bitter::msb0, 2, 2, 4>()
.read<0>(ts_packet->m_transport_scrambling_control)
.read<1>(ts_packet->m_adaptation_field_control)
.read<2>(ts_packet->m_continuity_counter);
.get<0>(ts_packet->m_transport_scrambling_control)
.get<1>(ts_packet->m_adaptation_field_control)
.get<2>(ts_packet->m_continuity_counter);

if (reader.error())
{
Expand Down

0 comments on commit d0f4878

Please sign in to comment.