]> git.sesse.net Git - ffmpeg/commitdiff
Revert "avcodec/opus_parser: Handle complete frames flag."
authorJames Almer <jamrial@gmail.com>
Thu, 23 Aug 2018 20:29:27 +0000 (17:29 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Aug 2018 20:34:25 +0000 (17:34 -0300)
This reverts commit 7e0df5910ec0f107cd0700d6b9359d29177f1933.

"complete frames" containers, even if they don't need to assemble
packets, still depended on this code for proper packet duration and
timestamp generation.

libavcodec/opus_parser.c

index a145fe7793678d8ec6c5c90efed55b42a176d5cc..28b093390099e6dd9a753acd689f2074317bb27d 100644 (file)
@@ -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;