cbs_av1: Support redundant frame headers

Mark Thompson committed 8 years ago

Commit f5894171 parent 6bdb7713 files · +91 −12Browse files

Unified · Split

3 files

libavcodec/cbs_av1.c +12 −4
libavcodec/cbs_av1.h +4 −1
libavcodec/cbs_av1_syntax_template.c +75 −7

@@ -996,7 +996,10 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, · 995 unmodified lines
996	996	case AV1_OBU_REDUNDANT_FRAME_HEADER:
997	997	{
998	998	err = cbs_av1_read_frame_header_obu(ctx, &gbc,
999		− &obu->obu.frame_header);
	999	+ &obu->obu.frame_header,
	1000	+ obu->header.obu_type ==
	1001	+ AV1_OBU_REDUNDANT_FRAME_HEADER,
	1002	+ unit->data_ref);
1000	1003	if (err < 0)
1001	1004	return err;
1002	1005	}
@@ -1016,7 +1019,8 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, · 13 unmodified lines
1016	1019	break;
1017	1020	case AV1_OBU_FRAME:
1018	1021	{
1019		− err = cbs_av1_read_frame_obu(ctx, &gbc, &obu->obu.frame);
	1022	+ err = cbs_av1_read_frame_obu(ctx, &gbc, &obu->obu.frame,
	1023	+ unit->data_ref);
1020	1024	if (err < 0)
1021	1025	return err;
1022	1026
@@ -1124,7 +1128,10 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, · 101 unmodified lines
1124	1128	case AV1_OBU_REDUNDANT_FRAME_HEADER:
1125	1129	{
1126	1130	err = cbs_av1_write_frame_header_obu(ctx, pbc,
1127		− &obu->obu.frame_header);
	1131	+ &obu->obu.frame_header,
	1132	+ obu->header.obu_type ==
	1133	+ AV1_OBU_REDUNDANT_FRAME_HEADER,
	1134	+ NULL);
1128	1135	if (err < 0)
1129	1136	return err;
1130	1137	}
@@ -1141,7 +1148,7 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, · 10 unmodified lines
1141	1148	break;
1142	1149	case AV1_OBU_FRAME:
1143	1150	{
1144		− err = cbs_av1_write_frame_obu(ctx, pbc, &obu->obu.frame);
	1151	+ err = cbs_av1_write_frame_obu(ctx, pbc, &obu->obu.frame, NULL);
1145	1152	if (err < 0)
1146	1153	return err;
1147	1154
@@ -1302,6 +1309,7 @@ static void cbs_av1_close(CodedBitstreamContext *ctx) · 154 unmodified lines
1302	1309	CodedBitstreamAV1Context *priv = ctx->priv_data;
1303	1310
1304	1311	av_buffer_unref(&priv->sequence_header_ref);
	1312	+ av_buffer_unref(&priv->frame_header_ref);
1305	1313
1306	1314	av_freep(&priv->write_buffer);
1307	1315	}

libavcodec/cbs_av1.h+4−1

@@ -399,7 +399,10 @@ typedef struct CodedBitstreamAV1Context { · 398 unmodified lines
399	399	AV1RawSequenceHeader *sequence_header;
400	400	AVBufferRef *sequence_header_ref;
401	401
402		− int seen_frame_header;
	402	+ int seen_frame_header;
	403	+ AVBufferRef *frame_header_ref;
	404	+ uint8_t *frame_header;
	405	+ size_t frame_header_size;
403	406
404	407	int temporal_id;
405	408	int spatial_id;

libavcodec/cbs_av1_syntax_template.c+75−7

@@ -1463,24 +1463,90 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext ctx, RWContext rw, · 1462 unmodified lines
1463	1463	}
1464	1464
1465	1465	static int FUNC(frame_header_obu)(CodedBitstreamContext ctx, RWContext rw,
1466		− AV1RawFrameHeader *current)
	1466	+ AV1RawFrameHeader *current, int redundant,
	1467	+ AVBufferRef *rw_buffer_ref)
1467	1468	{
1468	1469	CodedBitstreamAV1Context *priv = ctx->priv_data;
1469		− int err;
1470		−
1471		− HEADER("Frame Header");
	1470	+ int start_pos, fh_bits, fh_bytes, err;
	1471	+ uint8_t *fh_start;
1472	1472
1473	1473	if (priv->seen_frame_header) {
1474		− // Nothing to do.
	1474	+ if (!redundant) {
	1475	+ av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid repeated "
	1476	+ "frame header OBU.\n");
	1477	+ return AVERROR_INVALIDDATA;
	1478	+ } else {
	1479	+ GetBitContext fh;
	1480	+ size_t i, b;
	1481	+ uint32_t val;
	1482	+
	1483	+ HEADER("Redundant Frame Header");
	1484	+
	1485	+ av_assert0(priv->frame_header_ref && priv->frame_header);
	1486	+
	1487	+ init_get_bits(&fh, priv->frame_header,
	1488	+ priv->frame_header_size);
	1489	+ for (i = 0; i < priv->frame_header_size; i += 8) {
	1490	+ b = FFMIN(priv->frame_header_size - i, 8);
	1491	+ val = get_bits(&fh, b);
	1492	+ xf(b, frame_header_copy[i],
	1493	+ val, val, val, 1, i / 8);
	1494	+ }
	1495	+ }
1475	1496	} else {
	1497	+ if (redundant)
	1498	+ HEADER("Redundant Frame Header (used as Frame Header)");
	1499	+ else
	1500	+ HEADER("Frame Header");
	1501	+
1476	1502	priv->seen_frame_header = 1;
1477	1503
	1504	+#ifdef READ
	1505	+ start_pos = get_bits_count(rw);
	1506	+#else
	1507	+ start_pos = put_bits_count(rw);
	1508	+#endif
	1509	+
1478	1510	CHECK(FUNC(uncompressed_header)(ctx, rw, current));
1479	1511
1480	1512	if (current->show_existing_frame) {
1481	1513	priv->seen_frame_header = 0;
1482	1514	} else {
1483	1515	priv->seen_frame_header = 1;
	1516	+
	1517	+ av_buffer_unref(&priv->frame_header_ref);
	1518	+
	1519	+#ifdef READ
	1520	+ fh_bits = get_bits_count(rw) - start_pos;
	1521	+ fh_start = (uint8_t*)rw->buffer + start_pos / 8;
	1522	+#else
	1523	+ // Need to flush the bitwriter so that we can copy its output,
	1524	+ // but use a copy so we don't affect the caller's structure.
	1525	+ {
	1526	+ PutBitContext tmp = *rw;
	1527	+ flush_put_bits(&tmp);
	1528	+ }
	1529	+
	1530	+ fh_bits = put_bits_count(rw) - start_pos;
	1531	+ fh_start = rw->buf + start_pos / 8;
	1532	+#endif
	1533	+ fh_bytes = (fh_bits + 7) / 8;
	1534	+
	1535	+ priv->frame_header_size = fh_bits;
	1536	+
	1537	+ if (rw_buffer_ref) {
	1538	+ priv->frame_header_ref = av_buffer_ref(rw_buffer_ref);
	1539	+ if (!priv->frame_header_ref)
	1540	+ return AVERROR(ENOMEM);
	1541	+ priv->frame_header = fh_start;
	1542	+ } else {
	1543	+ priv->frame_header_ref =
	1544	+ av_buffer_alloc(fh_bytes + AV_INPUT_BUFFER_PADDING_SIZE);
	1545	+ if (!priv->frame_header_ref)
	1546	+ return AVERROR(ENOMEM);
	1547	+ priv->frame_header = priv->frame_header_ref->data;
	1548	+ memcpy(priv->frame_header, fh_start, fh_bytes);
	1549	+ }
1484	1550	}
1485	1551	}
1486	1552
@@ -1524,11 +1590,13 @@ static int FUNC(tile_group_obu)(CodedBitstreamContext ctx, RWContext rw, · 37 unmodified lines
1524	1590	}
1525	1591
1526	1592	static int FUNC(frame_obu)(CodedBitstreamContext ctx, RWContext rw,
1527		− AV1RawFrame *current)
	1593	+ AV1RawFrame *current,
	1594	+ AVBufferRef *rw_buffer_ref)
1528	1595	{
1529	1596	int err;
1530	1597
1531		− CHECK(FUNC(frame_header_obu)(ctx, rw, &current->header));
	1598	+ CHECK(FUNC(frame_header_obu)(ctx, rw, &current->header,
	1599	+ 0, rw_buffer_ref));
1532	1600
1533	1601	CHECK(FUNC(byte_alignment)(ctx, rw));
1534	1602

cbs_av1: Support redundant frame headers

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code