Commit 35c84ae8 authored by James Almer's avatar James Almer

Revert "avcodec/opus_parser: Handle complete frames flag."

This reverts commit 7e0df591.

"complete frames" containers, even if they don't need to assemble
packets, still depended on this code for proper packet duration and
timestamp generation.
parent b8da7ba5
......@@ -170,24 +170,19 @@ static int opus_parse(AVCodecParserContext *ctx, AVCodecContext *avctx,
ParseContext *pc = &s->pc;
int next, header_len;
if (ctx->flags & PARSER_FLAG_COMPLETE_FRAMES) {
next = buf_size;
header_len = 0;
} else {
next = opus_find_frame_end(ctx, avctx, buf, buf_size, &header_len);
if (s->ts_framing && next != AVERROR_INVALIDDATA &&
ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL;
*poutbuf_size = 0;
return buf_size;
}
next = opus_find_frame_end(ctx, avctx, buf, buf_size, &header_len);
if (next == AVERROR_INVALIDDATA){
*poutbuf = NULL;
*poutbuf_size = 0;
return buf_size;
}
if (s->ts_framing && next != AVERROR_INVALIDDATA &&
ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL;
*poutbuf_size = 0;
return buf_size;
}
if (next == AVERROR_INVALIDDATA){
*poutbuf = NULL;
*poutbuf_size = 0;
return buf_size;
}
*poutbuf = buf + header_len;
......
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