[ffmpeg] Add MVC support from Koying

popcornmix · Sep 16, 2015 · 2813983 · 2813983
1 parent e9f59b4
commit 2813983
Show file tree

Hide file tree

Showing 2 changed files with 135 additions and 1 deletion.
diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile
@@ -4,7 +4,8 @@ DEPS= ../../Makefile.include FFMPEG-VERSION Makefile ffmpeg_Speed_up_wtv_index_c
   0001-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch \
   0001-Discard-data-before-VO-VOL-in-mpeg-4-over-mpegts.patch \
   hevcdsp_ARM_NEON_optimized_epel_functions.patch added_ARM_NEON_optimized_SAO_patches.patch \
-  pfcd_hevc_optimisations.patch
+  pfcd_hevc_optimisations.patch \
+  add_h264_MVC_support.patch
 
 # set to "yes" to enable patching
 # we don't apply patches until we move to a vanilla ffmpeg tarball
@@ -84,6 +85,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	cd $(PLATFORM); patch -p1 < ../hevcdsp_ARM_NEON_optimized_epel_functions.patch
 	cd $(PLATFORM); patch -p1 < ../added_ARM_NEON_optimized_SAO_patches.patch
 	cd $(PLATFORM); patch -p1 < ../pfcd_hevc_optimisations.patch
+	cd $(PLATFORM); patch -p1 < ../add_h264_MVC_support.patch
 
 	cd $(PLATFORM);\
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \

diff --git a/tools/depends/target/ffmpeg/add_h264_MVC_support.patch b/tools/depends/target/ffmpeg/add_h264_MVC_support.patch
@@ -0,0 +1,132 @@
+From cd3ca00744f64edc5e6a317c4566b0651b2ace53 Mon Sep 17 00:00:00 2001
+From: Chris Koying Browet <cbro@semperpax.com>
+Date: Wed, 16 Sep 2015 12:07:15 +0100
+Subject: [PATCH] add h264 MVC support
+
+---
+ libavcodec/avcodec.h |  4 ++++
+ libavcodec/h264.c    |  6 ++++++
+ libavcodec/h264.h    |  3 +++
+ libavformat/mov.c    | 29 +++++++++++++++++++++++++++++
+ libavformat/mpegts.c |  4 +++-
+ 5 files changed, 45 insertions(+), 1 deletion(-)
+
+diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
+index 9d38b59..75f4f4e 100644
+--- a/libavcodec/avcodec.h
++++ b/libavcodec/avcodec.h
+@@ -296,6 +296,10 @@ enum AVCodecID {
+     AV_CODEC_ID_HAP,
+     AV_CODEC_ID_DDS,
+
++    /* H264 MVC type */
++    AV_CODEC_ID_H264MVC    = MKBETAG('M','V','C','C'),
++
++
+     AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
+     AV_CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
+     AV_CODEC_ID_ESCAPE130  = MKBETAG('E','1','3','0'),
+diff --git a/libavcodec/h264.c b/libavcodec/h264.c
+index 907943e..2fe239c 100644
+--- a/libavcodec/h264.c
++++ b/libavcodec/h264.c
+@@ -1633,6 +1633,12 @@ again:
+             case NAL_SPS_EXT:
+             case NAL_AUXILIARY_SLICE:
+                 break;
++            case NAL_14:
++            case NAL_15:
++            case NAL_20:
++                av_log(avctx, AV_LOG_ERROR, "NAL type: %d for MVC\n", h->nal_unit_type);
++                avctx->codec_tag = AV_CODEC_ID_H264MVC;
++                break;
+             case NAL_FF_IGNORE:
+                 break;
+             default:
+diff --git a/libavcodec/h264.h b/libavcodec/h264.h
+index 7356288..34b2d21 100644
+--- a/libavcodec/h264.h
++++ b/libavcodec/h264.h
+@@ -122,7 +122,10 @@ enum {
+     NAL_END_STREAM      = 11,
+     NAL_FILLER_DATA     = 12,
+     NAL_SPS_EXT         = 13,
++    NAL_14              = 14,
++    NAL_15              = 15,
+     NAL_AUXILIARY_SLICE = 19,
++    NAL_20              = 20,
+     NAL_FF_IGNORE       = 0xff0f001,
+ };
+
+diff --git a/libavformat/mov.c b/libavformat/mov.c
+index 92d90db..31f2027 100644
+--- a/libavformat/mov.c
++++ b/libavformat/mov.c
+@@ -1506,6 +1506,34 @@ static int mov_read_glbl(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+     return 0;
+ }
+
++static int mov_read_mvcc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
++{
++    int extradata_size;
++    int ret, i;
++    uint32_t n;
++    AVStream *st;
++
++    if (c->fc->nb_streams < 1)
++        return 0;
++    st = c->fc->streams[c->fc->nb_streams-1];
++    extradata_size = st->codec->extradata_size;
++
++    if ((uint64_t)atom.size > (1<<30))
++        return AVERROR_INVALIDDATA;
++
++    if (extradata_size == 0)
++        return 0;
++    if ((ret = mov_read_extradata(c, pb, atom, AV_CODEC_ID_H264)) < 0)
++        return ret;
++    for (i = 0, n = 0; i < 4; i++)
++        n = (n << 8) | st->codec->extradata[extradata_size+i];
++    n -= 4;
++    for (i = 0; i < 4; i++)
++        st->codec->extradata[extradata_size+i] = (n >> ((3 - i) << 3)) & 0xff;
++    st->codec->codec_tag = AV_CODEC_ID_H264MVC;
++    return 0;
++}
++
+ static int mov_read_dvc1(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+ {
+     AVStream *st;
+@@ -3835,6 +3863,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = {
+ { MKTAG('C','i','n', 0x8e), mov_read_targa_y216 },
+ { MKTAG('f','r','e','e'), mov_read_free },
+ { MKTAG('-','-','-','-'), mov_read_custom },
++{ MKTAG('m','v','c','C'), mov_read_mvcc },
+ { 0, NULL }
+ };
+
+diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
+index ed0a86b..e7c6435 100644
+--- a/libavformat/mpegts.c
++++ b/libavformat/mpegts.c
+@@ -698,7 +698,7 @@ static const StreamType ISO_types[] = {
+     { 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM   }, /* LATM syntax */
+ #endif
+     { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264       },
+-    { 0x20, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264       },
++    { 0x20, AVMEDIA_TYPE_DATA,  AV_CODEC_ID_H264       },
+     { 0x21, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_JPEG2000   },
+     { 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC       },
+     { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS       },
+@@ -832,6 +832,8 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes,
+             sub_pes->sub_st           = pes->sub_st = sub_st;
+         }
+     }
++    if (pes->stream_type == 0x20) // MVC
++        st->codec->codec_tag = AV_CODEC_ID_H264MVC;
+     if (st->codec->codec_id == AV_CODEC_ID_NONE)
+         mpegts_find_stream_type(st, pes->stream_type, MISC_types);
+     if (st->codec->codec_id == AV_CODEC_ID_NONE) {
+-- 
+1.9.1
+