[Ffmpeg-cvslog] r8218 - in trunk/libavcodec: allcodecs.c avcodec.h mpeg12.c

[bcoudurier]

Author: bcoudurier
Date: Sun Mar  4 03:59:11 2007
New Revision: 8218

Modified:
   trunk/libavcodec/allcodecs.c
   trunk/libavcodec/avcodec.h
   trunk/libavcodec/mpeg12.c

Log:
imx dump header bitstream filter, modifies bitstream to fit in mov and be decoded by final cut pro decoder

Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c	(original)
+++ trunk/libavcodec/allcodecs.c	Sun Mar  4 03:59:11 2007
@@ -269,5 +269,6 @@ void avcodec_register_all(void)
     av_register_bitstream_filter(&mp3_header_compress_bsf);
     av_register_bitstream_filter(&mp3_header_decompress_bsf);
     av_register_bitstream_filter(&mjpega_dump_header_bsf);
+    av_register_bitstream_filter(&imx_dump_header_bsf);
 }
 

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	(original)
+++ trunk/libavcodec/avcodec.h	Sun Mar  4 03:59:11 2007
@@ -37,8 +37,8 @@ extern "C" {
 #define AV_STRINGIFY(s)         AV_TOSTRING(s)
 #define AV_TOSTRING(s) #s
 
-#define LIBAVCODEC_VERSION_INT  ((51<<16)+(37<<8)+0)
-#define LIBAVCODEC_VERSION      51.37.0
+#define LIBAVCODEC_VERSION_INT  ((51<<16)+(38<<8)+0)
+#define LIBAVCODEC_VERSION      51.38.0
 #define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
 
 #define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
@@ -2974,6 +2974,7 @@ extern AVBitStreamFilter noise_bsf;
 extern AVBitStreamFilter mp3_header_compress_bsf;
 extern AVBitStreamFilter mp3_header_decompress_bsf;
 extern AVBitStreamFilter mjpega_dump_header_bsf;
+extern AVBitStreamFilter imx_dump_header_bsf;
 
 
 /* memory */

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	(original)
+++ trunk/libavcodec/mpeg12.c	Sun Mar  4 03:59:11 2007
@@ -31,6 +31,7 @@
 #include "mpegvideo.h"
 
 #include "mpeg12data.h"
+#include "bytestream.h"
 
 //#undef NDEBUG
 //#include <assert.h>
@@ -3522,6 +3523,35 @@ AVCodecParser mpegvideo_parser = {
 };
 #endif /* !CONFIG_MPEGVIDEO_PARSER */
 
+static int imx_dump_header(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
+                           uint8_t **poutbuf, int *poutbuf_size,
+                           const uint8_t *buf, int buf_size, int keyframe)
+{
+    /* MXF essence element key */
+    static const uint8_t imx_header[16] = { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x05,0x01,0x01,0x00 };
+    uint8_t *poutbufp;
+
+    if (avctx->codec_id != CODEC_ID_MPEG2VIDEO) {
+        av_log(avctx, AV_LOG_ERROR, "imx bitstream filter only applies to mpeg2video codec\n");
+        return 0;
+    }
+
+    *poutbuf = av_malloc(buf_size + 20 + FF_INPUT_BUFFER_PADDING_SIZE);
+    poutbufp = *poutbuf;
+    bytestream_put_buffer(&poutbufp, imx_header, 16);
+    bytestream_put_byte(&poutbufp, 0x83); /* KLV BER long form */
+    bytestream_put_be24(&poutbufp, buf_size);
+    bytestream_put_buffer(&poutbufp, buf, buf_size);
+    *poutbuf_size = poutbufp - *poutbuf;
+    return 1;
+}
+
+AVBitStreamFilter imx_dump_header_bsf = {
+    "imxdump",
+    0,
+    imx_dump_header,
+};
+
 /* this is ugly i know, but the alternative is too make
    hundreds of vars global and prefix them with ff_mpeg1_
    which is far uglier. */