Skip to content

V
vlc-2-2
Commit 89646284 authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

AAC packetizer: deindent state machine switch

parent 7e52cd8a
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 137 deletions
modules/packetizer/mpeg4audio.c
View file @ 89646284
...@@ -895,163 +895,153 @@ static block_t *PacketizeStreamBlock(decoder_t *p_dec, block_t **pp_block) ...@@ -895,163 +895,153 @@ static block_t *PacketizeStreamBlock(decoder_t *p_dec, block_t **pp_block)
block_BytestreamPush(&p_sys->bytestream, *pp_block); block_BytestreamPush(&p_sys->bytestream, *pp_block);
for (;;) for (;;) switch(p_sys->i_state) {
{ case STATE_NOSYNC:
switch(p_sys->i_state) while (block_PeekBytes(&p_sys->bytestream, p_header, 2) == VLC_SUCCESS) {
{ /* Look for sync word - should be 0xfff(adts) or 0x2b7(loas) */
if (p_header[0] == 0xff && (p_header[1] & 0xf6) == 0xf0) {
if (p_sys->i_type != TYPE_ADTS)
msg_Dbg(p_dec, "detected ADTS format");
p_sys->i_state = STATE_SYNC;
p_sys->i_type = TYPE_ADTS;
break;
} else if (p_header[0] == 0x56 && (p_header[1] & 0xe0) == 0xe0) {
if (p_sys->i_type != TYPE_LOAS)
msg_Dbg(p_dec, "detected LOAS format");
case STATE_NOSYNC: p_sys->i_state = STATE_SYNC;
while (block_PeekBytes(&p_sys->bytestream, p_header, 2) p_sys->i_type = TYPE_LOAS;
== VLC_SUCCESS) break;
{
/* Look for sync word - should be 0xfff(adts) or 0x2b7(loas) */
if (p_header[0] == 0xff && (p_header[1] & 0xf6) == 0xf0) {
if (p_sys->i_type != TYPE_ADTS)
msg_Dbg(p_dec, "detected ADTS format");
p_sys->i_state = STATE_SYNC;
p_sys->i_type = TYPE_ADTS;
break;
} else if (p_header[0] == 0x56 && (p_header[1] & 0xe0) == 0xe0) {
if (p_sys->i_type != TYPE_LOAS)
msg_Dbg(p_dec, "detected LOAS format");
p_sys->i_state = STATE_SYNC;
p_sys->i_type = TYPE_LOAS;
break;
}
block_SkipByte(&p_sys->bytestream);
} }
if (p_sys->i_state != STATE_SYNC) { block_SkipByte(&p_sys->bytestream);
block_BytestreamFlush(&p_sys->bytestream); }
if (p_sys->i_state != STATE_SYNC) {
block_BytestreamFlush(&p_sys->bytestream);
/* Need more data */ /* Need more data */
return NULL; return NULL;
} }
case STATE_SYNC: case STATE_SYNC:
/* New frame, set the Presentation Time Stamp */ /* New frame, set the Presentation Time Stamp */
p_sys->i_pts = p_sys->bytestream.p_block->i_pts; p_sys->i_pts = p_sys->bytestream.p_block->i_pts;
if (p_sys->i_pts > VLC_TS_INVALID && if (p_sys->i_pts > VLC_TS_INVALID &&
p_sys->i_pts != date_Get(&p_sys->end_date)) p_sys->i_pts != date_Get(&p_sys->end_date))
date_Set(&p_sys->end_date, p_sys->i_pts); date_Set(&p_sys->end_date, p_sys->i_pts);
p_sys->i_state = STATE_HEADER; p_sys->i_state = STATE_HEADER;
break; break;
case STATE_HEADER:
if (p_sys->i_type == TYPE_ADTS) {
/* Get ADTS frame header (ADTS_HEADER_SIZE bytes) */
if (block_PeekBytes(&p_sys->bytestream, p_header,
ADTS_HEADER_SIZE) != VLC_SUCCESS)
return NULL; /* Need more data */
/* Check if frame is valid and get frame info */
p_sys->i_frame_size = ADTSSyncInfo(p_dec, p_header,
&p_sys->i_channels,
&p_sys->i_rate,
&p_sys->i_frame_length,
&p_sys->i_header_size);
} else {
assert(p_sys->i_type == TYPE_LOAS);
/* Get LOAS frame header (LOAS_HEADER_SIZE bytes) */
if (block_PeekBytes(&p_sys->bytestream, p_header,
LOAS_HEADER_SIZE) != VLC_SUCCESS)
return NULL; /* Need more data */
/* Check if frame is valid and get frame info */
p_sys->i_frame_size = LOASSyncInfo(p_header, &p_sys->i_header_size);
}
if (p_sys->i_frame_size <= 0) {
msg_Dbg(p_dec, "emulated sync word");
block_SkipByte(&p_sys->bytestream);
p_sys->i_state = STATE_NOSYNC;
break;
}
p_sys->i_state = STATE_NEXT_SYNC;
case STATE_NEXT_SYNC: case STATE_HEADER:
/* TODO: If p_block == NULL, flush the buffer without checking the if (p_sys->i_type == TYPE_ADTS) {
* next sync word */ /* Get ADTS frame header (ADTS_HEADER_SIZE bytes) */
if (p_sys->bytestream.p_block == NULL) { if (block_PeekBytes(&p_sys->bytestream, p_header,
p_sys->i_state = STATE_NOSYNC; ADTS_HEADER_SIZE) != VLC_SUCCESS)
block_BytestreamFlush(&p_sys->bytestream); return NULL; /* Need more data */
return NULL;
}
/* Check if next expected frame contains the sync word */ /* Check if frame is valid and get frame info */
if (block_PeekOffsetBytes(&p_sys->bytestream, p_sys->i_frame_size p_sys->i_frame_size = ADTSSyncInfo(p_dec, p_header,
+ p_sys->i_header_size, p_header, 2) != VLC_SUCCESS) &p_sys->i_channels,
&p_sys->i_rate,
&p_sys->i_frame_length,
&p_sys->i_header_size);
} else {
assert(p_sys->i_type == TYPE_LOAS);
/* Get LOAS frame header (LOAS_HEADER_SIZE bytes) */
if (block_PeekBytes(&p_sys->bytestream, p_header,
LOAS_HEADER_SIZE) != VLC_SUCCESS)
return NULL; /* Need more data */ return NULL; /* Need more data */
assert((p_sys->i_type == TYPE_ADTS) || (p_sys->i_type == TYPE_LOAS)); /* Check if frame is valid and get frame info */
if (((p_sys->i_type == TYPE_ADTS) && p_sys->i_frame_size = LOASSyncInfo(p_header, &p_sys->i_header_size);
(p_header[0] != 0xff || (p_header[1] & 0xf6) != 0xf0)) || }
((p_sys->i_type == TYPE_LOAS) &&
(p_header[0] != 0x56 || (p_header[1] & 0xe0) != 0xe0))) {
msg_Dbg(p_dec, "emulated sync word "
"(no sync on following frame)");
p_sys->i_state = STATE_NOSYNC;
block_SkipByte(&p_sys->bytestream);
break;
}
p_sys->i_state = STATE_SEND_DATA; if (p_sys->i_frame_size <= 0) {
msg_Dbg(p_dec, "emulated sync word");
block_SkipByte(&p_sys->bytestream);
p_sys->i_state = STATE_NOSYNC;
break; break;
}
case STATE_GET_DATA: p_sys->i_state = STATE_NEXT_SYNC;
/* Make sure we have enough data.
* (Not useful if we went through NEXT_SYNC) */
if (block_WaitBytes(&p_sys->bytestream, p_sys->i_frame_size +
p_sys->i_header_size) != VLC_SUCCESS)
return NULL; /* Need more data */
p_sys->i_state = STATE_SEND_DATA;
case STATE_SEND_DATA: case STATE_NEXT_SYNC:
/* When we reach this point we already know we have enough /* TODO: If p_block == NULL, flush the buffer without checking the
* data available. */ * next sync word */
if (p_sys->bytestream.p_block == NULL) {
p_sys->i_state = STATE_NOSYNC;
block_BytestreamFlush(&p_sys->bytestream);
return NULL;
}
p_out_buffer = block_Alloc(p_sys->i_frame_size); /* Check if next expected frame contains the sync word */
if (!p_out_buffer) { if (block_PeekOffsetBytes(&p_sys->bytestream, p_sys->i_frame_size
//p_dec->b_error = true; + p_sys->i_header_size, p_header, 2) != VLC_SUCCESS)
return NULL; return NULL; /* Need more data */
}
p_buf = p_out_buffer->p_buffer;
/* Skip the ADTS/LOAS header */ assert((p_sys->i_type == TYPE_ADTS) || (p_sys->i_type == TYPE_LOAS));
block_SkipBytes(&p_sys->bytestream, p_sys->i_header_size); if (((p_sys->i_type == TYPE_ADTS) &&
(p_header[0] != 0xff || (p_header[1] & 0xf6) != 0xf0)) ||
((p_sys->i_type == TYPE_LOAS) &&
(p_header[0] != 0x56 || (p_header[1] & 0xe0) != 0xe0))) {
msg_Dbg(p_dec, "emulated sync word "
"(no sync on following frame)");
p_sys->i_state = STATE_NOSYNC;
block_SkipByte(&p_sys->bytestream);
break;
}
if (p_sys->i_type == TYPE_ADTS) { p_sys->i_state = STATE_SEND_DATA;
/* Copy the whole frame into the buffer */ break;
block_GetBytes(&p_sys->bytestream, p_buf, p_sys->i_frame_size);
} else { case STATE_GET_DATA:
assert(p_sys->i_type == TYPE_LOAS); /* Make sure we have enough data.
/* Copy the whole frame into the buffer and parse/extract it */ * (Not useful if we went through NEXT_SYNC) */
block_GetBytes(&p_sys->bytestream, p_buf, p_sys->i_frame_size); if (block_WaitBytes(&p_sys->bytestream, p_sys->i_frame_size +
p_out_buffer->i_buffer = LOASParse(p_dec, p_buf, p_sys->i_frame_size); p_sys->i_header_size) != VLC_SUCCESS)
if (p_out_buffer->i_buffer <= 0) { return NULL; /* Need more data */
if (!p_sys->b_latm_cfg) p_sys->i_state = STATE_SEND_DATA;
msg_Warn(p_dec, "waiting for header");
case STATE_SEND_DATA:
block_Release(p_out_buffer); /* When we reach this point we already know we have enough
p_out_buffer = NULL; * data available. */
p_sys->i_state = STATE_NOSYNC;
break; p_out_buffer = block_Alloc(p_sys->i_frame_size);
} if (!p_out_buffer) {
//p_dec->b_error = true;
return NULL;
}
p_buf = p_out_buffer->p_buffer;
/* Skip the ADTS/LOAS header */
block_SkipBytes(&p_sys->bytestream, p_sys->i_header_size);
/* Copy the whole frame into the buffer */
block_GetBytes(&p_sys->bytestream, p_buf, p_sys->i_frame_size);
if (p_sys->i_type != TYPE_ADTS) { /* parse/extract the whole frame */
assert(p_sys->i_type == TYPE_LOAS);
p_out_buffer->i_buffer = LOASParse(p_dec, p_buf, p_sys->i_frame_size);
if (p_out_buffer->i_buffer <= 0) {
if (!p_sys->b_latm_cfg)
msg_Warn(p_dec, "waiting for header");
block_Release(p_out_buffer);
p_out_buffer = NULL;
p_sys->i_state = STATE_NOSYNC;
break;
} }
SetupOutput(p_dec, p_out_buffer); }
/* Make sure we don't reuse the same pts twice */ SetupOutput(p_dec, p_out_buffer);
if (p_sys->i_pts == p_sys->bytestream.p_block->i_pts) /* Make sure we don't reuse the same pts twice */
p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID; if (p_sys->i_pts == p_sys->bytestream.p_block->i_pts)
p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID;
/* So p_block doesn't get re-added several times */ /* So p_block doesn't get re-added several times */
*pp_block = block_BytestreamPop(&p_sys->bytestream); *pp_block = block_BytestreamPop(&p_sys->bytestream);
p_sys->i_state = STATE_NOSYNC; p_sys->i_state = STATE_NOSYNC;
return p_out_buffer; return p_out_buffer;
}
} }
return NULL; return NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment