From f4d0859337a61a177b9ad2612f80fb58aa00c6f1 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 24 Nov 2014 17:23:18 +0100
Subject: [PATCH] fix libav muxer to keep sync with the internal H264 packet
 changes

---
 src/muxer/muxer_libav.c    | 24 +++++++++++++++++++-----
 src/plumbing/transcoding.c | 17 +++--------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/muxer/muxer_libav.c b/src/muxer/muxer_libav.c
index dc518174..2d58aa74 100644
--- a/src/muxer/muxer_libav.c
+++ b/src/muxer/muxer_libav.c
@@ -27,6 +27,7 @@
 #include "channels.h"
 #include "libav.h"
 #include "muxer_libav.h"
+#include "parsers/parser_avc.h"
 
 typedef struct lav_muxer {
   muxer_t;
@@ -107,10 +108,21 @@ lav_muxer_add_stream(lav_muxer_t *lm,
 
 
   if(ssc->ssc_gh) {
-    c->extradata_size = pktbuf_len(ssc->ssc_gh);
-    c->extradata = av_malloc(c->extradata_size);
-    memcpy(c->extradata, pktbuf_ptr(ssc->ssc_gh), 
-	   pktbuf_len(ssc->ssc_gh));
+    if (ssc->ssc_type == SCT_H264) {
+      sbuf_t hdr;
+      sbuf_init(&hdr);
+      isom_write_avcc(&hdr, pktbuf_ptr(ssc->ssc_gh),
+                      pktbuf_len(ssc->ssc_gh));
+      c->extradata_size = hdr.sb_ptr;
+      c->extradata = av_malloc(hdr.sb_ptr);
+      memcpy(c->extradata, hdr.sb_data, hdr.sb_ptr);
+      sbuf_free(&hdr);
+    } else {
+      c->extradata_size = pktbuf_len(ssc->ssc_gh);
+      c->extradata = av_malloc(c->extradata_size);
+      memcpy(c->extradata, pktbuf_ptr(ssc->ssc_gh),
+             pktbuf_len(ssc->ssc_gh));
+    }
   }
 
   if(SCT_ISAUDIO(ssc->ssc_type)) {
@@ -368,7 +380,7 @@ lav_muxer_write_pkt(muxer_t *m, streaming_message_type_t smt, void *data)
   AVFormatContext *oc;
   AVStream *st;
   AVPacket packet;
-  th_pkt_t *pkt = (th_pkt_t*)data;
+  th_pkt_t *pkt = (th_pkt_t*)data, *opkt;
   lav_muxer_t *lm = (lav_muxer_t*)m;
   int rc = 0, free_data = 0;
 
@@ -398,6 +410,8 @@ lav_muxer_write_pkt(muxer_t *m, streaming_message_type_t smt, void *data)
 
     if(lm->lm_h264_filter && st->codec->codec_id == AV_CODEC_ID_H264) {
       free_data = 1;
+      pkt = avc_convert_pkt(opkt = pkt);
+      pkt_ref_dec(opkt);
       if(av_bitstream_filter_filter(lm->lm_h264_filter,
 				    st->codec, 
 				    NULL, 
diff --git a/src/plumbing/transcoding.c b/src/plumbing/transcoding.c
index 32dc5e71..e9f5428a 100644
--- a/src/plumbing/transcoding.c
+++ b/src/plumbing/transcoding.c
@@ -38,6 +38,7 @@
 #include "transcoding.h"
 #include "libav.h"
 #include "parsers/bitstream.h"
+#include "parsers/parser_avc.h"
 
 static long transcoder_nrprocessors;
 
@@ -896,9 +897,9 @@ send_video_packet(transcoder_t *t, transcoder_stream_t *ts, th_pkt_t *pkt,
       n->pkt_dts += n->pkt_pts;
   }
 
-  if (octx->extradata_size)
+  if (octx->extradata_size) {
     n->pkt_meta = pktbuf_alloc(octx->extradata, octx->extradata_size);
-  else {
+  } else {
     if (octx->codec_id == AV_CODEC_ID_MPEG2VIDEO)
       extract_mpeg2_global_data(n, epkt->data, epkt->size);
   }
@@ -936,18 +937,6 @@ transcoder_stream_video(transcoder_t *t, transcoder_stream_t *ts, th_pkt_t *pkt)
 
   if (ictx->codec_id == AV_CODEC_ID_NONE) {
 
-    if (icodec->id == AV_CODEC_ID_H264) {
-      if (pkt->pkt_meta) {
-        ictx->extradata_size = pktbuf_len(pkt->pkt_meta);
-        ictx->extradata = av_malloc(ictx->extradata_size);
-        memcpy(ictx->extradata,
-               pktbuf_ptr(pkt->pkt_meta), pktbuf_len(pkt->pkt_meta));
-      } else {
-        /* wait for metadata */
-        return;
-      }
-    }
-
     ictx->codec_id = icodec->id;
 
     if (avcodec_open2(ictx, icodec, NULL) < 0) {