code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-multimedia/gstreamer/gstreamer1.0-plugin-dvbmediasink/audiosink_mpeg4_aac_header.patch

   1 commit 73a48e31bdd977d8aa51f06388d6122dec5b8d2c
   2 Author: hschang <chang@dev3>
   3 Date:   Thu Dec 10 14:29:53 2015 +0900
   4
   5     [gstdvbaudiosink] fix creation of ADTS header for AAC audio.
   6
   7     fix according to:
   8     https://github.com/christophecvr/gstreamer1.0-plugin-multibox-dvbmediasink/commit/0534a00ffd1341c29938547f9a1ed4d00d1c4e05
   9     http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=72c5c70b90c79efcf013e0e414809931815be797
  10
  11 diff --git a/gstdvbaudiosink.c b/gstdvbaudiosink.c
  12 index f003020..20439cf 100644
  13 --- a/gstdvbaudiosink.c
  14 +++ b/gstdvbaudiosink.c
  15 @@ -479,8 +479,8 @@ static gboolean gst_dvbaudiosink_set_caps(GstBaseSink *basesink, GstCaps *caps)
  16                                                 guint8 h[2];
  17                                                 gst_buffer_extract(gst_value_get_buffer(codec_data), 0, h, sizeof(h));
  18  #endif
  19 -                                               guint8 obj_type =((h[0] & 0xC) >> 2) + 1;
  20 -                                               guint8 rate_idx =((h[0] & 0x3) << 1) |((h[1] & 0x80) >> 7);
  21 +                                               guint8 obj_type =h[0] >> 3;
  22 +                                               guint8 rate_idx =((h[0] & 0x7) << 1) |((h[1] & 0x80) >> 7);
  23                                                 guint8 channels =(h[1] & 0x78) >> 3;
  24                                                 GST_INFO_OBJECT(self, "have codec data -> obj_type = %d, rate_idx = %d, channels = %d\n",
  25                                                         obj_type, rate_idx, channels);
  26 @@ -492,7 +492,7 @@ static gboolean gst_dvbaudiosink_set_caps(GstBaseSink *basesink, GstCaps *caps)
  27                                                 if (mpegversion == 2)
  28                                                         self->aac_adts_header[1] |= 8;
  29                                                 /* Object type over first 2 bits */
  30 -                                               self->aac_adts_header[2] = obj_type << 6;
  31 +                                               self->aac_adts_header[2] = (obj_type - 1) << 6;
  32                                                 /* rate index over next 4 bits */
  33                                                 self->aac_adts_header[2] |= rate_idx << 2;
  34                                                 /* channels over last 2 bits */