[FFmpeg-cvslog] avcodec/opus_parser: Handle complete frames flag.

[Jacob Trimble]

ffmpeg | branch: master | Jacob Trimble <modmaker at google.com> | Mon Aug 20 11:25:27 2018 -0700| [7e0df5910ec0f107cd0700d6b9359d29177f1933] | committer: James Almer

avcodec/opus_parser: Handle complete frames flag.

Signed-off-by: Jacob Trimble <modmaker at google.com>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e0df5910ec0f107cd0700d6b9359d29177f1933
---

 libavcodec/opus_parser.c | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/libavcodec/opus_parser.c b/libavcodec/opus_parser.c
index 28b0933900..a145fe7793 100644
--- a/libavcodec/opus_parser.c
+++ b/libavcodec/opus_parser.c
@@ -170,19 +170,24 @@ static int opus_parse(AVCodecParserContext *ctx, AVCodecContext *avctx,
     ParseContext *pc    = &s->pc;
     int next, header_len;
 
-    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;
-    }
+    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;
+        }
 
-    if (next == AVERROR_INVALIDDATA){
-        *poutbuf      = NULL;
-        *poutbuf_size = 0;
-        return buf_size;
+        if (next == AVERROR_INVALIDDATA){
+            *poutbuf      = NULL;
+            *poutbuf_size = 0;
+            return buf_size;
+        }
     }
 
     *poutbuf      = buf + header_len;