CAVS decoder by (Stefan Gehrer stefan.gehrer gmx.de)

Originally committed as revision 5590 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 33 insertions, 0 deletions

diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index 7281516628..1977dd4943 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -533,6 +533,30 @@ static int mpeg4video_parse(AVCodecParserContext *s,
     return next;
 }
 
+static int cavsvideo_parse(AVCodecParserContext *s,
+                           AVCodecContext *avctx,
+                           uint8_t **poutbuf, int *poutbuf_size,
+                           const uint8_t *buf, int buf_size)
+{
+    ParseContext *pc = s->priv_data;
+    int next;
+
+    if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){
+        next= buf_size;
+    }else{
+        next= ff_cavs_find_frame_end(pc, buf, buf_size);
+
+        if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
+            *poutbuf = NULL;
+            *poutbuf_size = 0;
+            return buf_size;
+        }
+    }
+    *poutbuf = (uint8_t *)buf;
+    *poutbuf_size = buf_size;
+    return next;
+}
+
 static int mpeg4video_split(AVCodecContext *avctx,
                            const uint8_t *buf, int buf_size)
 {
@@ -987,6 +1011,15 @@ AVCodecParser mpeg4video_parser = {
     mpeg4video_split,
 };
 
+AVCodecParser cavsvideo_parser = {
+    { CODEC_ID_CAVS },
+    sizeof(ParseContext1),
+    NULL,
+    cavsvideo_parse,
+    parse1_close,
+    mpeg4video_split,
+};
+
 AVCodecParser mpegaudio_parser = {
     { CODEC_ID_MP2, CODEC_ID_MP3 },
     sizeof(MpegAudioParseContext),