cbs_h265: add raw filler encoding

Dave Airlie committed 3 years ago

Commit b4283f91 parent 12f158c3 files · +52 −0Browse files

Unified · Split

3 files

         }
         break;
+    case HEVC_NAL_FD_NUT:
+        {
+            err = cbs_h265_read_filler(ctx, &gbc, unit->content);
+            if (err < 0)
+                return err;
+        }
+        break;
     case HEVC_NAL_SEI_PREFIX:
     case HEVC_NAL_SEI_SUFFIX:
         {
         }
         break;
+    case HEVC_NAL_FD_NUT:
+        {
+            err = cbs_h265_write_filler(ctx, pbc, unit->content);
+            if (err < 0)
+                return err;
+        }
+        break;
     case HEVC_NAL_SEI_PREFIX:
     case HEVC_NAL_SEI_SUFFIX:
         {
     CBS_UNIT_TYPE_INTERNAL_REF(HEVC_NAL_PPS, H265RawPPS, extension_data.data),
     CBS_UNIT_TYPE_POD(HEVC_NAL_AUD, H265RawAUD),
+    CBS_UNIT_TYPE_POD(HEVC_NAL_FD_NUT, H265RawFiller),
     // Slices of non-IRAP pictures.
     CBS_UNIT_RANGE_INTERNAL_REF(HEVC_NAL_TRAIL_N, HEVC_NAL_RASL_R,

     SEIRawMessageList    message_list;
 } H265RawSEI;
+typedef struct H265RawFiller {
+    H265RawNALUnitHeader nal_unit_header;
+    uint32_t filler_size;
+} H265RawFiller;
 typedef struct CodedBitstreamH265Context {
     // Reader/writer context in common with the H.264 implementation.
     CodedBitstreamH2645Context common;

@@ -2364,3 +2364,32 @@ static int FUNC(sei)(CodedBitstreamContext ctx, RWContext rw, · 2363 unmodified lines
2364		2364
2365	return 0;	2365	return 0;
2366	}	2366	}
		2367
		2368
		2369	static int FUNC(filler)(CodedBitstreamContext ctx, RWContext rw,
		2370	H265RawFiller *current)
		2371	{
		2372	int err;
		2373
		2374	HEADER("Filler Data");
		2375
		2376	CHECK(FUNC(nal_unit_header)(ctx, rw, &current->nal_unit_header,
		2377	HEVC_NAL_FD_NUT));
		2378
		2379	#ifdef READ
		2380	while (show_bits(rw, 8) == 0xff) {
		2381	fixed(8, ff_byte, 0xff);
		2382	++current->filler_size;
		2383	}
		2384	#else
		2385	{
		2386	uint32_t i;
		2387	for (i = 0; i < current->filler_size; i++)
		2388	fixed(8, ff_byte, 0xff);
		2389	}
		2390	#endif
		2391
		2392	CHECK(FUNC(rbsp_trailing_bits)(ctx, rw));
		2393
		2394	return 0;
		2395	}

Keyboard shortcuts