Skip to content

F
ffmpeg
Commit 1f7b67a1 authored by foo86's avatar foo86 Committed by James Almer
Browse files
Options

avcodec/dca_parser: simplify state machine 

Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 054a2c9f
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 19 deletions
libavcodec/dca_parser.c
View file @ 1f7b67a1
......@@ -109,25 +109,25 @@ static int dca_find_frame_end(DCAParseContext *pc1, const uint8_t *buf,
case DCA_SYNCWORD_CORE_LE:
if (size == 2) {
pc1->framesize = CORE_FRAMESIZE(STATE_LE(state));
start_found = 2;
start_found = 4;
}
break;
case DCA_SYNCWORD_CORE_14B_BE:
if (size == 4) {
pc1->framesize = CORE_FRAMESIZE(STATE_14(state)) * 8 / 14 * 2;
start_found = 2;
start_found = 4;
}
break;
case DCA_SYNCWORD_CORE_14B_LE:
if (size == 4) {
pc1->framesize = CORE_FRAMESIZE(STATE_14(STATE_LE(state))) * 8 / 14 * 2;
start_found = 2;
start_found = 4;
}
break;
case DCA_SYNCWORD_SUBSTREAM:
if (size == 6) {
pc1->framesize = EXSS_FRAMESIZE(state);
start_found = 2;
start_found = 4;
}
break;
default:
......@@ -136,23 +136,19 @@ static int dca_find_frame_end(DCAParseContext *pc1, const uint8_t *buf,
continue;
}
if (pc1->lastmarker == DCA_SYNCWORD_CORE_BE) {
if (pc1->framesize > size + 2)
continue;
if (start_found == 2 && IS_EXSS_MARKER(state)) {
pc1->framesize = size + 2;
start_found = 3;
continue;
}
if (start_found == 2 && IS_EXSS_MARKER(state) &&
pc1->framesize <= size + 2) {
pc1->framesize = size + 2;
start_found = 3;
continue;
}
if (start_found == 3) {
if (size == pc1->framesize + 4) {
pc1->framesize += EXSS_FRAMESIZE(state);
start_found = 4;
}
continue;
if (start_found == 3) {
if (size == pc1->framesize + 4) {
pc1->framesize += EXSS_FRAMESIZE(state);
start_found = 4;
}
continue;
}
if (pc1->framesize > size)
......
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