mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

codecparsers: av1: Add an API to reset the annex_b state only.

Browse source 
In practice, we encounter streams that have one or more temporal units
error. When that kind of error temporal units is in annex b format, the
whole temporal unit should be discarded.
But the temporal units before it are correct and can be used. More
important, because of the error temporal unit, the parser is in a wrong
state and all later temporal unit are also parsed uncorrectly.
We need to add this API to reset the annex_b state only when we meet
some temporal unit error.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1464>
This commit is contained in:
He Junyan 2020-10-09 16:13:28 +08:00 committed by Víctor Manuel Jáquez Leal
parent a4f459fe21
commit c4aaeb0509
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gst-libs/gst/codecparsers/gstav1parser.c
View file

@ -568,29 +568,44 @@ gst_av1_parser_reset (GstAV1Parser * parser, gboolean annex_b)
{
g_return_if_fail (parser != NULL);
if (parser->annex_b) {
g_assert (parser->temporal_unit_consumed <= parser->temporal_unit_size);
if (parser->temporal_unit_consumed < parser->temporal_unit_size)
GST_DEBUG ("temporal_unit_consumed: %d, temporal_unit_size:%d, "
"discard the left %d bytes for a temporal_unit.",
parser->temporal_unit_consumed, parser->temporal_unit_size,
parser->temporal_unit_size - parser->temporal_unit_consumed);
parser->annex_b = annex_b;
if (parser->annex_b)
gst_av1_parser_reset_annex_b (parser);
g_assert (parser->frame_unit_consumed <= parser->frame_unit_size);
if (parser->frame_unit_consumed < parser->frame_unit_size)
GST_DEBUG (" frame_unit_consumed %d, frame_unit_size: %d "
"discard the left %d bytes for a frame_unit.",
parser->frame_unit_consumed, parser->frame_unit_size,
parser->frame_unit_size - parser->frame_unit_consumed);
}
gst_av1_parse_reset_state (parser, TRUE);
}
/**
* gst_av1_parser_reset_annex_b:
* @parser: the #GstAV1Parser
*
* Only reset the current #GstAV1Parser's annex b context.
* The other part of the state is kept.
*
* Since: 1.20
*/
void
gst_av1_parser_reset_annex_b (GstAV1Parser * parser)
{
g_return_if_fail (parser != NULL);
g_return_if_fail (parser->annex_b);
if (parser->temporal_unit_consumed < parser->temporal_unit_size)
GST_DEBUG ("temporal_unit_consumed: %d, temporal_unit_size:%d, "
"discard the left %d bytes for a temporal_unit.",
parser->temporal_unit_consumed, parser->temporal_unit_size,
parser->temporal_unit_size - parser->temporal_unit_consumed);
if (parser->frame_unit_consumed < parser->frame_unit_size)
GST_DEBUG (" frame_unit_consumed %d, frame_unit_size: %d "
"discard the left %d bytes for a frame_unit.",
parser->frame_unit_consumed, parser->frame_unit_size,
parser->frame_unit_size - parser->frame_unit_consumed);
parser->temporal_unit_consumed = 0;
parser->temporal_unit_size = 0;
parser->frame_unit_consumed = 0;
parser->frame_unit_size = 0;
parser->annex_b = annex_b;
gst_av1_parse_reset_state (parser, TRUE);
}
/* 5.3.2 */

4
gst-libs/gst/codecparsers/gstav1parser.h
View file

@ -1776,6 +1776,10 @@ GST_CODEC_PARSERS_API
void
gst_av1_parser_reset (GstAV1Parser * parser, gboolean annex_b);
GST_CODEC_PARSERS_API
void
gst_av1_parser_reset_annex_b (GstAV1Parser * parser);
GST_CODEC_PARSERS_API
GstAV1ParserResult
gst_av1_parser_identify_one_obu (GstAV1Parser * parser, const guint8 * data,