h264nal: integrate old webrtc code

We use a fork of the (old) WebRTC BitBuffer code in order to access
to bits/bytes in a binary buffer. We kept it in a separate directory
to allow easy binary replacement with the original BitBuffer.

Both BitBuffer versions have evolved since:
* WebRTC replaced BitBuffer with BitstreamReader (see [1])
* We added a new function to do byte copy in BitBuffer.

We want to remove the assumption that the BitBuffer in thie repo is in
anyway interchangeable with the (old) WebRTC BitBuffer. So we are
integrating it in the main code.

Reference:
[1] https://webrtc-review.googlesource.com/c/src/+/232125

Tested:

Build system.

```
$ rm -rf build/
$ mkdir build
$ cd build
$ CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_C_FLAGS_DEBUG="-g -O0" -DCMAKE_CXX_FLAGS_DEBUG="-g -O0" ..  # cmake with clang and debug/gdb symbols
...
$ make -j
...
[100%] Built target h264_vui_parameters_parser_unittest
```

Author: chemag

CMakeLists.txt

@@ -27,7 +27,6 @@ enable_testing()
 
 # Recurse into source code subdirectories.
 add_subdirectory(src)
-add_subdirectory(webrtc)
 add_subdirectory(tools)
 add_subdirectory(test)
 add_subdirectory(fuzz)

README.md

@@ -189,7 +189,7 @@ The following code has been copied from `tools/h264nal.nalu.cc`:
   // 3. create state for parsing NALUs
   // bitstream parser state (to keep the SPS/PPS/SubsetSPS NALUs)
   h264nal::H264BitstreamParserState bitstream_parser_state;
-  h265nal::ParsingOptions parsing_options;
+  h264nal::ParsingOptions parsing_options;
 
   // 4. parse the NALUs one-by-one
   auto bitstream =
@@ -268,13 +268,14 @@ if (rtp->nal_unit_header->nal_unit_type <= 23) {
 # 5. Requirements
 Requires gtests, gmock.
 
-The [`webrtc`](webrtc) directory contains an RBSP parser copied from webrtc.
-
 
 # 6. Other
 The [media](media/README.md) directory contains information on testing the
 parser using media files.
 
+The `rtc_common.h|cc` code contains an RBSP parser copied from an old
+version of webrtc.
+
 The [fuzz](fuzz/README.md) directory contains information on fuzzing the
 parser.
 

fuzz/CMakeLists.txt

@@ -1,12 +1,7 @@
-# link executable to webrtc library
-# Since the webrtc library has public include directories
-# we will use those link directories when building `main`
-#target_link_libraries(main LINK_PUBLIC webrtc)
 
 include_directories(PUBLIC ../include)
 
 include_directories(PUBLIC ../src)
-include_directories(PUBLIC ../webrtc)
 
 # MacOS requirements
 include_directories(PUBLIC /usr/local/include)
@@ -15,8 +10,6 @@ link_directories(/usr/local/lib)
 add_compile_options(-fsanitize=address,fuzzer,undefined)
 add_link_options(-fsanitize=address,fuzzer,undefined)
 
-#target_include_directories(h264_bitstream_parser_fuzzer PUBLIC /usr/local/include ${CMAKE_CURRENT_SOURCE_DIR} webrtc)
-
 function(add_fuzzer TARGET SOURCE)
   if(NOT WIN32)
     add_executable(${TARGET} ${SOURCE})

fuzz/h264_bitstream_parser_fuzzer.cc

@@ -9,8 +9,7 @@
 #include "h264_bitstream_parser.h"
 #include "h264_bitstream_parser_state.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_common_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_common.h"
 #include <vector>
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_dec_ref_pic_marking_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_dec_ref_pic_marking_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_hrd_parameters_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_hrd_parameters_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_nal_unit_header_svc_extension_parser_fuzzer.cc

@@ -7,8 +7,7 @@
 // Do not edit directly.
 
 #include "h264_nal_unit_header_svc_extension_parser.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_nal_unit_parser_fuzzer.cc

@@ -9,8 +9,7 @@
 #include "h264_nal_unit_parser.h"
 #include "h264_bitstream_parser_state.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_pps_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_pps_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_pred_weight_table_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_pred_weight_table_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_prefix_nal_unit_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_prefix_nal_unit_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_ref_pic_list_modification_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_ref_pic_list_modification_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_rtp_fua_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_rtp_fua_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_rtp_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_rtp_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_rtp_single_parser_fuzzer.cc

@@ -9,8 +9,7 @@
 #include "h264_rtp_single_parser.h"
 #include <vector>
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_rtp_stapa_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_rtp_stapa_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_slice_header_parser_fuzzer.cc

@@ -14,8 +14,7 @@
 #include "h264_pred_weight_table_parser.h"
 #include "h264_ref_pic_list_modification_parser.h"
 #include "h264_sps_parser.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_slice_layer_without_partitioning_rbsp_parser_fuzzer.cc

@@ -14,8 +14,7 @@
 #include "h264_pred_weight_table_parser.h"
 #include "h264_ref_pic_list_modification_parser.h"
 #include "h264_sps_parser.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_sps_extension_parser_fuzzer.cc

@@ -9,8 +9,7 @@
 #include "h264_sps_extension_parser.h"
 #include "h264_common.h"
 #include "h264_sps_parser.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_sps_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_sps_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_sps_svc_extension_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_sps_svc_extension_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_subset_sps_parser_fuzzer.cc

@@ -9,8 +9,7 @@
 #include "h264_subset_sps_parser.h"
 #include "h264_common.h"
 #include "h264_sps_parser.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

fuzz/h264_vui_parameters_parser_fuzzer.cc

@@ -8,8 +8,7 @@
 
 #include "h264_vui_parameters_parser.h"
 #include "h264_common.h"
-#include "rtc_base/arraysize.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 
 // libfuzzer infra to test the fuzz target

include/h264_bitstream_parser.h

@@ -12,7 +12,7 @@
 #include "h264_bitstream_parser_state.h"
 #include "h264_common.h"
 #include "h264_nal_unit_parser.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 namespace h264nal {
 

include/h264_common.h

@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 namespace h264nal {
 
@@ -98,10 +98,10 @@ enum SvcSliceType : uint8_t {
 std::vector<uint8_t> UnescapeRbsp(const uint8_t *data, size_t length);
 
 // Syntax functions and descriptors) (Section 7.2)
-bool byte_aligned(rtc::BitBuffer *bit_buffer);
-int get_current_offset(rtc::BitBuffer *bit_buffer);
-bool more_rbsp_data(rtc::BitBuffer *bit_buffer);
-bool rbsp_trailing_bits(rtc::BitBuffer *bit_buffer);
+bool byte_aligned(BitBuffer *bit_buffer);
+int get_current_offset(BitBuffer *bit_buffer);
+bool more_rbsp_data(BitBuffer *bit_buffer);
+bool rbsp_trailing_bits(BitBuffer *bit_buffer);
 
 #if defined(FDUMP_DEFINE)
 // fdump() indentation help
@@ -130,7 +130,7 @@ class NaluChecksum {
   // maximum length (in bytes)
   const static int kMaxLength = 32;
   static std::shared_ptr<NaluChecksum> GetNaluChecksum(
-      rtc::BitBuffer *bit_buffer) noexcept;
+      BitBuffer *bit_buffer) noexcept;
   void fdump(char *output, int output_len) const;
   const char *GetChecksum() { return checksum; };
   int GetLength() { return length; };

include/h264_dec_ref_pic_marking_parser.h

@@ -9,7 +9,7 @@
 #include <memory>
 #include <vector>
 
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 namespace h264nal {
 
@@ -50,7 +50,7 @@ class H264DecRefPicMarkingParser {
   static std::unique_ptr<DecRefPicMarkingState> ParseDecRefPicMarking(
       const uint8_t* data, size_t length, uint32_t nal_unit_type) noexcept;
   static std::unique_ptr<DecRefPicMarkingState> ParseDecRefPicMarking(
-      rtc::BitBuffer* bit_buffer, uint32_t nal_unit_type) noexcept;
+      BitBuffer* bit_buffer, uint32_t nal_unit_type) noexcept;
 };
 
 }  // namespace h264nal

include/h264_hrd_parameters_parser.h

@@ -9,7 +9,7 @@
 #include <memory>
 #include <vector>
 
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 namespace h264nal {
 
@@ -54,7 +54,7 @@ class H264HrdParametersParser {
   static std::unique_ptr<HrdParametersState> ParseHrdParameters(
       const uint8_t* data, size_t length) noexcept;
   static std::unique_ptr<HrdParametersState> ParseHrdParameters(
-      rtc::BitBuffer* bit_buffer) noexcept;
+      BitBuffer* bit_buffer) noexcept;
 };
 
 }  // namespace h264nal

include/h264_nal_unit_header_parser.h

@@ -10,7 +10,7 @@
 
 #include "h264_common.h"
 #include "h264_nal_unit_header_svc_extension_parser.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 namespace h264nal {
 
@@ -47,7 +47,7 @@ class H264NalUnitHeaderParser {
   static std::unique_ptr<NalUnitHeaderState> ParseNalUnitHeader(
       const uint8_t* data, size_t length) noexcept;
   static std::unique_ptr<NalUnitHeaderState> ParseNalUnitHeader(
-      rtc::BitBuffer* bit_buffer) noexcept;
+      BitBuffer* bit_buffer) noexcept;
   // Parses nalu type from the given buffer
   static bool GetNalUnitType(const uint8_t* data, const size_t length,
                              NalUnitType& naluType) noexcept;

include/h264_nal_unit_header_svc_extension_parser.h

@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 namespace h264nal {
 
@@ -48,7 +48,7 @@ class H264NalUnitHeaderSvcExtensionParser {
   static std::unique_ptr<NalUnitHeaderSvcExtensionState>
   ParseNalUnitHeaderSvcExtension(const uint8_t* data, size_t length) noexcept;
   static std::unique_ptr<NalUnitHeaderSvcExtensionState>
-  ParseNalUnitHeaderSvcExtension(rtc::BitBuffer* bit_buffer) noexcept;
+  ParseNalUnitHeaderSvcExtension(BitBuffer* bit_buffer) noexcept;
 };
 
 }  // namespace h264nal

include/h264_nal_unit_parser.h

@@ -12,7 +12,7 @@
 #include "h264_common.h"
 #include "h264_nal_unit_header_parser.h"
 #include "h264_nal_unit_payload_parser.h"
-#include "rtc_base/bit_buffer.h"
+#include "rtc_common.h"
 
 namespace h264nal {
 
@@ -65,7 +65,7 @@ class H264NalUnitParser {
       struct H264BitstreamParserState* bitstream_parser_state,
       ParsingOptions parsing_options) noexcept;
   static std::unique_ptr<NalUnitState> ParseNalUnit(
-      rtc::BitBuffer* bit_buffer,
+      BitBuffer* bit_buffer,
       struct H264BitstreamParserState* bitstream_parser_state,
       ParsingOptions parsing_options) noexcept;
 };